Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1153)

Unified Diff: content/browser/renderer_host/render_widget_host_unittest.cc

Issue 227043012: mac: History swiping doesn't work right with iframes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Respond to comment from avi. Created 6 years, 8 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:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/render_widget_host_unittest.cc
diff --git a/content/browser/renderer_host/render_widget_host_unittest.cc b/content/browser/renderer_host/render_widget_host_unittest.cc
index fc1bf8ef4f25469f32e0257c59e9c91cab35ec0b..979cc669802d54bf6b5568a97ff0745b7e76f8a3 100644
--- a/content/browser/renderer_host/render_widget_host_unittest.cc
+++ b/content/browser/renderer_host/render_widget_host_unittest.cc
@@ -466,9 +466,12 @@ class TestView : public TestRenderWidgetHostView {
acked_event_ = touch.event;
++acked_event_count_;
}
- virtual void UnhandledWheelEvent(const WebMouseWheelEvent& event) OVERRIDE {
- unhandled_wheel_event_count_++;
- unhandled_wheel_event_ = event;
+ virtual void HandledWheelEvent(const blink::WebMouseWheelEvent& event,
+ bool consumed) OVERRIDE {
+ if (!consumed) {
+ unhandled_wheel_event_count_++;
+ unhandled_wheel_event_ = event;
+ }
}
virtual void GestureEventAck(const WebGestureEvent& event,
InputEventAckState ack_result) OVERRIDE {

Powered by Google App Engine
This is Rietveld 408576698