Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(436)

Unified Diff: content/renderer/render_view_impl.cc

Issue 13844021: Move compositor thread input handling logic into content (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/gpu/render_widget_compositor.cc ('k') | ui/compositor/compositor.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index cc854218ea1257e59cf8c0cb1c0643bc583abedf..dc5a923125c1755b520c0835501f71b9a0353dec 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -2608,9 +2608,12 @@ void RenderViewImpl::didActivateCompositor(int input_handler_identifier) {
#if !defined(OS_MACOSX) // many events are unhandled - http://crbug.com/138003
InputHandlerManager* input_handler_manager =
RenderThreadImpl::current()->input_handler_manager();
- if (input_handler_manager)
- input_handler_manager->AddInputHandler(
- routing_id_, input_handler_identifier, AsWeakPtr());
+ if (input_handler_manager) {
+ input_handler_manager->AddInputHandler(
+ routing_id_,
+ compositor_->GetInputHandler(),
+ AsWeakPtr());
+ }
#endif
RenderWidget::didActivateCompositor(input_handler_identifier);
« no previous file with comments | « content/renderer/gpu/render_widget_compositor.cc ('k') | ui/compositor/compositor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698