| Index: content/renderer/render_view_impl.cc
|
| diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
|
| index d3328d9d7b098438838c2a89a537f5fbd56a5e88..7ade605a374bfe2484df136f14a448d4ba80733d 100644
|
| --- a/content/renderer/render_view_impl.cc
|
| +++ b/content/renderer/render_view_impl.cc
|
| @@ -2326,6 +2326,10 @@ bool RenderViewImpl::isPointerLocked() {
|
| webwidget_mouse_lock_target_.get());
|
| }
|
|
|
| +// FIXME: To be removed as soon as chromium and blink side changes land
|
| +// didActivateCompositor with parameters is still kept in order to land
|
| +// these changes s-chromium - https://codereview.chromium.org/137893025/.
|
| +// s-blink - https://codereview.chromium.org/138523003/
|
| void RenderViewImpl::didActivateCompositor(int input_handler_identifier) {
|
| #if !defined(OS_MACOSX) // many events are unhandled - http://crbug.com/138003
|
| InputHandlerManager* input_handler_manager =
|
| @@ -2341,6 +2345,21 @@ void RenderViewImpl::didActivateCompositor(int input_handler_identifier) {
|
| RenderWidget::didActivateCompositor(input_handler_identifier);
|
| }
|
|
|
| +void RenderViewImpl::didActivateCompositor() {
|
| +#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_,
|
| + compositor_->GetInputHandler(),
|
| + AsWeakPtr());
|
| + }
|
| +#endif
|
| +
|
| + RenderWidget::didActivateCompositor();
|
| +}
|
| +
|
| void RenderViewImpl::didHandleGestureEvent(
|
| const WebGestureEvent& event,
|
| bool event_cancelled) {
|
|
|