diff options
| author | ccameron@chromium.org <ccameron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-17 23:31:42 +0000 |
|---|---|---|
| committer | ccameron@chromium.org <ccameron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-17 23:31:42 +0000 |
| commit | fa18ab77bacb3829a554ab67ae813c94f2989cbf (patch) | |
| tree | ab8ac3aa7d996170463d307e3c686d7b2f9836ed /content | |
| parent | 0629f2874eaca8d9945d10583803f2fadaef7ca1 (diff) | |
| download | chromium_src-fa18ab77bacb3829a554ab67ae813c94f2989cbf.zip chromium_src-fa18ab77bacb3829a554ab67ae813c94f2989cbf.tar.gz chromium_src-fa18ab77bacb3829a554ab67ae813c94f2989cbf.tar.bz2 | |
Disable impl thread event handling on Mac
This allows threaded compositing to be enabled without regressing
functionality on the Mac (though also without adding most of its
benefits).
BUG=138003
Review URL: https://chromiumcodereview.appspot.com/11988002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@177527 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 922c20f..30e8eed 100644 --- a/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc @@ -2537,6 +2537,7 @@ bool RenderViewImpl::isPointerLocked() { } void RenderViewImpl::didActivateCompositor(int input_handler_identifier) { +#if !defined(OS_MACOSX) // many events are unhandled - http://crbug.com/138003 #if !defined(OS_WIN) // http://crbug.com/160122 CompositorThread* compositor_thread = RenderThreadImpl::current()->compositor_thread(); @@ -2544,6 +2545,7 @@ void RenderViewImpl::didActivateCompositor(int input_handler_identifier) { compositor_thread->AddInputHandler( routing_id_, input_handler_identifier, AsWeakPtr()); #endif +#endif RenderWidget::didActivateCompositor(input_handler_identifier); |