| Index: content/browser/renderer_host/render_widget_host_view_mac.mm
|
| diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
|
| index 9ace1d3975807cd55c1e96d59940d61b283f91b9..7e670118bda097df3dec32ac783f81cac655fbfc 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_mac.mm
|
| +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
|
| @@ -1034,11 +1034,6 @@ void RenderWidgetHostViewMac::ForceTextureReload() {
|
| plugin_container_manager_.ForceTextureReload();
|
| }
|
|
|
| -void RenderWidgetHostViewMac::UnhandledWheelEvent(
|
| - const WebKit::WebMouseWheelEvent& event) {
|
| - [cocoa_view_ gotUnhandledWheelEvent];
|
| -}
|
| -
|
| void RenderWidgetHostViewMac::ProcessTouchAck(
|
| WebKit::WebInputEvent::Type type, bool processed) {
|
| }
|
| @@ -1083,6 +1078,11 @@ void RenderWidgetHostViewMac::UnlockMouse() {
|
| render_widget_host_->LostMouseLock();
|
| }
|
|
|
| +void RenderWidgetHostViewMac::UnhandledWheelEvent(
|
| + const WebKit::WebMouseWheelEvent& event) {
|
| + [cocoa_view_ gotUnhandledWheelEvent];
|
| +}
|
| +
|
| void RenderWidgetHostViewMac::ShutdownHost() {
|
| weak_factory_.InvalidateWeakPtrs();
|
| render_widget_host_->Shutdown();
|
|
|