diff options
| author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-17 09:16:49 +0000 |
|---|---|---|
| committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-17 09:16:49 +0000 |
| commit | 70cff275010b33dbab628f837d76364359065b79 (patch) | |
| tree | 6634ea1941c7129e30dfeb862768c00ea38836b2 /content | |
| parent | b8b3337b6cbdf65e922c59ed442b8a48a8a02f04 (diff) | |
| download | chromium_src-70cff275010b33dbab628f837d76364359065b79.zip chromium_src-70cff275010b33dbab628f837d76364359065b79.tar.gz chromium_src-70cff275010b33dbab628f837d76364359065b79.tar.bz2 | |
Disable compositor thread input handling on windows
BUG=160122
Review URL: https://chromiumcodereview.appspot.com/11946019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@177369 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/renderer/render_view_impl.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc index 4f8f22c..fe416cc 100644 --- a/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc @@ -2537,11 +2537,13 @@ bool RenderViewImpl::isPointerLocked() { } void RenderViewImpl::didActivateCompositor(int input_handler_identifier) { +#if !defined(OS_WIN) // http://crbug.com/160122 CompositorThread* compositor_thread = RenderThreadImpl::current()->compositor_thread(); if (compositor_thread) compositor_thread->AddInputHandler( routing_id_, input_handler_identifier, AsWeakPtr()); +#endif RenderWidget::didActivateCompositor(input_handler_identifier); |