content/renderer/render_view_impl.cc - Issue 13844021: Move compositor thread input handling logic into content

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: patch in blink changes to WebCompositorInputHandlerImpl* 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:

Index: content/renderer/render_view_impl.cc

diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc

index a24e96240fdb981504a85a1108d9e3f556d9d045..67cb4183b7a4c5196a9400fa9d4ee1a0d4d0c12f 100644

--- a/content/renderer/render_view_impl.cc

+++ b/content/renderer/render_view_impl.cc

@@ -2602,9 +2602,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);