Index: content/browser/renderer_host/render_widget_host.cc |
=================================================================== |
--- content/browser/renderer_host/render_widget_host.cc (revision 96200) |
+++ content/browser/renderer_host/render_widget_host.cc (working copy) |
@@ -34,6 +34,7 @@ |
using base::TimeDelta; |
using base::TimeTicks; |
+using WebKit::WebGestureEvent; |
using WebKit::WebInputEvent; |
using WebKit::WebKeyboardEvent; |
using WebKit::WebMouseEvent; |
@@ -560,6 +561,15 @@ |
ForwardInputEvent(wheel_event, sizeof(WebMouseWheelEvent), false); |
} |
+void RenderWidgetHost::ForwardGestureEvent( |
+ const WebKit::WebGestureEvent& gesture_event) { |
+ TRACE_EVENT0("renderer_host", "RenderWidgetHost::ForwardWheelEvent"); |
+ if (ignore_input_events_ || process_->ignore_input_events()) |
+ return; |
+ |
+ ForwardInputEvent(gesture_event, sizeof(WebGestureEvent), false); |
+} |
+ |
void RenderWidgetHost::ForwardKeyboardEvent( |
const NativeWebKeyboardEvent& key_event) { |
TRACE_EVENT0("renderer_host", "RenderWidgetHost::ForwardKeyboardEvent"); |
@@ -870,6 +880,8 @@ |
// Update our knowledge of the RenderWidget's size. |
current_size_ = params.view_size; |
+ // Update our knowledge of the RenderWidget's contents size. |
+ contents_size_ = params.contents_size; |
// Update our knowledge of the RenderWidget's scroll offset. |
last_scroll_offset_ = params.scroll_offset; |