• Home
  • History
  • Annotate
  • only in /external/chromium_org/content/browser/android/
History log of /external/chromium_org/content/browser/android/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
1616e00f183245c0dff609d2436cd64ddf27e612 18-Dec-2014 boliu <boliu@chromium.org> Cherry-pick: Fix canvas to webgl sharing in android webview

Clean cherry-pick of chromium
crrev.com/7476088d404e3b04f2cf805f3e0622283606ea77

BUG: 18685397

Original description:

A small and safe workaround to get some failing webgl conformance tests
passing in android webview.

Change-Id: I56d718f1bd124a9d9aad72c92e0ce57e554c9b57
n_process/synchronous_compositor_factory_impl.cc
c64ad5c2e063cde757eba7f9499a8e748b57cbdc 09-Dec-2014 Mikhail Naganov <mnaganov@google.com> Cherry-pick: [Android] Java Bridge: handle requests from Java Script on the background thread

Same as the upsteam patch, with purely syntactic adaptations of "override"
keywords usage to the legacy style used in M39.

Bug: 18520475

Original description:

commit a4b0d4cc0b9780aecd3e23a94293b2e3002baf7e
Author: mnaganov <mnaganov@chromium.org>
Date: Tue Dec 09 13:30:08 2014

[Android] Java Bridge: handle requests from Java Script on the background thread

This allows the page code that calls into injected objects methods to run even
if the browser UI thread is blocked (in WebView, the browser UI thread is the main
app thread, and sometimes people use synchronization primitives there that wait
on some action performed by the injected object, see the bug for an example).

In this CL, we make the minimal required amount of changes in order to simplify
cherry-picking into older branches. A cleanup CL (or CLs) will follow.

High-level description of changes:

1. We intercept messages from renderers on the IO thread using BrowserMessageFilter
and handle Java Bridge messages entirely on the background thread. This implies
the following changes:

2. GinJavaBridgeDispatcherHost has become RefCountedThreadSafe
(via BrowserMessageFilter)

3. We have to use route IDs of RenderFrameHosts instead of pointers to them, as
we can't access RFHs from IO or background threads.

4. Objects registry is now accessed from UI and background threads, and we have to use
locking. We can't anymore restrict access to the registry to a single thread.
This also means we can't anymore implement the registry using IDMap, as it is
explicitly non-thread-safe.

5. A lot of code was removed, as we now serve synchronous requests from renderers
without inter-thread hopping!

6. Of course, a new regression test has been added that now passes.

BUG=438255

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

Change-Id: I9e517024878f0b95a32f95524de4f8017ba8dc21
Cr-Commit-Position: refs/heads/master@{#307460}
ontent_view_core_impl.cc
ontent_view_core_impl.h
ava/gin_java_bound_object.cc
ava/gin_java_bound_object.h
ava/gin_java_bridge_dispatcher_host.cc
ava/gin_java_bridge_dispatcher_host.h
ava/gin_java_method_invocation_helper.h
64a92734073d2aa3acb7fc4b0dc6ab78963012fc 03-Dec-2014 Mikhail Naganov <mnaganov@google.com> Update the code dealing with scoped_ptrs and scoped_refptrs in JavaBridge

Required for the main patch fixing b/18520475.

These changes are purely in the syntax -- retrieve the underlying raw pointer
directly, instead of relying on overridden operators. This is to match
the current code in M40 and trunk.

Bug: 18520475
ava/gin_java_bridge_dispatcher_host.cc
83eff5096b2d7faaad5ebabc0a49f34aeb850acd 02-Dec-2014 Mikhail Naganov <mnaganov@google.com> Cherry-pick: [Android] Fix a subtle issue in Java Bridge regarding interfaces removal

Required for the main patch fixing b/18520475.

Bug: 18520475

Original description:

commit 4d4182c4af0a11a1ad5acae88f9abe2b76853fe1
Author: mnaganov <mnaganov@chromium.org>
Date: Mon Dec 01 11:59:14 2014

[Android] Fix a subtle issue in Java Bridge regarding interfaces removal

Update JavaBridgeBasicsTest.testRemovalNotReflectedUntilReload to actually
call Java GC after removing the interface, and verify that the Java object
is still callable from the page side. Fix the code to make the test pass.

BUG=437761

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

Cr-Commit-Position: refs/heads/master@{#306176}

Change-Id: If12d53e3aad721e5822d8e12c85f1240e1aac5e6
ava/gin_java_bridge_dispatcher_host.cc
d9512fb2dc45a909a2812842735be59e78b5171d 13-Nov-2014 Ben Murdoch <benm@google.com> Cherry pick [Android] Override text handle visibility when the view is
detached

Bug: 18373995

Original Description:

PopupWindows are used to render text handles in WebView. As these popups
are drawn outside of the web contents View hierarchy, it's possible that
their visibility becomes unsynchronized with the WebView itself. For
example, after the WebView has been detached from the window but
before it has been properly disposed of. Address this by overriding
handle visibility when the (content) View is detached, restoring it
only after re-attachment.

BUG=430859
(internal b/18066784)

Change-Id: I43b5ff63368384c3ff30ceece7ddd86aa0a4b738
Committed: https://crrev.com/0563c2785d0b1e62793ffb0f9dc3ac178559aeaa
Cr-Commit-Position: refs/heads/master@{#303987}
ontent_view_core_impl.cc
ontent_view_core_impl.h
c016285e1e5f5f035c0063c966ef3d7f29ca550f 12-Nov-2014 Ben Murdoch <benm@google.com> Cherry pick [Android] Stop temporarily hiding selection handles

Bug: 18066784

Original change description:

Previously, selection handles would be hidden when the content view
became unfocused. This approach worked fine in Chrome, where the focus
model is predictable, but led to undesirable consequences in WebView,
e.g., the handles never being shown. For now, avoid making any kind of
visibility changes to the handles when the focus changes, ensuring
handle visibility is consistent with the selection.

Also ensure timely cleanup of the PopupTouchHandleDrawable Java object
after its native counterpart has been destroyed.

BUG=430859
(internal b/18066784)

Change-Id: I1741f81c5a12f71c053796cde37989366d2fcf10
Committed: https://crrev.com/1ba4ec56cb8f8e76f5d0cd37db09ebe41129c9c8
Cr-Commit-Position: refs/heads/master@{#303728}
opup_touch_handle_drawable.cc
1675a649fd7a8b3cb80ffddae2dc181f122353c5 22-Oct-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 39.0.2171.37

This commit was generated by merge_to_master.py.

Change-Id: I4ca18a1d6d089e98b0511ad83f49e89d62401760
eb_contents_observer_android.cc
1320f92c476a1ad9d19dba2a48c72b75566198e9 30-Sep-2014 Primiano Tucci <primiano@google.com> Merge from Chromium at DEPS revision 267aeeb8d85c

This commit was generated by merge_to_master.py.

Change-Id: Id3aac9713b301fae64408cdaee0888724eeb7c0e
ontent_startup_flags.cc
ontent_video_view.cc
ontent_video_view.h
ontent_view_core_impl.cc
ontent_view_core_impl.h
ontent_view_render_view.cc
ontent_view_render_view.h
dge_effect_l.cc
n_process/synchronous_compositor_factory_impl.cc
n_process/synchronous_compositor_factory_impl.h
n_process/synchronous_compositor_impl.cc
n_process/synchronous_compositor_impl.h
n_process/synchronous_compositor_output_surface.cc
ava/gin_java_bridge_dispatcher_host.cc
ava/gin_java_bridge_dispatcher_host.h
ystem_ui_resource_manager_impl.cc
ystem_ui_resource_manager_impl_unittest.cc
racing_controller_android.cc
racing_controller_android.h
i_resource_provider_impl.cc
i_resource_provider_impl.h
eb_contents_observer_android.cc
eb_contents_observer_android.h
03b57e008b61dfcb1fbad3aea950ae0e001748b0 28-Aug-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 291560

This commit was generated by merge_to_master.py.

Change-Id: Ic58269055810d51286b4109e59b90b6856887a30
ontent_startup_flags.cc
ontent_view_core_impl.cc
ontent_view_core_impl.h
dge_effect.cc
dge_effect.h
dge_effect_base.h
dge_effect_l.cc
dge_effect_l.h
n_process/synchronous_compositor_factory_impl.cc
verscroll_glow.cc
verscroll_glow.h
ystem_ui_resource_manager_impl.cc
ystem_ui_resource_manager_impl.h
6e8cce623b6e4fe0c9e4af605d675dd9d0338c38 19-Aug-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 290040

This commit was generated by merge_to_master.py.

Change-Id: I694ec52d1e0b553f163c2faf4373d63270ab1aac
hild_process_launcher_android.cc
ontent_settings.cc
ontent_startup_flags.cc
ontent_video_view.cc
ontent_view_core_impl.cc
ontent_view_core_impl.h
evtools_auth.cc
dge_effect.cc
dge_effect.h
n_process/synchronous_compositor_factory_impl.cc
n_process/synchronous_compositor_factory_impl.h
ava/gin_java_bridge_dispatcher_host.cc
verscroll_glow.cc
verscroll_glow.h
ystem_ui_resource_manager_impl.cc
ystem_ui_resource_manager_impl.h
ystem_ui_resource_manager_impl_unittest.cc
racing_controller_android.cc
i_resource_provider_impl.cc
i_resource_provider_impl.h
5f1c94371a64b3196d4be9466099bb892df9b88e 12-Aug-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 288042

This commit was generated by merge_to_master.py.

Change-Id: I583602ff16d735199f1810565c9296e970ce2854
rowser_jni_registrar.cc
rowser_startup_controller.cc
omposited_touch_handle_drawable.cc
omposited_touch_handle_drawable.h
ontent_readback_handler.cc
ontent_startup_flags.cc
ontent_startup_flags.h
ontent_view_core_impl.cc
ontent_view_core_impl.h
evtools_auth.cc
ownload_controller_android_impl.cc
ownload_controller_android_impl.h
n_process/synchronous_compositor_factory_impl.cc
n_process/synchronous_compositor_factory_impl.h
n_process/synchronous_compositor_impl.cc
n_process/synchronous_compositor_impl.h
n_process/synchronous_compositor_output_surface.cc
n_process/synchronous_compositor_output_surface.h
opup_touch_handle_drawable.cc
opup_touch_handle_drawable.h
racing_controller_android.cc
racing_controller_android.h
116680a4aac90f2aa7413d9095a592090648e557 21-Jul-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 284076

This commit was generated by merge_to_master.py.

Change-Id: I9a279485b02fe7ceddcd32d992a714ff132e99ae
EPS
WNERS
rowser_jni_registrar.cc
ontent_readback_handler.cc
ontent_settings.cc
ontent_startup_flags.cc
ontent_view_core_impl.cc
ontent_view_core_impl.h
n_process/synchronous_compositor_factory_impl.cc
n_process/synchronous_compositor_factory_impl.h
n_process/synchronous_compositor_impl.cc
n_process/synchronous_compositor_output_surface.cc
n_process/synchronous_compositor_output_surface.h
ava/DEPS
ava/OWNERS
ava/gin_java_bound_object.cc
ava/gin_java_bound_object.h
ava/gin_java_bound_object_delegate.cc
ava/gin_java_bound_object_delegate.h
ava/gin_java_bridge_dispatcher_host.cc
ava/gin_java_bridge_dispatcher_host.h
ava/gin_java_method_invocation_helper.cc
ava/gin_java_method_invocation_helper.h
ava/gin_java_method_invocation_helper_unittest.cc
ava/gin_java_script_to_java_types_coercion.cc
ava/gin_java_script_to_java_types_coercion.h
ava/java_method.cc
ava/java_method.h
ava/java_type.cc
ava/java_type.h
ava/java_type_unittest.cc
ava/jni_helper.cc
ava/jni_helper.h
ava/jni_helper_unittest.cc
eb_contents_observer_android.cc
eb_contents_observer_android.h
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
ontent_view_core_impl.cc
ontent_view_core_impl.h
ontent_view_statics.cc
eb_contents_observer_android.cc
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
hild_process_launcher_android.cc
ontent_view_core_impl.cc
ontent_view_core_impl.h
dge_effect.cc
n_process/synchronous_compositor_factory_impl.cc
n_process/synchronous_compositor_factory_impl.h
n_process/synchronous_compositor_impl.cc
n_process/synchronous_compositor_impl.h
n_process/synchronous_compositor_output_surface.cc
n_process/synchronous_compositor_output_surface.h
urface_texture_peer_browser_impl.cc
i_resource_provider_impl.cc
i_resource_provider_impl.h
eb_contents_observer_android.cc
eb_contents_observer_android.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
rowser_jni_registrar.cc
ontent_view_core_impl.cc
ontent_view_core_impl.h
eb_contents_observer_android.cc
eb_contents_observer_android.h
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
rowser_jni_registrar.cc
hild_process_launcher_android.cc
hild_process_launcher_android.h
ontent_readback_handler.cc
ontent_readback_handler.h
ontent_view_core_impl.cc
ontent_view_core_impl.h
ontent_view_render_view.cc
ontent_view_render_view.h
n_process/synchronous_compositor_factory_impl.cc
n_process/synchronous_compositor_factory_impl.h
n_process/synchronous_compositor_impl.cc
n_process/synchronous_compositor_impl.h
n_process/synchronous_compositor_output_surface.cc
n_process/synchronous_compositor_output_surface.h
oad_url_params.cc
urface_texture_peer_browser_impl.cc
urface_texture_peer_browser_impl.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
rowser_jni_registrar.cc
ontent_readback_handler.cc
ontent_readback_handler.h
ontent_view_render_view.cc
ontent_view_render_view.h
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
ontent_settings.cc
ontent_settings.h
ontent_startup_flags.cc
ontent_video_view.cc
ontent_view_core_impl.cc
ontent_view_core_impl.h
ontent_view_render_view.cc
ontent_view_render_view.h
ownload_controller_android_impl.cc
n_process/synchronous_compositor_impl.h
n_process/synchronous_input_event_filter.h
ayer_tree_build_helper_impl.cc
ayer_tree_build_helper_impl.h
racing_controller_android.cc
racing_controller_android.h
eb_contents_observer_android.cc
eb_contents_observer_android.h
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
rowser_jni_registrar.cc
ontent_view_core_impl.cc
ontent_view_core_impl.h
ontent_view_render_view.cc
ontent_view_render_view.h
n_process/synchronous_compositor_factory_impl.cc
n_process/synchronous_compositor_factory_impl.h
n_process/synchronous_compositor_impl.cc
n_process/synchronous_compositor_output_surface.cc
n_process/synchronous_compositor_output_surface.h
ayer_tree_build_helper_impl.cc
ayer_tree_build_helper_impl.h
verscroll_glow.cc
verscroll_glow.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
rowser_jni_registrar.cc
ontent_settings.h
ontent_startup_flags.cc
ontent_video_view.h
ontent_view_core_impl.cc
ontent_view_core_impl.h
ontent_view_render_view.h
ate_time_chooser_android.h
ownload_controller_android_impl.h
n_process/synchronous_compositor_impl.cc
nterstitial_page_delegate_android.h
racing_controller_android.h
eb_contents_observer_android.cc
eb_contents_observer_android.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
hild_process_launcher_android.cc
hild_process_launcher_android.h
ontent_view_core_impl.cc
ontent_view_render_view.cc
dge_effect.cc
dge_effect.h
n_process/synchronous_compositor_output_surface.cc
n_process/synchronous_compositor_output_surface.h
verscroll_glow.cc
verscroll_glow.h
racing_controller_android.cc
racing_controller_android.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
hild_process_launcher_android.cc
hild_process_launcher_android.h
ontent_view_core_impl.cc
ontent_view_core_impl.h
ontent_view_render_view.cc
ontent_view_render_view.h
dge_effect.cc
n_process/synchronous_compositor_factory_impl.cc
n_process/synchronous_compositor_factory_impl.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
ontent_video_view.cc
n_process/synchronous_compositor_factory_impl.cc
n_process/synchronous_compositor_factory_impl.h
n_process/synchronous_compositor_impl.cc
n_process/synchronous_compositor_impl.h
n_process/synchronous_compositor_output_surface.cc
n_process/synchronous_compositor_output_surface.h
n_process/synchronous_input_event_filter.cc
n_process/synchronous_input_event_filter.h
4ad1aa43a48567659193a298fad74f55e00b3dd9 01-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 260540

This commit was generated by merge_to_master.py.

Change-Id: I10b8e4931992bb84eb4da800a337bbd0a52f6588
hild_process_launcher_android.cc
hild_process_launcher_android.h
ontent_video_view.cc
ontent_video_view.h
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
ontent_video_view.cc
ontent_view_core_impl.cc
ontent_view_core_impl.h
ontent_view_statics.cc
n_process/synchronous_compositor_output_surface.cc
verscroll_glow.cc
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
ontent_startup_flags.cc
n_process/synchronous_compositor_factory_impl.cc
n_process/synchronous_compositor_factory_impl.h
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
rowser_jni_registrar.cc
hild_process_launcher_android.h
ontent_startup_flags.cc
ontent_video_view.cc
ontent_view_core_impl.cc
ontent_view_core_impl.h
ontent_view_render_view.cc
ontent_view_render_view.h
ontent_view_statics.cc
esture_event_type_list.h
n_process/synchronous_compositor_factory_impl.cc
n_process/synchronous_compositor_factory_impl.h
n_process/synchronous_compositor_output_surface.cc
n_process/synchronous_compositor_output_surface.h
eb_contents_observer_android.cc
eb_contents_observer_android.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
rowser_jni_registrar.cc
ontent_startup_flags.cc
ontent_video_view.cc
ontent_video_view.h
ontent_view_core_impl.cc
ontent_view_core_impl.h
ontent_view_render_view.cc
ontent_view_render_view.h
ate_time_chooser_android.cc
ownload_controller_android_impl.cc
esture_event_type.h
esture_event_type_list.h
n_process/synchronous_compositor_factory_impl.cc
n_process/synchronous_compositor_factory_impl.h
n_process/synchronous_compositor_impl.cc
n_process/synchronous_compositor_impl.h
n_process/synchronous_compositor_output_surface.cc
n_process/synchronous_compositor_output_surface.h
n_process/synchronous_input_event_filter.cc
n_process/synchronous_input_event_filter.h
oad_url_params.cc
ouch_point.cc
ouch_point.h
eb_contents_observer_android.cc
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
WNERS
rowser_jni_registrar.cc
ontent_startup_flags.cc
ontent_view_core_impl.cc
ontent_view_core_impl.h
ontent_view_statics.cc
ate_time_chooser_android.cc
ate_time_chooser_android.h
n_process/synchronous_input_event_filter.cc
verscroll_glow.cc
verscroll_glow.h
opup_item_type_list.h
racing_controller_android.cc
racing_controller_android.h
eb_contents_observer_android.cc
eb_contents_observer_android.h
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
WNERS
rowser_jni_registrar.cc
hild_process_launcher_android.cc
hild_process_launcher_android.h
ontent_settings.cc
ontent_startup_flags.cc
ontent_video_view.cc
ontent_view_core_impl.cc
ontent_view_core_impl.h
ontent_view_render_view.cc
ontent_view_render_view.h
ontent_view_statics.cc
ownload_controller_android_impl.cc
n_process/synchronous_compositor_impl.cc
n_process/synchronous_compositor_impl.h
n_process/synchronous_compositor_output_surface.cc
n_process/synchronous_input_event_filter.cc
n_process/synchronous_input_event_filter.h
nterstitial_page_delegate_android.cc
ouch_point.cc
ouch_point.h
racing_controller_android.cc
ibration_message_filter.cc
ibration_message_filter.h
eb_contents_observer_android.cc
eb_contents_observer_android.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
ontent_view_core_impl.cc
ontent_view_core_impl.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
WNERS
ontent_startup_flags.cc
ontent_view_core_impl.cc
ontent_view_core_impl.h
ate_time_chooser_android.cc
ate_time_chooser_android.h
n_process/synchronous_compositor_output_surface.cc
n_process/synchronous_compositor_output_surface.h
ibration_message_filter.cc
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
ontent_view_core_impl.cc
ontent_view_core_impl.h
ontent_view_render_view.cc
ontent_view_render_view.h
dge_effect.cc
racing_controller_android.cc
eb_contents_observer_android.cc
eb_contents_observer_android.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
rowser_jni_registrar.cc
ontent_startup_flags.cc
ontent_view_core_impl.cc
ontent_view_core_impl.h
n_process/synchronous_compositor_impl.cc
n_process/synchronous_compositor_impl.h
n_process/synchronous_compositor_output_surface.cc
verscroll_glow.cc
verscroll_glow.h
racing_controller_android.cc
racing_controller_android.h
racing_intent_handler.cc
racing_intent_handler.h
eb_contents_observer_android.cc
eb_contents_observer_android.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
rowser_jni_registrar.cc
ontent_startup_flags.cc
ontent_view_core_impl.cc
ontent_view_core_impl.h
ontent_view_render_view.cc
ontent_view_render_view.h
n_process/synchronous_compositor_impl.cc
n_process/synchronous_compositor_impl.h
n_process/synchronous_input_event_filter.cc
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
WNERS
rowser_demuxer_android.cc
rowser_demuxer_android.h
rowser_jni_registrar.cc
rowser_media_player_manager.cc
rowser_media_player_manager.h
hild_process_launcher_android.cc
ontent_video_view.cc
ontent_view_core_impl.cc
ontent_view_core_impl.h
n_process/synchronous_compositor_impl.cc
n_process/synchronous_compositor_output_surface.cc
edia_resource_getter_impl.cc
edia_resource_getter_impl.h
urface_texture_peer_browser_impl.cc
eb_contents_observer_android.cc
eb_contents_observer_android.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
WNERS
rowser_demuxer_android.cc
rowser_demuxer_android.h
rowser_media_player_manager.cc
rowser_media_player_manager.h
ontent_startup_flags.cc
ontent_view_core_impl.cc
ontent_view_core_impl.h
n_process/synchronous_compositor_impl.cc
n_process/synchronous_compositor_impl.h
n_process/synchronous_compositor_output_surface.cc
n_process/synchronous_compositor_output_surface.h
verscroll_glow.cc
verscroll_glow.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
ndroid_browser_process.cc
ndroid_browser_process.h
rowser_jni_registrar.cc
rowser_media_player_manager.cc
rowser_media_player_manager.h
rowser_startup_controller.cc
hild_process_launcher_android.cc
ontent_view_core_impl.cc
ontent_view_core_impl.h
n_process/synchronous_compositor_impl.cc
n_process/synchronous_compositor_output_surface.cc
urface_texture_peer_browser_impl.cc
urface_texture_peer_browser_impl.h
eb_contents_observer_android.cc
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
rowser_jni_registrar.cc
rowser_startup_config.cc
rowser_startup_config.h
rowser_startup_controller.cc
rowser_startup_controller.h
ontent_view_core_impl.cc
ontent_view_core_impl.h
ate_time_chooser_android.cc
ate_time_chooser_android.h
n_process/synchronous_compositor_impl.cc
n_process/synchronous_compositor_output_surface.cc
n_process/synchronous_compositor_output_surface.h
racing_intent_handler.cc
eb_contents_observer_android.cc
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
n_process/synchronous_compositor_impl.cc
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
n_process/synchronous_compositor_impl.cc
n_process/synchronous_compositor_impl.h
n_process/synchronous_compositor_output_surface.cc
n_process/synchronous_compositor_output_surface.h
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
EPS
rowser_jni_registrar.cc
rowser_media_player_manager.cc
rowser_media_player_manager.h
rowser_startup_config.cc
rowser_startup_config.h
ontent_video_view.cc
ontent_video_view.h
ontent_view_core_impl.cc
ontent_view_core_impl.h
dge_effect.cc
n_process/synchronous_compositor_output_surface.cc
verscroll_glow.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
n_process/synchronous_compositor_impl.cc
n_process/synchronous_compositor_impl.h
n_process/synchronous_compositor_output_surface.cc
n_process/synchronous_compositor_output_surface.h
d3868032626d59662ff73b372b5d584c1d144c53 31-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r214391

This commit was generated by merge_to_master.py.

Change-Id: Iad15fada300ebc6cf9cbcebfc484b1a5f5f372e5
dge_effect.cc
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
ontent_view_core_impl.cc
ontent_view_core_impl.h
verscroll_glow.cc
verscroll_glow.h
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
ontent_view_core_impl.cc
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
hild_process_launcher_android.h
ontent_startup_flags.cc
ontent_view_core_impl.cc
ontent_view_core_impl.h
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
rowser_jni_registrar.cc
ontent_video_view.cc
n_process/synchronous_compositor_impl.cc
n_process/synchronous_compositor_impl.h
n_process/synchronous_compositor_output_surface.cc
n_process/synchronous_compositor_output_surface.h
ibration_message_filter.cc
ibration_message_filter.h
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
ontent_view_render_view.cc
n_process/synchronous_compositor_impl.cc
n_process/synchronous_compositor_impl.h
n_process/synchronous_input_event_filter.cc
n_process/synchronous_input_event_filter.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
rowser_media_player_manager.cc
rowser_media_player_manager.h
hild_process_launcher_android.cc
ontent_startup_flags.cc
ontent_video_view.cc
ontent_video_view.h
ontent_view_core_impl.cc
ontent_view_core_impl.h
ontent_view_render_view.h
ownload_controller_android_impl.h
n_process/synchronous_compositor_impl.cc
n_process/synchronous_compositor_impl.h
n_process/synchronous_compositor_output_surface.cc
n_process/synchronous_compositor_output_surface.h
n_process/synchronous_input_event_filter.cc
n_process/synchronous_input_event_filter.h
oad_url_params.cc
edia_player_manager_impl.cc
edia_player_manager_impl.h
edia_resource_getter_impl.cc
eb_contents_observer_android.cc
eb_contents_observer_android.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
WNERS
rowser_jni_registrar.cc
ontent_video_view.h
ontent_view_core_impl.cc
ontent_view_core_impl.h
ate_time_chooser_android.cc
ate_time_chooser_android.h
dge_effect.h
n_process/synchronous_compositor_output_surface.cc
n_process/synchronous_compositor_output_surface.h
n_process/synchronous_input_event_filter.h
edia_player_manager_impl.cc
edia_player_manager_impl.h
verscroll_glow.cc
verscroll_glow.h
ouch_point.cc
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
rowser_jni_registrar.cc
ontent_startup_flags.cc
ontent_view_core_impl.cc
ontent_view_core_impl.h
ownload_controller_android_impl.cc
dge_effect.cc
n_process/synchronous_compositor_impl.cc
n_process/synchronous_compositor_impl.h
n_process/synchronous_compositor_output_surface.cc
n_process/synchronous_input_event_filter.cc
n_process/synchronous_input_event_filter.h
edia_player_manager_android.h
edia_player_manager_impl.cc
edia_player_manager_impl.h
urface_texture_peer_browser_impl.cc
ouch_point.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
n_process/synchronous_compositor_impl.cc
n_process/synchronous_compositor_impl.h
n_process/synchronous_compositor_output_surface.cc
n_process/synchronous_compositor_output_surface.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
hild_process_launcher_android.cc
ontent_settings.cc
ontent_startup_flags.cc
ontent_video_view.cc
ontent_video_view.h
ontent_view_core_impl.cc
ontent_view_core_impl.h
ate_time_chooser_android.cc
ate_time_chooser_android.h
ownload_controller_android_impl.cc
n_process/DEPS
n_process/synchronous_compositor_impl.cc
n_process/synchronous_compositor_impl.h
n_process/synchronous_compositor_output_surface.cc
n_process/synchronous_compositor_output_surface.h
n_process/synchronous_input_event_filter.cc
n_process/synchronous_input_event_filter.h
edia_player_manager_android.h
edia_player_manager_impl.cc
edia_player_manager_impl.h
verscroll_glow.cc
verscroll_glow.h
urface_texture_peer_browser_impl.cc
ync_input_event_filter.cc
ync_input_event_filter.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
hild_process_launcher_android.cc
ontent_startup_flags.cc
ontent_video_view.cc
ontent_video_view.h
ontent_view_core_impl.cc
ontent_view_core_impl.h
dge_effect.cc
dge_effect.h
edia_player_manager_impl.cc
edia_player_manager_impl.h
verscroll_glow.cc
verscroll_glow.h
urface_texture_peer_browser_impl.cc
ync_input_event_filter.cc
ync_input_event_filter.h
a93a17c8d99d686bd4a1511e5504e5e6cc9fcadf 15-May-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r200144

This commit was generated by merge_to_master.py.

Change-Id: I85f3a249ae157fd8253431215fb2dfcd12ee9bf3
ownload_controller_android_impl.cc
racing_intent_handler.cc
racing_intent_handler.h
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
hild_process_launcher_android.cc
ontent_video_view.cc
ontent_view_core_impl.cc
ontent_view_core_impl.h
ownload_controller_android_impl.cc
edia_player_manager_impl.cc
edia_player_manager_impl.h
urface_texture_peer_browser_impl.cc
c2e0dbddbe15c98d52c4786dac06cb8952a8ae6d 09-May-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r198571

This commit was generated by merge_to_master.py.

Change-Id: I951118a03836157090561764dd2627f0add8118f
rowser_jni_registrar.cc
hild_process_launcher_android.cc
ontent_settings.cc
ontent_settings.h
ontent_video_view.cc
ontent_video_view.h
ontent_view_core_impl.cc
ontent_view_core_impl.h
ontent_view_render_view.cc
ontent_view_statics.cc
ate_time_chooser_android.cc
ate_time_chooser_android.h
ownload_controller_android_impl.cc
ownload_controller_android_impl.h
edia_player_manager_android.cc
edia_player_manager_android.h
edia_player_manager_impl.cc
edia_player_manager_impl.h
edia_resource_getter_impl.cc
edia_resource_getter_impl.h
urface_texture_peer_browser_impl.cc
urface_texture_peer_browser_impl.h
2a99a7e74a7f215066514fe81d2bfa6639d9eddd 28-Mar-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r190564

This commit was generated by merge_to_master.py.

Change-Id: Icadecbce29854b8fa25fd335b2c1949b5ca5d170
ndroid_browser_process.cc
rowser_jni_registrar.cc
rowser_jni_registrar.h
hild_process_launcher_android.cc
hild_process_launcher_android.h
ontent_settings.cc
ontent_startup_flags.cc
ontent_startup_flags.h
ontent_video_view.cc
ontent_view_core_impl.cc
ontent_view_core_impl.h
ontent_view_render_view.cc
ontent_view_render_view.h
ontent_view_statics.cc
ookie_getter_impl.cc
ookie_getter_impl.h
ate_time_chooser_android.cc
ate_time_chooser_android.h
ownload_controller_android_impl.cc
ownload_controller_android_impl.h
raw_delegate_impl.cc
raw_delegate_impl.h
nterstitial_page_delegate_android.cc
nterstitial_page_delegate_android.h
edia_player_manager_android.cc
edia_player_manager_android.h
edia_resource_getter_impl.cc
edia_resource_getter_impl.h
andboxed_process_launcher.cc
andboxed_process_launcher.h
urface_texture_peer_browser_impl.cc
urface_texture_peer_browser_impl.h
ync_input_event_filter.cc
ync_input_event_filter.h
ouch_point.cc
ouch_point.h
racing_intent_handler.cc
racing_intent_handler.h
eb_contents_observer_android.cc
eb_contents_observer_android.h
5821806d5e7f356e8fa4b058a389a808ea183019 14-Nov-2012 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r167172

This commit was generated by merge_to_master.py.

Change-Id: Ib8d56fd5ae39a2d7e8c91dcd76cc6d13f25f2aab
WNERS
ndroid_browser_process.cc
ndroid_browser_process.h
rowser_jni_registrar.cc
rowser_jni_registrar.h
ontent_settings.cc
ontent_settings.h
ontent_startup_flags.cc
ontent_startup_flags.h
ontent_video_view.cc
ontent_video_view.h
ontent_view_core_impl.cc
ontent_view_core_impl.h
ontent_view_render_view.cc
ontent_view_render_view.h
ontent_view_statics.cc
ontent_view_statics.h
ookie_getter_impl.cc
ookie_getter_impl.h
evtools_auth.cc
ownload_controller_android_impl.cc
ownload_controller_android_impl.h
raw_delegate_impl.cc
raw_delegate_impl.h
oad_url_params.cc
oad_url_params.h
edia_player_manager_android.cc
edia_player_manager_android.h
andboxed_process_launcher.cc
andboxed_process_launcher.h
urface_texture_peer_browser_impl.cc
urface_texture_peer_browser_impl.h
ouch_point.cc
ouch_point.h
eb_contents_observer_android.cc
eb_contents_observer_android.h