• Home
  • History
  • Annotate
  • only in /external/chromium_org/webkit/common/
History log of /external/chromium_org/webkit/common/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
c28b6a9f1be54e9e7d440ad9f9638dd8c6665464 21-Aug-2014 Dehao Chen <dehao@google.com> Update mk files with FDO support.

Change-Id: I42092243ae643be62caeaf1c5055fab9149d5ff4
pu/webkit_gpu.target.darwin-arm.mk
pu/webkit_gpu.target.darwin-arm64.mk
pu/webkit_gpu.target.darwin-mips.mk
pu/webkit_gpu.target.darwin-x86.mk
pu/webkit_gpu.target.darwin-x86_64.mk
pu/webkit_gpu.target.linux-arm.mk
pu/webkit_gpu.target.linux-arm64.mk
pu/webkit_gpu.target.linux-mips.mk
pu/webkit_gpu.target.linux-x86.mk
pu/webkit_gpu.target.linux-x86_64.mk
ebkit_common.target.darwin-arm.mk
ebkit_common.target.darwin-arm64.mk
ebkit_common.target.darwin-mips.mk
ebkit_common.target.darwin-x86.mk
ebkit_common.target.darwin-x86_64.mk
ebkit_common.target.linux-arm.mk
ebkit_common.target.linux-arm64.mk
ebkit_common.target.linux-mips.mk
ebkit_common.target.linux-x86.mk
ebkit_common.target.linux-x86_64.mk
929504d64b38e05de7355e162311d6791ad6f54d 19-Aug-2014 Bo Liu <boliu@google.com> Merge from Chromium at DEPS revision 37.0.2062.95

This commit was generated by merge_to_master.py.

Change-Id: I3f9f26ef388c68b51c867e1f7d1565494e623c61
ebpreferences.cc
ebpreferences.h
b32d2322a3158a4e5ff9e8356b380b7af6014609 11-Aug-2014 igsolla@chromium.org <igsolla@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Cherry-pick: [Android WebView] API to enable fullscreen.

NOTE: this cherry-pick will only be landed after these changes
https://googleplex-android-review.git.corp.google.com/#/c/523937/
https://googleplex-android-review.git.corp.google.com/#/c/523939/

Added a new method, ie. AwContents.setFullscreenSupported, that
will be called by the glue layer when the WebView app supports
fullscreen.

This is follow-up change to:
https://codereview.chromium.org/428633004/

BUG=389496

Review URL: https://codereview.chromium.org/425343002

Cr-Commit-Position: refs/heads/master@{#288723}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288723 0039d316-1c4b-4281-b951-d872f2087c98

Conflicts:
android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientFullScreenVideoTest.java
android_webview/native/aw_settings.cc
content/public/common/common_param_traits_macros.h
content/public/common/web_preferences.cc
content/public/common/web_preferences.h
content/renderer/render_view_impl.cc

Change-Id: Ie0fb7da4a7ccb5557a22ba5c2ab1d9df2e373876
ebpreferences.cc
ebpreferences.h
ed07dc06642b5e05bfbac58c7359d8d9f2f9d5b7 14-Aug-2014 Ignacio Solla Paula <igsolla@google.com> Merge "Cherry-pick: Don't use webmediaplayer to FullscreenController about fullscreen change" into lmp-dev
7396bf7ba15cf923c112ff260fa26b47ed469c88 08-Jul-2014 qinmin@chromium.org <qinmin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Cherry-pick: Don't use webmediaplayer to FullscreenController about fullscreen change

NOTE: this cherry-pick should only be submitted after
https://googleplex-android-review.git.corp.google.com/#/c/523935

BUG=17021433

---------------------------------------------------------------------

Don't use webmediaplayer to FullscreenController about fullscreen change

This is cloned from https://codereview.chromium.org/275163002/
The previous change will break webview because AwWebContentsDelegate::ToggleFullscreenModeForTab is not implemented.
This change passes a runtime switch to blink to disable fullscreen for non-media elements for android webview.
when AwWebContentsDelegate::ToggleFullscreenModeForTab is called, android webview will send a FullscreenChanged IPC to finish the will/DidEnterFullscreen event for the media element.

blink side CL: https://codereview.chromium.org/290643005/

This CL only impacts android webview

BUG=367346

Review URL: https://codereview.chromium.org/292573004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@281781 0039d316-1c4b-4281-b951-d872f2087c98
ebpreferences.cc
ebpreferences.h
5f9c8de36d134ca95de35911eeebdfba9acd65ad 01-Aug-2014 heejin.r.chung@samsung.com <heejin.r.chung@samsung.com@0039d316-1c4b-4281-b951-d872f2087c98> Cherry-pick: Remove GLInProcessContext::CreateContext()

Clean cherry-pick of chromium crrev.com/r286952

Original description:

Change all CreateContext() calls to Context() and remove unnecessary code.

Change-Id: I81054d0af32dc165464d7f20b9b5a0a46fb824be
pu/webgraphicscontext3d_in_process_command_buffer_impl.cc
9a3a4bc965704498ea9f22876627cda96ff9a77e 06-Aug-2014 Bo Liu <boliu@google.com> Merge from Chromium at DEPS revision 37.0.2062.68

This commit was generated by merge_to_master.py.

Change-Id: Ibe33648eea4a13ac1d5c222ff349c507f2cac617
pu/webkit_gpu.target.darwin-arm.mk
pu/webkit_gpu.target.darwin-arm64.mk
pu/webkit_gpu.target.darwin-mips.mk
pu/webkit_gpu.target.darwin-x86.mk
pu/webkit_gpu.target.darwin-x86_64.mk
pu/webkit_gpu.target.linux-arm.mk
pu/webkit_gpu.target.linux-arm64.mk
pu/webkit_gpu.target.linux-mips.mk
pu/webkit_gpu.target.linux-x86.mk
pu/webkit_gpu.target.linux-x86_64.mk
ebkit_common.target.darwin-arm.mk
ebkit_common.target.darwin-arm64.mk
ebkit_common.target.darwin-mips.mk
ebkit_common.target.darwin-x86.mk
ebkit_common.target.darwin-x86_64.mk
ebkit_common.target.linux-arm.mk
ebkit_common.target.linux-arm64.mk
ebkit_common.target.linux-mips.mk
ebkit_common.target.linux-x86.mk
ebkit_common.target.linux-x86_64.mk
bee9932bab44713b74b422b4b759b49f5a222977 15-Jul-2014 Bo Liu <boliu@google.com> Merge from Chromium at DEPS revision 37.0.2062.21

This commit was generated by merge_to_master.py.

Change-Id: Ibf049855ef0d7f5eb48fc2ce2f8e3ccae49356d6
pu/webkit_gpu.target.darwin-arm.mk
pu/webkit_gpu.target.darwin-arm64.mk
pu/webkit_gpu.target.darwin-mips.mk
pu/webkit_gpu.target.darwin-x86.mk
pu/webkit_gpu.target.darwin-x86_64.mk
pu/webkit_gpu.target.linux-arm.mk
pu/webkit_gpu.target.linux-arm64.mk
pu/webkit_gpu.target.linux-mips.mk
pu/webkit_gpu.target.linux-x86.mk
pu/webkit_gpu.target.linux-x86_64.mk
ebkit_common.target.darwin-arm.mk
ebkit_common.target.darwin-arm64.mk
ebkit_common.target.darwin-mips.mk
ebkit_common.target.darwin-x86.mk
ebkit_common.target.darwin-x86_64.mk
ebkit_common.target.linux-arm.mk
ebkit_common.target.linux-arm64.mk
ebkit_common.target.linux-mips.mk
ebkit_common.target.linux-x86.mk
ebkit_common.target.linux-x86_64.mk
6d86b77056ed63eb6871182f42a9fd5f07550f90 25-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 278856

This commit was generated by merge_to_master.py.

Change-Id: If3807744d3e5d3ee84b897bd2d099a2b7ed2e7a3
UILD.gn
pu/webkit_gpu.target.darwin-arm.mk
pu/webkit_gpu.target.darwin-arm64.mk
pu/webkit_gpu.target.darwin-mips.mk
pu/webkit_gpu.target.darwin-x86.mk
pu/webkit_gpu.target.darwin-x86_64.mk
pu/webkit_gpu.target.linux-arm.mk
pu/webkit_gpu.target.linux-arm64.mk
pu/webkit_gpu.target.linux-mips.mk
pu/webkit_gpu.target.linux-x86.mk
pu/webkit_gpu.target.linux-x86_64.mk
ebkit_common.gyp
ebkit_common.target.darwin-arm.mk
ebkit_common.target.darwin-arm64.mk
ebkit_common.target.darwin-mips.mk
ebkit_common.target.darwin-x86.mk
ebkit_common.target.darwin-x86_64.mk
ebkit_common.target.linux-arm.mk
ebkit_common.target.linux-arm64.mk
ebkit_common.target.linux-mips.mk
ebkit_common.target.linux-x86.mk
ebkit_common.target.linux-x86_64.mk
f8ee788a64d60abd8f2d742a5fdedde054ecd910 20-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 278205

This commit was generated by merge_to_master.py.

Change-Id: I23f1e7ea8c154ba72e7fb594436216f861f868ab
ppcache/appcache_interfaces.cc
ppcache/appcache_interfaces.h
lob/scoped_file.cc
atabase/database_identifier.cc
ileapi/file_system_util.cc
pu/webgraphicscontext3d_impl.cc
pu/webgraphicscontext3d_impl.h
pu/webkit_gpu.target.darwin-arm.mk
pu/webkit_gpu.target.darwin-arm64.mk
pu/webkit_gpu.target.darwin-mips.mk
pu/webkit_gpu.target.darwin-x86.mk
pu/webkit_gpu.target.darwin-x86_64.mk
pu/webkit_gpu.target.linux-arm.mk
pu/webkit_gpu.target.linux-arm64.mk
pu/webkit_gpu.target.linux-mips.mk
pu/webkit_gpu.target.linux-x86.mk
pu/webkit_gpu.target.linux-x86_64.mk
ebkit_common.target.darwin-arm.mk
ebkit_common.target.darwin-arm64.mk
ebkit_common.target.darwin-mips.mk
ebkit_common.target.darwin-x86.mk
ebkit_common.target.darwin-x86_64.mk
ebkit_common.target.linux-arm.mk
ebkit_common.target.linux-arm64.mk
ebkit_common.target.linux-mips.mk
ebkit_common.target.linux-x86.mk
ebkit_common.target.linux-x86_64.mk
ebpreferences.cc
ebpreferences.h
46d4c2bc3267f3f028f39e7e311b0f89aba2e4fd 09-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 275586

This commit was generated by merge_to_master.py.

Change-Id: Ief3a0ffd810858bfddbe0ec5931e3ee90d53f78c
UILD.gn
pu/BUILD.gn
pu/webgraphicscontext3d_impl.cc
pu/webgraphicscontext3d_impl.h
pu/webgraphicscontext3d_in_process_command_buffer_impl.cc
pu/webgraphicscontext3d_in_process_command_buffer_impl.h
pu/webkit_gpu.target.darwin-arm.mk
pu/webkit_gpu.target.darwin-arm64.mk
pu/webkit_gpu.target.darwin-mips.mk
pu/webkit_gpu.target.darwin-x86.mk
pu/webkit_gpu.target.darwin-x86_64.mk
pu/webkit_gpu.target.linux-arm.mk
pu/webkit_gpu.target.linux-arm64.mk
pu/webkit_gpu.target.linux-mips.mk
pu/webkit_gpu.target.linux-x86.mk
pu/webkit_gpu.target.linux-x86_64.mk
esource_devtools_info.cc
esource_devtools_info.h
ebkit_common.gyp
ebkit_common.target.darwin-arm.mk
ebkit_common.target.darwin-arm64.mk
ebkit_common.target.darwin-mips.mk
ebkit_common.target.darwin-x86.mk
ebkit_common.target.darwin-x86_64.mk
ebkit_common.target.linux-arm.mk
ebkit_common.target.linux-arm64.mk
ebkit_common.target.linux-mips.mk
ebkit_common.target.linux-x86.mk
ebkit_common.target.linux-x86_64.mk
cedac228d2dd51db4b79ea1e72c7f249408ee061 03-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 273901

This commit was generated by merge_to_master.py.

Change-Id: I45745444894df927ffc1045ab8de88b9e52636a3
UILD.gn
ileapi/file_system_util.h
pu/webgraphicscontext3d_impl.cc
pu/webgraphicscontext3d_impl.h
pu/webgraphicscontext3d_in_process_command_buffer_impl.cc
pu/webgraphicscontext3d_in_process_command_buffer_impl.h
pu/webkit_gpu.gyp
pu/webkit_gpu.target.darwin-arm.mk
pu/webkit_gpu.target.darwin-arm64.mk
pu/webkit_gpu.target.darwin-mips.mk
pu/webkit_gpu.target.darwin-x86.mk
pu/webkit_gpu.target.darwin-x86_64.mk
pu/webkit_gpu.target.linux-arm.mk
pu/webkit_gpu.target.linux-arm64.mk
pu/webkit_gpu.target.linux-mips.mk
pu/webkit_gpu.target.linux-x86.mk
pu/webkit_gpu.target.linux-x86_64.mk
esource_response_info.cc
esource_response_info.h
ebkit_common.gyp
ebkit_common.target.darwin-arm.mk
ebkit_common.target.darwin-arm64.mk
ebkit_common.target.darwin-mips.mk
ebkit_common.target.darwin-x86.mk
ebkit_common.target.darwin-x86_64.mk
ebkit_common.target.linux-arm.mk
ebkit_common.target.linux-arm64.mk
ebkit_common.target.linux-mips.mk
ebkit_common.target.linux-x86.mk
ebkit_common.target.linux-x86_64.mk
ebpreferences.cc
ebpreferences.h
0de6073388f4e2780db8536178b129cd8f6ab386 15-May-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 269467

This commit was generated by merge_to_master.py.

Change-Id: Id6c03d44b5ad8b098017a943eb9ec8d804dfed99
pu/webkit_gpu.target.darwin-arm.mk
pu/webkit_gpu.target.darwin-arm64.mk
pu/webkit_gpu.target.darwin-mips.mk
pu/webkit_gpu.target.darwin-x86.mk
pu/webkit_gpu.target.darwin-x86_64.mk
pu/webkit_gpu.target.linux-arm.mk
pu/webkit_gpu.target.linux-arm64.mk
pu/webkit_gpu.target.linux-mips.mk
pu/webkit_gpu.target.linux-x86.mk
pu/webkit_gpu.target.linux-x86_64.mk
ebkit_common.target.darwin-arm.mk
ebkit_common.target.darwin-arm64.mk
ebkit_common.target.darwin-mips.mk
ebkit_common.target.darwin-x86.mk
ebkit_common.target.darwin-x86_64.mk
ebkit_common.target.linux-arm.mk
ebkit_common.target.linux-arm64.mk
ebkit_common.target.linux-mips.mk
ebkit_common.target.linux-x86.mk
ebkit_common.target.linux-x86_64.mk
010d83a9304c5a91596085d917d248abff47903a 14-May-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 269336

This commit was generated by merge_to_master.py.

Change-Id: I8b9c77f10eccd2a8b4c7ce373ffda18568af54ff
atabase/database_identifier.cc
pu/webgraphicscontext3d_in_process_command_buffer_impl.cc
pu/webgraphicscontext3d_in_process_command_buffer_impl.h
pu/webkit_gpu.target.darwin-arm.mk
pu/webkit_gpu.target.darwin-arm64.mk
pu/webkit_gpu.target.darwin-mips.mk
pu/webkit_gpu.target.darwin-x86.mk
pu/webkit_gpu.target.darwin-x86_64.mk
pu/webkit_gpu.target.linux-arm.mk
pu/webkit_gpu.target.linux-arm64.mk
pu/webkit_gpu.target.linux-mips.mk
pu/webkit_gpu.target.linux-x86.mk
pu/webkit_gpu.target.linux-x86_64.mk
ebkit_common.target.darwin-arm.mk
ebkit_common.target.darwin-arm64.mk
ebkit_common.target.darwin-mips.mk
ebkit_common.target.darwin-x86.mk
ebkit_common.target.darwin-x86_64.mk
ebkit_common.target.linux-arm.mk
ebkit_common.target.linux-arm64.mk
ebkit_common.target.linux-mips.mk
ebkit_common.target.linux-x86.mk
ebkit_common.target.linux-x86_64.mk
5c02ac1a9c1b504631c0a3d2b6e737b5d738bae1 01-May-2014 Bo Liu <boliu@google.com> Merge from Chromium at DEPS revision 267519

This commit was generated by merge_to_master.py.

Change-Id: I6002987b71e09742c68bad9c834ae800ff531f25
lob/shareable_file_reference_unittest.cc
atabase/database_connections_unittest.cc
atabase/database_identifier_unittest.cc
ileapi/file_system_types.h
ileapi/file_system_util.cc
ileapi/file_system_util_unittest.cc
pu/context_provider_in_process.cc
pu/context_provider_in_process.h
pu/grcontext_for_webgraphicscontext3d.cc
pu/grcontext_for_webgraphicscontext3d.h
pu/webkit_gpu.target.darwin-arm.mk
pu/webkit_gpu.target.darwin-arm64.mk
pu/webkit_gpu.target.darwin-mips.mk
pu/webkit_gpu.target.darwin-x86.mk
pu/webkit_gpu.target.darwin-x86_64.mk
pu/webkit_gpu.target.linux-arm.mk
pu/webkit_gpu.target.linux-arm64.mk
pu/webkit_gpu.target.linux-mips.mk
pu/webkit_gpu.target.linux-x86.mk
pu/webkit_gpu.target.linux-x86_64.mk
ebkit_common.target.darwin-arm.mk
ebkit_common.target.darwin-arm64.mk
ebkit_common.target.darwin-mips.mk
ebkit_common.target.darwin-x86.mk
ebkit_common.target.darwin-x86_64.mk
ebkit_common.target.linux-arm.mk
ebkit_common.target.linux-arm64.mk
ebkit_common.target.linux-mips.mk
ebkit_common.target.linux-x86.mk
ebkit_common.target.linux-x86_64.mk
ebpreferences.cc
ebpreferences.h
0529e5d033099cbfc42635f6f6183833b09dff6e 24-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 265802

This commit was generated by merge_to_master.py.

Change-Id: I6fac2dbbce472b18ca943b6e6f247835b0bd6281
pu/webkit_gpu.gyp
pu/webkit_gpu.target.darwin-arm.mk
pu/webkit_gpu.target.darwin-mips.mk
pu/webkit_gpu.target.darwin-x86.mk
pu/webkit_gpu.target.darwin-x86_64.mk
pu/webkit_gpu.target.linux-arm.mk
pu/webkit_gpu.target.linux-mips.mk
pu/webkit_gpu.target.linux-x86.mk
pu/webkit_gpu.target.linux-x86_64.mk
ebkit_common.gyp
ebkit_common.target.darwin-arm.mk
ebkit_common.target.darwin-mips.mk
ebkit_common.target.darwin-x86.mk
ebkit_common.target.darwin-x86_64.mk
ebkit_common.target.linux-arm.mk
ebkit_common.target.linux-mips.mk
ebkit_common.target.linux-x86.mk
ebkit_common.target.linux-x86_64.mk
ebpreferences.cc
ebpreferences.h
a02191e04bc25c4935f804f2c080ae28663d096d 16-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 263965

This commit was generated by merge_to_master.py.

Change-Id: Ia1121eddd985123f160afde6372525c3d25975bf
pu/grcontext_for_webgraphicscontext3d.cc
pu/webkit_gpu.target.darwin-arm.mk
pu/webkit_gpu.target.darwin-mips.mk
pu/webkit_gpu.target.darwin-x86.mk
pu/webkit_gpu.target.darwin-x86_64.mk
pu/webkit_gpu.target.linux-arm.mk
pu/webkit_gpu.target.linux-mips.mk
pu/webkit_gpu.target.linux-x86.mk
pu/webkit_gpu.target.linux-x86_64.mk
ebkit_common.target.darwin-arm.mk
ebkit_common.target.darwin-mips.mk
ebkit_common.target.darwin-x86.mk
ebkit_common.target.darwin-x86_64.mk
ebkit_common.target.linux-arm.mk
ebkit_common.target.linux-mips.mk
ebkit_common.target.linux-x86.mk
ebkit_common.target.linux-x86_64.mk
ebpreferences.cc
ebpreferences.h
c5cede9ae108bb15f6b7a8aea21c7e1fefa2834c 10-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 262940

This commit was generated by merge_to_master.py.

Change-Id: I9a3fddbb29857fa8f68a18c6a0115862b65f84d1
pu/context_provider_in_process.cc
pu/grcontext_for_webgraphicscontext3d.cc
pu/grcontext_for_webgraphicscontext3d.h
pu/webkit_gpu.target.darwin-arm.mk
pu/webkit_gpu.target.darwin-mips.mk
pu/webkit_gpu.target.darwin-x86.mk
pu/webkit_gpu.target.darwin-x86_64.mk
pu/webkit_gpu.target.linux-arm.mk
pu/webkit_gpu.target.linux-mips.mk
pu/webkit_gpu.target.linux-x86.mk
pu/webkit_gpu.target.linux-x86_64.mk
ebkit_common.target.darwin-arm.mk
ebkit_common.target.darwin-mips.mk
ebkit_common.target.darwin-x86.mk
ebkit_common.target.darwin-x86_64.mk
ebkit_common.target.linux-arm.mk
ebkit_common.target.linux-mips.mk
ebkit_common.target.linux-x86.mk
ebkit_common.target.linux-x86_64.mk
ebpreferences.cc
ebpreferences.h
e5d81f57cb97b3b6b7fccc9c5610d21eb81db09d 03-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 261286

This commit was generated by merge_to_master.py.

Change-Id: Iea9643ce91618057f128e9a5b62c07be152f2b89
ppcache/appcache_interfaces.cc
ppcache/appcache_interfaces.h
pu/context_provider_in_process.cc
pu/context_provider_in_process.h
pu/webgraphicscontext3d_in_process_command_buffer_impl.cc
pu/webgraphicscontext3d_in_process_command_buffer_impl.h
pu/webkit_gpu.target.darwin-arm.mk
pu/webkit_gpu.target.darwin-mips.mk
pu/webkit_gpu.target.darwin-x86.mk
pu/webkit_gpu.target.darwin-x86_64.mk
pu/webkit_gpu.target.linux-arm.mk
pu/webkit_gpu.target.linux-mips.mk
pu/webkit_gpu.target.linux-x86.mk
pu/webkit_gpu.target.linux-x86_64.mk
ebkit_common.target.darwin-arm.mk
ebkit_common.target.darwin-mips.mk
ebkit_common.target.darwin-x86.mk
ebkit_common.target.darwin-x86_64.mk
ebkit_common.target.linux-arm.mk
ebkit_common.target.linux-mips.mk
ebkit_common.target.linux-x86.mk
ebkit_common.target.linux-x86_64.mk
effb81e5f8246d0db0270817048dc992db66e9fb 31-Mar-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 260458

This commit was generated by merge_to_master.py.

Change-Id: I140fa91b7f09c8efba4424e99ccb87b94a11d022
ileapi/file_system_types.h
ileapi/file_system_util.cc
pu/webkit_gpu.target.darwin-arm.mk
pu/webkit_gpu.target.darwin-mips.mk
pu/webkit_gpu.target.darwin-x86.mk
pu/webkit_gpu.target.darwin-x86_64.mk
pu/webkit_gpu.target.linux-arm.mk
pu/webkit_gpu.target.linux-mips.mk
pu/webkit_gpu.target.linux-x86.mk
pu/webkit_gpu.target.linux-x86_64.mk
uota/quota_types.h
ebkit_common.target.darwin-arm.mk
ebkit_common.target.darwin-mips.mk
ebkit_common.target.darwin-x86.mk
ebkit_common.target.darwin-x86_64.mk
ebkit_common.target.linux-arm.mk
ebkit_common.target.linux-mips.mk
ebkit_common.target.linux-x86.mk
ebkit_common.target.linux-x86_64.mk
ebpreferences.cc
ebpreferences.h
23730a6e56a168d1879203e4b3819bb36e3d8f1f 21-Mar-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 258528

This commit was generated by merge_to_master.py.

Change-Id: Id197cbdde2c2881915f096c0426c741416884783
ursors/DEPS
ursors/webcursor.cc
ursors/webcursor.h
ursors/webcursor_android.cc
ursors/webcursor_aura.cc
ursors/webcursor_aurawin.cc
ursors/webcursor_aurax11.cc
ursors/webcursor_gtk.cc
ursors/webcursor_gtk_data.h
ursors/webcursor_mac.mm
ursors/webcursor_null.cc
ursors/webcursor_unittest.cc
ursors/webcursor_win.cc
pu/webkit_gpu.target.darwin-arm.mk
pu/webkit_gpu.target.darwin-mips.mk
pu/webkit_gpu.target.darwin-x86.mk
pu/webkit_gpu.target.linux-arm.mk
pu/webkit_gpu.target.linux-mips.mk
pu/webkit_gpu.target.linux-x86.mk
ebkit_common.gyp
ebkit_common.target.darwin-arm.mk
ebkit_common.target.darwin-mips.mk
ebkit_common.target.darwin-x86.mk
ebkit_common.target.linux-arm.mk
ebkit_common.target.linux-mips.mk
ebkit_common.target.linux-x86.mk
a1401311d1ab56c4ed0a474bd38c108f75cb0cd9 18-Mar-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 257591

This commit was generated by merge_to_master.py.

Change-Id: I0010df2ec3fbb5d4947cd026de2feb150ce7a6b5
ileapi/file_system_util.cc
ileapi/file_system_util.h
ileapi/file_system_util_unittest.cc
pu/webgraphicscontext3d_in_process_command_buffer_impl.cc
pu/webkit_gpu.target.darwin-arm.mk
pu/webkit_gpu.target.darwin-mips.mk
pu/webkit_gpu.target.darwin-x86.mk
pu/webkit_gpu.target.linux-arm.mk
pu/webkit_gpu.target.linux-mips.mk
pu/webkit_gpu.target.linux-x86.mk
esource_request_body.cc
esource_request_body.h
esource_type.h
ser_agent/user_agent.cc
ser_agent/user_agent.h
ser_agent/user_agent.target.darwin-arm.mk
ser_agent/user_agent.target.darwin-mips.mk
ser_agent/user_agent.target.darwin-x86.mk
ser_agent/user_agent.target.linux-arm.mk
ser_agent/user_agent.target.linux-mips.mk
ser_agent/user_agent.target.linux-x86.mk
ser_agent/user_agent_unittest.cc
ser_agent/user_agent_util.cc
ser_agent/user_agent_util.h
ser_agent/user_agent_util_ios.mm
ser_agent/webkit_user_agent.gyp
ser_agent/webkit_user_agent_export.h
ser_agent/webkit_version.target.darwin-arm.mk
ser_agent/webkit_version.target.darwin-mips.mk
ser_agent/webkit_version.target.darwin-x86.mk
ser_agent/webkit_version.target.linux-arm.mk
ser_agent/webkit_version.target.linux-mips.mk
ser_agent/webkit_version.target.linux-x86.mk
ebkit_common.gyp
ebkit_common.target.darwin-arm.mk
ebkit_common.target.darwin-mips.mk
ebkit_common.target.darwin-x86.mk
ebkit_common.target.linux-arm.mk
ebkit_common.target.linux-mips.mk
ebkit_common.target.linux-x86.mk
ebpreferences.cc
ebpreferences.h
5d1f7b1de12d16ceb2c938c56701a3e8bfa558f7 21-Feb-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 251904

This commit was generated by merge_to_master.py.

Change-Id: I1f9543259d7d2a57d81aa41a1b84f85837439d21
ppcache/appcache_interfaces.h
ursors/webcursor_unittest.cc
atabase/database_connections_unittest.cc
ileapi/file_system_types.h
ileapi/file_system_util.cc
ileapi/file_system_util.h
pu/context_provider_in_process.cc
pu/context_provider_in_process.h
pu/context_provider_web_context.h
pu/grcontext_for_webgraphicscontext3d.cc
pu/test_context_provider_factory.cc
pu/test_context_provider_factory.h
pu/webgraphicscontext3d_in_process_command_buffer_impl.cc
pu/webgraphicscontext3d_in_process_command_buffer_impl.h
pu/webgraphicscontext3d_provider_impl.cc
pu/webgraphicscontext3d_provider_impl.h
pu/webkit_gpu.gyp
pu/webkit_gpu.target.darwin-arm.mk
pu/webkit_gpu.target.darwin-mips.mk
pu/webkit_gpu.target.darwin-x86.mk
pu/webkit_gpu.target.linux-arm.mk
pu/webkit_gpu.target.linux-mips.mk
pu/webkit_gpu.target.linux-x86.mk
esource_type.cc
esource_type.h
ser_agent/user_agent.target.darwin-arm.mk
ser_agent/user_agent.target.darwin-mips.mk
ser_agent/user_agent.target.darwin-x86.mk
ser_agent/user_agent.target.linux-arm.mk
ser_agent/user_agent.target.linux-mips.mk
ser_agent/user_agent.target.linux-x86.mk
ser_agent/user_agent_util.cc
ebkit_common.gyp
ebkit_common.target.darwin-arm.mk
ebkit_common.target.darwin-mips.mk
ebkit_common.target.darwin-x86.mk
ebkit_common.target.linux-arm.mk
ebkit_common.target.linux-mips.mk
ebkit_common.target.linux-x86.mk
ebpreferences.cc
ebpreferences.h
a3f6a49ab37290eeeb8db0f41ec0f1cb74a68be7 18-Dec-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 240154

This commit was generated by merge_to_master.py.

Change-Id: I8f2ba858cf0e7f413dddedc2ae91dc37f7136c2e
lob/shareable_file_reference_unittest.cc
ileapi/file_system_mount_option.h
pu/context_provider_in_process.cc
pu/context_provider_in_process.h
pu/gl_bindings_skia_cmd_buffer.cc
pu/gl_bindings_skia_cmd_buffer.h
pu/webgraphicscontext3d_in_process_command_buffer_impl.cc
pu/webgraphicscontext3d_in_process_command_buffer_impl.h
pu/webkit_gpu.gyp
pu/webkit_gpu.target.darwin-arm.mk
pu/webkit_gpu.target.darwin-mips.mk
pu/webkit_gpu.target.darwin-x86.mk
pu/webkit_gpu.target.linux-arm.mk
pu/webkit_gpu.target.linux-mips.mk
pu/webkit_gpu.target.linux-x86.mk
ser_agent/user_agent.target.darwin-arm.mk
ser_agent/user_agent.target.darwin-mips.mk
ser_agent/user_agent.target.darwin-x86.mk
ser_agent/user_agent.target.linux-arm.mk
ser_agent/user_agent.target.linux-mips.mk
ser_agent/user_agent.target.linux-x86.mk
ebkit_common.target.darwin-arm.mk
ebkit_common.target.darwin-mips.mk
ebkit_common.target.darwin-x86.mk
ebkit_common.target.linux-arm.mk
ebkit_common.target.linux-mips.mk
ebkit_common.target.linux-x86.mk
f2477e01787aa58f445919b809d89e252beef54f 28-Nov-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 237746

This commit was generated by merge_to_master.py.

Change-Id: I8997af4cddfeb09a7c26f7e8e672c712cab461ea
ppcache/appcache_interfaces.cc
ppcache/appcache_interfaces.h
ursors/webcursor.cc
ursors/webcursor.h
ursors/webcursor_android.cc
ursors/webcursor_aura.cc
ursors/webcursor_aurawin.cc
ursors/webcursor_aurax11.cc
ursors/webcursor_gtk.cc
ursors/webcursor_mac.mm
ursors/webcursor_unittest.cc
ursors/webcursor_win.cc
ileapi/file_system_types.h
ileapi/file_system_util.cc
ileapi/file_system_util.h
pu/context_provider_in_process.cc
pu/context_provider_in_process.h
pu/gl_bindings_skia_cmd_buffer.cc
pu/grcontext_for_webgraphicscontext3d.cc
pu/grcontext_for_webgraphicscontext3d.h
pu/webgraphicscontext3d_in_process_command_buffer_impl.cc
pu/webgraphicscontext3d_in_process_command_buffer_impl.h
pu/webgraphicscontext3d_provider_impl.cc
pu/webgraphicscontext3d_provider_impl.h
pu/webkit_gpu.target.darwin-arm.mk
pu/webkit_gpu.target.darwin-mips.mk
pu/webkit_gpu.target.darwin-x86.mk
pu/webkit_gpu.target.linux-arm.mk
pu/webkit_gpu.target.linux-mips.mk
pu/webkit_gpu.target.linux-x86.mk
uota/quota_status_code.h
esource_type.cc
esource_type.h
ser_agent/user_agent.target.darwin-arm.mk
ser_agent/user_agent.target.darwin-mips.mk
ser_agent/user_agent.target.darwin-x86.mk
ser_agent/user_agent.target.linux-arm.mk
ser_agent/user_agent.target.linux-mips.mk
ser_agent/user_agent.target.linux-x86.mk
ebkit_common.gyp
ebkit_common.target.darwin-arm.mk
ebkit_common.target.darwin-mips.mk
ebkit_common.target.darwin-x86.mk
ebkit_common.target.linux-arm.mk
ebkit_common.target.linux-mips.mk
ebkit_common.target.linux-x86.mk
ebpreferences.cc
ebpreferences.h
0f1bc08d4cfcc34181b0b5cbf065c40f687bf740 06-Nov-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 232870

This commit was generated by merge_to_master.py.

Change-Id: I9cd2139013538e8bcd17966e8ff30ca5651d1a3d
pu/OWNERS
pu/webkit_gpu.target.darwin-arm.mk
pu/webkit_gpu.target.darwin-mips.mk
pu/webkit_gpu.target.darwin-x86.mk
pu/webkit_gpu.target.linux-arm.mk
pu/webkit_gpu.target.linux-mips.mk
pu/webkit_gpu.target.linux-x86.mk
ser_agent/user_agent.target.darwin-arm.mk
ser_agent/user_agent.target.darwin-mips.mk
ser_agent/user_agent.target.darwin-x86.mk
ser_agent/user_agent.target.linux-arm.mk
ser_agent/user_agent.target.linux-mips.mk
ser_agent/user_agent.target.linux-x86.mk
ser_agent/user_agent_util_ios.mm
ebkit_common.target.darwin-arm.mk
ebkit_common.target.darwin-mips.mk
ebkit_common.target.darwin-x86.mk
ebkit_common.target.linux-arm.mk
ebkit_common.target.linux-mips.mk
ebkit_common.target.linux-x86.mk
ebpreferences.cc
ebpreferences.h
1e9bf3e0803691d0a228da41fc608347b6db4340 31-Oct-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 232015

This commit was generated by merge_to_master.py.

Change-Id: If86767ad396b9e2e1a4c1e9df1427daea29703ef
EPS
lob/blob_data.cc
lob/blob_data.h
ata_element.cc
ata_element.h
ileapi/file_system_util.cc
ileapi/file_system_util.h
ileapi/file_system_util_unittest.cc
pu/context_provider_in_process.cc
pu/context_provider_in_process.h
pu/managed_memory_policy_convert.cc
pu/managed_memory_policy_convert.h
pu/webgraphicscontext3d_in_process_command_buffer_impl.cc
pu/webgraphicscontext3d_in_process_command_buffer_impl.h
pu/webkit_gpu.gyp
pu/webkit_gpu.target.darwin-arm.mk
pu/webkit_gpu.target.darwin-mips.mk
pu/webkit_gpu.target.darwin-x86.mk
pu/webkit_gpu.target.linux-arm.mk
pu/webkit_gpu.target.linux-mips.mk
pu/webkit_gpu.target.linux-x86.mk
uota/quota_types.h
esource_request_body.cc
esource_request_body.h
ser_agent/user_agent.target.darwin-arm.mk
ser_agent/user_agent.target.darwin-mips.mk
ser_agent/user_agent.target.darwin-x86.mk
ser_agent/user_agent.target.linux-arm.mk
ser_agent/user_agent.target.linux-mips.mk
ser_agent/user_agent.target.linux-x86.mk
ebkit_common.target.darwin-arm.mk
ebkit_common.target.darwin-mips.mk
ebkit_common.target.darwin-x86.mk
ebkit_common.target.linux-arm.mk
ebkit_common.target.linux-mips.mk
ebkit_common.target.linux-x86.mk
ebpreferences.cc
ebpreferences.h
8bcbed890bc3ce4d7a057a8f32cab53fa534672e 22-Oct-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 230120

This commit was generated by merge_to_master.py.

Change-Id: I54bc06b7ee8a07092e74ce3b68c6893508349042
ursors/webcursor_mac.mm
ileapi/file_system_types.h
ileapi/file_system_util.cc
pu/context_provider_in_process.cc
pu/context_provider_in_process.h
pu/webgraphicscontext3d_in_process_command_buffer_impl.cc
pu/webgraphicscontext3d_in_process_command_buffer_impl.h
pu/webkit_gpu.target.darwin-arm.mk
pu/webkit_gpu.target.darwin-mips.mk
pu/webkit_gpu.target.darwin-x86.mk
pu/webkit_gpu.target.linux-arm.mk
pu/webkit_gpu.target.linux-mips.mk
pu/webkit_gpu.target.linux-x86.mk
ebkit_common.target.darwin-arm.mk
ebkit_common.target.darwin-mips.mk
ebkit_common.target.darwin-x86.mk
ebkit_common.target.linux-arm.mk
ebkit_common.target.linux-mips.mk
ebkit_common.target.linux-x86.mk
ebpreferences.cc
ebpreferences.h
4e180b6a0b4720a9b8e9e959a882386f690f08ff 18-Oct-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 228962

This commit was generated by merge_to_master.py.

Change-Id: I23bd7d7766f213fd52f28ae5e1ecc6ae9df905ea
ursors/webcursor_mac.mm
ileapi/directory_entry.h
ileapi/file_system_info.h
ileapi/file_system_util.cc
ileapi/file_system_util.h
ileapi/file_system_util_unittest.cc
pu/webgraphicscontext3d_in_process_command_buffer_impl.cc
pu/webgraphicscontext3d_in_process_command_buffer_impl.h
pu/webkit_gpu.gyp
pu/webkit_gpu.target.darwin-arm.mk
pu/webkit_gpu.target.darwin-mips.mk
pu/webkit_gpu.target.darwin-x86.mk
pu/webkit_gpu.target.linux-arm.mk
pu/webkit_gpu.target.linux-mips.mk
pu/webkit_gpu.target.linux-x86.mk
ser_agent/user_agent.target.darwin-arm.mk
ser_agent/user_agent.target.darwin-mips.mk
ser_agent/user_agent.target.darwin-x86.mk
ser_agent/user_agent.target.linux-arm.mk
ser_agent/user_agent.target.linux-mips.mk
ser_agent/user_agent.target.linux-x86.mk
ebkit_common.gyp
ebkit_common.target.darwin-arm.mk
ebkit_common.target.darwin-mips.mk
ebkit_common.target.darwin-x86.mk
ebkit_common.target.linux-arm.mk
ebkit_common.target.linux-mips.mk
ebkit_common.target.linux-x86.mk
ebpreferences.cc
ebpreferences.h
68043e1e95eeb07d5cae7aca370b26518b0867d6 26-Sep-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 225410

This commit was generated by merge_to_master.py.

Change-Id: Ifa1539ca216abb163295ee7a77f81bb67f52e178
ileapi/file_system_info.cc
ileapi/file_system_info.h
ileapi/file_system_types.h
ileapi/file_system_util.cc
ileapi/file_system_util.h
pu/webgraphicscontext3d_in_process_command_buffer_impl.cc
pu/webgraphicscontext3d_in_process_command_buffer_impl.h
pu/webkit_gpu.target.darwin-arm.mk
pu/webkit_gpu.target.darwin-mips.mk
pu/webkit_gpu.target.darwin-x86.mk
pu/webkit_gpu.target.linux-arm.mk
pu/webkit_gpu.target.linux-mips.mk
pu/webkit_gpu.target.linux-x86.mk
ser_agent/user_agent.target.darwin-arm.mk
ser_agent/user_agent.target.darwin-mips.mk
ser_agent/user_agent.target.darwin-x86.mk
ser_agent/user_agent.target.linux-arm.mk
ser_agent/user_agent.target.linux-mips.mk
ser_agent/user_agent.target.linux-x86.mk
ebkit_common.target.darwin-arm.mk
ebkit_common.target.darwin-mips.mk
ebkit_common.target.darwin-x86.mk
ebkit_common.target.linux-arm.mk
ebkit_common.target.linux-mips.mk
ebkit_common.target.linux-x86.mk
ebpreferences.cc
ebpreferences.h
d0247b1b59f9c528cb6df88b4f2b9afaf80d181e 19-Sep-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 224184

This commit was generated by merge_to_master.py.

Change-Id: Ia3424df5abed9bea642c522b9e2358dceabd8423
lob/shareable_file_reference_unittest.cc
ursors/webcursor.h
pu/context_provider_in_process.cc
pu/context_provider_in_process.h
pu/webgraphicscontext3d_in_process_command_buffer_impl.cc
pu/webgraphicscontext3d_in_process_command_buffer_impl.h
pu/webkit_gpu.target.darwin-arm.mk
pu/webkit_gpu.target.darwin-mips.mk
pu/webkit_gpu.target.darwin-x86.mk
pu/webkit_gpu.target.linux-arm.mk
pu/webkit_gpu.target.linux-mips.mk
pu/webkit_gpu.target.linux-x86.mk
ser_agent/user_agent.target.darwin-arm.mk
ser_agent/user_agent.target.darwin-mips.mk
ser_agent/user_agent.target.darwin-x86.mk
ser_agent/user_agent.target.linux-arm.mk
ser_agent/user_agent.target.linux-mips.mk
ser_agent/user_agent.target.linux-x86.mk
ebkit_common.target.darwin-arm.mk
ebkit_common.target.darwin-mips.mk
ebkit_common.target.darwin-x86.mk
ebkit_common.target.linux-arm.mk
ebkit_common.target.linux-mips.mk
ebkit_common.target.linux-x86.mk
ebpreferences.cc
ebpreferences.h
58537e28ecd584eab876aee8be7156509866d23a 12-Sep-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 222756

This commit was generated by merge_to_master.py.

Change-Id: I40d7f32f195f328f005f230ea80d07092d48040e
EPS
ata_element.h
ileapi/file_system_util.h
pu/webgraphicscontext3d_in_process_command_buffer_impl.cc
pu/webkit_gpu.target.darwin-arm.mk
pu/webkit_gpu.target.darwin-mips.mk
pu/webkit_gpu.target.darwin-x86.mk
pu/webkit_gpu.target.linux-arm.mk
pu/webkit_gpu.target.linux-mips.mk
pu/webkit_gpu.target.linux-x86.mk
esource_request_body.cc
esource_request_body.h
ser_agent/user_agent.target.darwin-arm.mk
ser_agent/user_agent.target.darwin-mips.mk
ser_agent/user_agent.target.darwin-x86.mk
ser_agent/user_agent.target.linux-arm.mk
ser_agent/user_agent.target.linux-mips.mk
ser_agent/user_agent.target.linux-x86.mk
ebkit_common.target.darwin-arm.mk
ebkit_common.target.darwin-mips.mk
ebkit_common.target.darwin-x86.mk
ebkit_common.target.linux-arm.mk
ebkit_common.target.linux-mips.mk
ebkit_common.target.linux-x86.mk
ebpreferences.cc
ebpreferences.h
424c4d7b64af9d0d8fd9624f381f469654d5e3d2 30-Aug-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r220549

This commit was generated by merge_to_master.py.

Change-Id: I8fcb82db764ec1eb0294280936c177bd9ba8a9e9
ursors/webcursor_mac.mm
pu/context_provider_in_process.cc
pu/context_provider_in_process.h
3551c9c881056c480085172ff9840cab31610854 23-Aug-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r219274

This commit was generated by merge_to_master.py.

Change-Id: Ibb7f41396cadf4071e89153e1913c986d126f65d
pu/context_provider_in_process.cc
pu/context_provider_in_process.h
pu/managed_memory_policy_convert.cc
pu/managed_memory_policy_convert.h
pu/test_context_provider_factory.cc
pu/webgraphicscontext3d_in_process_command_buffer_impl.cc
pu/webgraphicscontext3d_in_process_command_buffer_impl.h
pu/webkit_gpu.gyp
pu/webkit_gpu.target.darwin-arm.mk
pu/webkit_gpu.target.darwin-mips.mk
pu/webkit_gpu.target.darwin-x86.mk
pu/webkit_gpu.target.linux-arm.mk
pu/webkit_gpu.target.linux-mips.mk
pu/webkit_gpu.target.linux-x86.mk
c2db58bd994c04d98e4ee2cd7565b71548655fe3 14-Aug-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r217147

This commit was generated by merge_to_master.py.

Change-Id: Ifa927da4997e49ab95edfc5def5ee5615a76b1be
pu/test_context_provider_factory.cc
pu/test_context_provider_factory.h
pu/webkit_gpu.target.darwin-arm.mk
pu/webkit_gpu.target.darwin-mips.mk
pu/webkit_gpu.target.darwin-x86.mk
pu/webkit_gpu.target.linux-arm.mk
pu/webkit_gpu.target.linux-mips.mk
pu/webkit_gpu.target.linux-x86.mk
ebkit_common.target.darwin-arm.mk
ebkit_common.target.darwin-mips.mk
ebkit_common.target.darwin-x86.mk
ebkit_common.target.linux-arm.mk
ebkit_common.target.linux-mips.mk
ebkit_common.target.linux-x86.mk
ba5b9a6411cb1792fd21f0a078d7a25cd1ceec16 12-Aug-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r216972

This commit was generated by merge_to_master.py.

Change-Id: I01cb28d94e3fcf99e3624d75cafa50d929787ddd
pu/webkit_gpu.target.darwin-arm.mk
pu/webkit_gpu.target.darwin-mips.mk
pu/webkit_gpu.target.darwin-x86.mk
pu/webkit_gpu.target.linux-arm.mk
pu/webkit_gpu.target.linux-mips.mk
pu/webkit_gpu.target.linux-x86.mk
lugins/ppapi/OWNERS
lugins/ppapi/ppapi_utils.cc
lugins/ppapi/ppapi_utils.h
ebkit_common.target.darwin-arm.mk
ebkit_common.target.darwin-mips.mk
ebkit_common.target.darwin-x86.mk
ebkit_common.target.linux-arm.mk
ebkit_common.target.linux-mips.mk
ebkit_common.target.linux-x86.mk
bb1529ce867d8845a77ec7cdf3e3003ef1771a40 08-Aug-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r216370

This commit was generated by merge_to_master.py.

Change-Id: I739228187a6f1df6c28c5761160e593a49891113
om_storage/OWNERS
om_storage/dom_storage_map.cc
om_storage/dom_storage_map.h
om_storage/dom_storage_map_unittest.cc
om_storage/dom_storage_types.cc
om_storage/dom_storage_types.h
pu/webgraphicscontext3d_in_process_command_buffer_impl.cc
pu/webgraphicscontext3d_in_process_command_buffer_impl.h
3240926e260ce088908e02ac07a6cf7b0c0cbf44 07-Aug-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r216133

This commit was generated by merge_to_master.py.

Change-Id: I541d5d1d8520b6b3829fbc1fa18552bf9ad4a5c7
ser_agent/user_agent_util_ios.mm
2385ea399aae016c0806a4f9ef3c9cfe3d2a39df 06-Aug-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r215849

This commit was generated by merge_to_master.py.

Change-Id: I225a31651af894e33bdd71e7121702bcbe5310f4
ursors/webcursor.h
ursors/webcursor_aurawin.cc
ursors/webcursor_aurax11.cc
ursors/webcursor_null.cc
a36e5920737c6adbddd3e43b760e5de8431db6e0 05-Aug-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r215573

This commit was generated by merge_to_master.py.

Change-Id: Ib95814f98e5765b459dd32425f9bf9138edf2bca
ursors/webcursor_mac.mm
om_storage/dom_storage_types.h
lugins/ppapi/ppapi_utils.cc
28390f6bb8dc6eb59bac1e0576f95a7740a9bd61 01-Aug-2013 Ben Murdoch <benm@google.com> Cherry pick of https://codereview.chromium.org/19522006

Stability fixes for Chromium WebView.

Bug:9915533

Change-Id: If5730b3f0c79b1ddd56bce3a2903531632ea0bc6
pu/webgraphicscontext3d_in_process_command_buffer_impl.cc
fb250657ef40d7500f20882d5c9909c1013367d3 31-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r214456

This commit was generated by merge_to_master.py.

Change-Id: If3f38c7966c2034e96c669968f72ea1e57f41964
pu/context_provider_in_process.cc
pu/context_provider_in_process.h
558790d6acca3451cf3a6b497803a5f07d0bec58 30-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r214332

This commit was generated by merge_to_master.py.

Change-Id: I82a7c38de906244dc882493568013be659aa65d1
pu/webkit_gpu.target.darwin-arm.mk
pu/webkit_gpu.target.darwin-mips.mk
pu/webkit_gpu.target.darwin-x86.mk
pu/webkit_gpu.target.linux-arm.mk
pu/webkit_gpu.target.linux-mips.mk
pu/webkit_gpu.target.linux-x86.mk
58e6fbe4ee35d65e14b626c557d37565bf8ad179 26-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r213780

This commit was generated by merge_to_master.py.

Change-Id: I9cf93efc460166e8ae27c76302af9095b402a90e
pu/webkit_gpu.target.darwin-arm.mk
pu/webkit_gpu.target.darwin-mips.mk
pu/webkit_gpu.target.darwin-x86.mk
pu/webkit_gpu.target.linux-arm.mk
pu/webkit_gpu.target.linux-mips.mk
pu/webkit_gpu.target.linux-x86.mk
bbcdd45c55eb7c4641ab97aef9889b0fc828e7d3 25-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r213605

This commit was generated by merge_to_master.py.

Change-Id: I5ef9e03bf077dac295a7904f06b3cb6dec9fe213
pu/webkit_gpu.target.darwin-arm.mk
pu/webkit_gpu.target.darwin-mips.mk
pu/webkit_gpu.target.darwin-x86.mk
pu/webkit_gpu.target.linux-arm.mk
pu/webkit_gpu.target.linux-mips.mk
pu/webkit_gpu.target.linux-x86.mk
ser_agent/user_agent.target.darwin-arm.mk
ser_agent/user_agent.target.darwin-mips.mk
ser_agent/user_agent.target.darwin-x86.mk
ser_agent/user_agent.target.linux-arm.mk
ser_agent/user_agent.target.linux-mips.mk
ser_agent/user_agent.target.linux-x86.mk
ebkit_common.target.darwin-arm.mk
ebkit_common.target.darwin-mips.mk
ebkit_common.target.darwin-x86.mk
ebkit_common.target.linux-arm.mk
ebkit_common.target.linux-mips.mk
ebkit_common.target.linux-x86.mk
a3f7b4e666c476898878fa745f637129375cd889 24-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r213371

This commit was generated by merge_to_master.py.

Change-Id: I35a74205de4bff52a2dd6b15330f8a002a39efaf
pu/webkit_gpu.target.darwin-arm.mk
pu/webkit_gpu.target.darwin-mips.mk
pu/webkit_gpu.target.darwin-x86.mk
pu/webkit_gpu.target.linux-arm.mk
pu/webkit_gpu.target.linux-mips.mk
pu/webkit_gpu.target.linux-x86.mk
ser_agent/user_agent.target.darwin-arm.mk
ser_agent/user_agent.target.darwin-mips.mk
ser_agent/user_agent.target.darwin-x86.mk
ser_agent/user_agent.target.linux-arm.mk
ser_agent/user_agent.target.linux-mips.mk
ser_agent/user_agent.target.linux-x86.mk
ebkit_common.gyp
ebkit_common.target.darwin-arm.mk
ebkit_common.target.darwin-mips.mk
ebkit_common.target.darwin-x86.mk
ebkit_common.target.linux-arm.mk
ebkit_common.target.linux-mips.mk
ebkit_common.target.linux-x86.mk
ca12bfac764ba476d6cd062bf1dde12cc64c3f40 23-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r213057

This commit was generated by merge_to_master.py.

Change-Id: I3e2e2506eb9b0080157e9c5f133559df3e600388
esource_request_body.h
esource_type.cc
esource_type.h
ebkit_common.gyp
ebkit_common.target.darwin-arm.mk
ebkit_common.target.darwin-mips.mk
ebkit_common.target.darwin-x86.mk
ebkit_common.target.linux-arm.mk
ebkit_common.target.linux-mips.mk
ebkit_common.target.linux-x86.mk
ebpreferences.cc
9ab5563a3196760eb381d102cbb2bc0f7abc6a50 18-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r212225

This commit was generated by merge_to_master.py.

Change-Id: I9b658b6bade7aff6166611a04fb26f4bcf0ca77c
lob/shareable_file_reference_unittest.cc
atabase/database_connections.cc
atabase/database_connections_unittest.cc
ebpreferences.cc
ebpreferences.h
7dbb3d5cf0c15f500944d211057644d6a2f37371 17-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r212014

This commit was generated by merge_to_master.py.

Change-Id: Ie0f261e9682cd8abea1eea1e51beab83d5eea21a
lob/blob_data.h
lob/scoped_file.cc
lob/shareable_file_reference_unittest.cc
ata_element.cc
ata_element.h
pu/context_provider_in_process.cc
pu/gl_bindings_skia_cmd_buffer.cc
pu/webgraphicscontext3d_in_process_command_buffer_impl.cc
pu/webgraphicscontext3d_in_process_command_buffer_impl.h
pu/webkit_gpu.gyp
pu/webkit_gpu.target.darwin-arm.mk
pu/webkit_gpu.target.darwin-mips.mk
pu/webkit_gpu.target.darwin-x86.mk
pu/webkit_gpu.target.linux-arm.mk
pu/webkit_gpu.target.linux-mips.mk
pu/webkit_gpu.target.linux-x86.mk
lugins/ppapi/OWNERS
esource_request_body.h
ser_agent/user_agent.target.darwin-arm.mk
ser_agent/user_agent.target.darwin-mips.mk
ser_agent/user_agent.target.darwin-x86.mk
ser_agent/user_agent.target.linux-arm.mk
ser_agent/user_agent.target.linux-mips.mk
ser_agent/user_agent.target.linux-x86.mk
ebkit_common.gyp
ebkit_common.gypi
ebkit_common.target.darwin-arm.mk
ebkit_common.target.darwin-mips.mk
ebkit_common.target.darwin-x86.mk
ebkit_common.target.linux-arm.mk
ebkit_common.target.linux-mips.mk
ebkit_common.target.linux-x86.mk
ebmenuitem.cc
ebmenuitem.h
eb525c5499e34cc9c4b825d6d9e75bb07cc06ace 10-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r210036

This commit was generated by merge_to_master.py.

Change-Id: Ib0e33a83ad5dfa541481e83d7acfc6970e68f471
ppcache/appcache_interfaces.cc
ppcache/appcache_interfaces.h
lob/blob_data.cc
lob/blob_data.h
ursors/webcursor_mac.mm
atabase/database_identifier.cc
atabase/database_identifier.h
atabase/database_identifier_unittest.cc
om_storage/dom_storage_types.h
ileapi/directory_entry.h
ileapi/file_system_util.cc
ileapi/file_system_util.h
ileapi/file_system_util_unittest.cc
pu/OWNERS
pu/context_provider_in_process.cc
pu/context_provider_in_process.h
pu/webgraphicscontext3d_in_process_command_buffer_impl.cc
pu/webgraphicscontext3d_in_process_command_buffer_impl.h
pu/webkit_gpu.gyp
pu/webkit_gpu.target.darwin-arm.mk
pu/webkit_gpu.target.darwin-mips.mk
pu/webkit_gpu.target.darwin-x86.mk
pu/webkit_gpu.target.linux-arm.mk
pu/webkit_gpu.target.linux-mips.mk
pu/webkit_gpu.target.linux-x86.mk
lugins/ppapi/ppapi_utils.cc
esource_devtools_info.cc
esource_devtools_info.h
esource_request_body.cc
esource_request_body.h
esource_response_info.cc
esource_response_info.h
ser_agent/user_agent.h
ser_agent/user_agent.target.darwin-arm.mk
ser_agent/user_agent.target.darwin-mips.mk
ser_agent/user_agent.target.darwin-x86.mk
ser_agent/user_agent.target.linux-arm.mk
ser_agent/user_agent.target.linux-mips.mk
ser_agent/user_agent.target.linux-x86.mk
ser_agent/user_agent_unittest.cc
ser_agent/user_agent_util.h
ser_agent/user_agent_util_ios.mm
ser_agent/webkit_user_agent.gyp
ebdropdata.cc
ebdropdata.h
ebkit_common.gypi
ebpreferences.cc
ebpreferences.h
3c54152607de4272b3da0c146b71dcba8a0e5610 28-Jun-2013 Ben Murdoch <benm@google.com> Fixup MIPS makefiles

Change-Id: I9aa2b7e1c2db822880a3f48e308f62979577acd5
pu/webkit_gpu.target.darwin-mips.mk
pu/webkit_gpu.target.linux-mips.mk
ser_agent/user_agent.target.darwin-mips.mk
ser_agent/user_agent.target.linux-mips.mk
e31802ad5b5d9fdf7daba665b671e9ecee368cb8 27-Jun-2013 Ben Murdoch <benm@google.com> Fix MIPS makefiles

Change-Id: I7a0daf1617a3908dd628c2fd4f501cbec1483bd9
pu/webkit_gpu.target.darwin-mips.mk
pu/webkit_gpu.target.linux-mips.mk
ser_agent/user_agent.target.darwin-mips.mk
ser_agent/user_agent.target.linux-mips.mk
7d4cd473f85ac64c3747c96c277f9e506a0d2246 19-Jun-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r207203

This commit was generated by merge_to_master.py.

Change-Id: I5fbb6854d092096c4d39edc2865a48be1b53c418
ppcache/appcache_interfaces.h
lob/blob_data.h
lob/scoped_file.cc
lob/scoped_file.h
lob/shareable_file_reference.h
ursors/webcursor.h
ursors/webcursor_android.cc
ursors/webcursor_aura.cc
ursors/webcursor_aurawin.cc
ursors/webcursor_aurax11.cc
ursors/webcursor_gtk.cc
ursors/webcursor_mac.mm
ursors/webcursor_unittest.cc
ursors/webcursor_win.cc
atabase/database_connections.cc
atabase/database_connections.h
atabase/database_connections_unittest.cc
atabase/database_identifier.cc
atabase/database_identifier.h
atabase/database_identifier_unittest.cc
om_storage/dom_storage_map.cc
om_storage/dom_storage_map.h
om_storage/dom_storage_map_unittest.cc
om_storage/dom_storage_types.h
ileapi/directory_entry.cc
ileapi/directory_entry.h
ileapi/file_system_util.cc
ileapi/file_system_util.h
ileapi/file_system_util_unittest.cc
pu/webgraphicscontext3d_in_process_command_buffer_impl.cc
pu/webgraphicscontext3d_in_process_impl.cc
pu/webgraphicscontext3d_in_process_impl.h
pu/webkit_gpu.gyp
pu/webkit_gpu.target.darwin-arm.mk
pu/webkit_gpu.target.darwin-mips.mk
pu/webkit_gpu.target.darwin-x86.mk
pu/webkit_gpu.target.linux-arm.mk
pu/webkit_gpu.target.linux-mips.mk
pu/webkit_gpu.target.linux-x86.mk
lugins/ppapi/ppapi_utils.cc
uota/quota_status_code.h
ser_agent/user_agent.target.darwin-arm.mk
ser_agent/user_agent.target.darwin-mips.mk
ser_agent/user_agent.target.darwin-x86.mk
ser_agent/user_agent.target.linux-arm.mk
ser_agent/user_agent.target.linux-mips.mk
ser_agent/user_agent.target.linux-x86.mk
ebdropdata.cc
ebdropdata.h
ebkit_storage_common_export.h
ebmenuitem.cc
ebmenuitem.h
ebpreferences.cc
ebpreferences.h
5e3f23d412006dc4db4e659864679f29341e113f 11-Jun-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r205548

This commit was generated by merge_to_master.py.

Change-Id: I6d3c83f1b6c91aecc6bd4bf93562314356dd44b9
ppcache/appcache_interfaces.cc
ppcache/appcache_interfaces.h
lob/blob_data.h
lob/scoped_file.h
lob/shareable_file_reference.h
lob/webkit_common_blob.gypi
atabase/database_connections.h
atabase/webkit_common_database.gypi
om_storage/dom_storage_map.h
om_storage/dom_storage_types.h
om_storage/webkit_common_dom_storage.gypi
ileapi/file_system_types.h
ileapi/file_system_util.cc
ileapi/file_system_util.h
ileapi/webkit_common_fileapi.gypi
pu/webkit_gpu.target.darwin-mips.mk
pu/webkit_gpu.target.linux-mips.mk
uota/quota_status_code.h
uota/webkit_common_quota.gypi
ser_agent/user_agent.cc
ser_agent/user_agent.target.darwin-mips.mk
ser_agent/user_agent.target.linux-mips.mk
ser_agent/user_agent_util.cc
ser_agent/user_agent_util_ios.mm
ser_agent/webkit_version.target.darwin-mips.mk
ser_agent/webkit_version.target.linux-mips.mk
ebdropdata.cc
ebdropdata.h
ebkit_common.gypi
ebpreferences.cc
ebpreferences.h
868fa2fe829687343ffae624259930155e16dbd8 11-Jun-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r205460

This commit was generated by merge_to_master.py.

Change-Id: I4a744a5e426bd3bb378d887cfa56fe054742a540
EPS
ppcache/appcache_interfaces.cc
ppcache/appcache_interfaces.h
lob/blob_data.cc
lob/scoped_file.cc
lob/shareable_file_reference_unittest.cc
ursors/DEPS
ursors/webcursor.cc
ursors/webcursor.h
ursors/webcursor_android.cc
ursors/webcursor_aura.cc
ursors/webcursor_aurawin.cc
ursors/webcursor_aurax11.cc
ursors/webcursor_gtk.cc
ursors/webcursor_gtk_data.h
ursors/webcursor_mac.mm
ursors/webcursor_null.cc
ursors/webcursor_unittest.cc
ursors/webcursor_win.cc
atabase/database_connections.cc
atabase/database_connections_unittest.cc
om_storage/OWNERS
om_storage/dom_storage_map.cc
om_storage/dom_storage_map.h
om_storage/dom_storage_map_unittest.cc
om_storage/dom_storage_types.cc
om_storage/dom_storage_types.h
om_storage/webkit_common_dom_storage.gypi
ileapi/file_system_types.h
ileapi/file_system_util.cc
ileapi/file_system_util.h
pu/grcontext_for_webgraphicscontext3d.cc
pu/test_context_provider_factory.cc
pu/webgraphicscontext3d_in_process_command_buffer_impl.cc
pu/webgraphicscontext3d_in_process_command_buffer_impl.h
pu/webgraphicscontext3d_in_process_impl.cc
pu/webgraphicscontext3d_in_process_impl.h
pu/webgraphicscontext3d_provider_impl.h
pu/webkit_gpu.gyp
pu/webkit_gpu.target.darwin-arm.mk
pu/webkit_gpu.target.darwin-x86.mk
pu/webkit_gpu.target.linux-arm.mk
pu/webkit_gpu.target.linux-x86.mk
lugins/ppapi/OWNERS
lugins/ppapi/ppapi_utils.cc
uota/quota_status_code.cc
uota/quota_status_code.h
uota/quota_types.h
uota/webkit_common_quota.gypi
ser_agent/user_agent.cc
ser_agent/user_agent.target.darwin-arm.mk
ser_agent/user_agent.target.darwin-x86.mk
ser_agent/user_agent.target.linux-arm.mk
ser_agent/user_agent.target.linux-x86.mk
ser_agent/webkit_user_agent.gyp
ser_agent/webkit_user_agent.gypi
ser_agent/webkit_version.target.darwin-arm.mk
ser_agent/webkit_version.target.darwin-x86.mk
ser_agent/webkit_version.target.linux-arm.mk
ser_agent/webkit_version.target.linux-x86.mk
ebdropdata.cc
ebdropdata.h
ebkit_common.gypi
ebkit_common_export.h
ebpreferences.cc
ebpreferences.h
90dce4d38c5ff5333bea97d859d4e484e27edf0c 29-May-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r202854

This commit was generated by merge_to_master.py.

Change-Id: Idca323f71ef844a9e04f454d4f070b1e398f2deb
EPS
lob/blob_data.cc
lob/blob_data.h
lob/scoped_file.cc
lob/scoped_file.h
lob/shareable_file_reference.cc
lob/shareable_file_reference.h
lob/shareable_file_reference_unittest.cc
lob/webkit_common_blob.gypi
atabase/database_connections.cc
atabase/database_connections.h
atabase/database_connections_unittest.cc
atabase/webkit_common_database.gypi
ileapi/OWNERS
ileapi/directory_entry.h
ileapi/file_system_types.h
ileapi/file_system_util.cc
ileapi/file_system_util.h
ileapi/file_system_util_unittest.cc
ileapi/webkit_common_fileapi.gypi
pu/OWNERS
pu/context_provider_in_process.cc
pu/context_provider_in_process.h
pu/gl_bindings_skia_cmd_buffer.cc
pu/gl_bindings_skia_cmd_buffer.h
pu/grcontext_for_webgraphicscontext3d.cc
pu/grcontext_for_webgraphicscontext3d.h
pu/test_context_provider_factory.cc
pu/test_context_provider_factory.h
pu/webgraphicscontext3d_in_process_command_buffer_impl.cc
pu/webgraphicscontext3d_in_process_command_buffer_impl.h
pu/webgraphicscontext3d_in_process_impl.cc
pu/webgraphicscontext3d_in_process_impl.h
pu/webgraphicscontext3d_provider_impl.cc
pu/webgraphicscontext3d_provider_impl.h
pu/webkit_gpu.gyp
pu/webkit_gpu.target.darwin-arm.mk
pu/webkit_gpu.target.darwin-x86.mk
pu/webkit_gpu.target.linux-arm.mk
pu/webkit_gpu.target.linux-x86.mk
pu/webkit_gpu_export.h
lugins/ppapi/ppapi_utils.cc
lugins/ppapi/ppapi_utils.h
ser_agent/user_agent.cc
ser_agent/user_agent.h
ser_agent/user_agent_unittest.cc
ser_agent/user_agent_util.cc
ser_agent/user_agent_util.h
ser_agent/user_agent_util_ios.mm
ser_agent/webkit_user_agent.gypi
ser_agent/webkit_user_agent_export.h
ebkit_common.gypi
b2df76ea8fec9e32f6f3718986dba0d95315b29c 13-May-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r199464

This commit was generated by merge_to_master.py.

Change-Id: Ic3d1f97a4fb4edd1e6ed66a70b5040da1622b5a9
EPS