Index: content/renderer/render_view_impl.cc |
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc |
index 70f11bda9b3b92550ea01519e6380e66d7d04345..23964222292ab62dba2dd13161fdf56d166f075e 100644 |
--- a/content/renderer/render_view_impl.cc |
+++ b/content/renderer/render_view_impl.cc |
@@ -719,6 +719,12 @@ bool RenderViewImpl::GetPluginInfo(const GURL& url, |
return found; |
} |
+void RenderViewImpl::TransferActiveWheelFlingAnimation( |
+ const WebKit::WebActiveWheelFlingParameters& params) { |
+ if (webview()) |
+ webview()->transferActiveWheelFlingAnimation(params); |
+} |
+ |
bool RenderViewImpl::OnMessageReceived(const IPC::Message& message) { |
WebFrame* main_frame = webview() ? webview()->mainFrame() : NULL; |
if (main_frame) |
@@ -2070,6 +2076,16 @@ bool RenderViewImpl::isPointerLocked() { |
webwidget_mouse_lock_target_.get()); |
} |
+void RenderViewImpl::didActivateCompositor(int input_handler_identifier) { |
+ CompositorThread* compositor_thread = |
+ RenderThreadImpl::current()->compositor_thread(); |
+ if (compositor_thread) |
+ compositor_thread->AddInputHandler( |
+ routing_id_, input_handler_identifier, AsWeakPtr()); |
+ |
+ RenderWidget::didActivateCompositor(input_handler_identifier); |
+} |
+ |
// WebKit::WebFrameClient ----------------------------------------------------- |
WebPlugin* RenderViewImpl::createPlugin(WebFrame* frame, |