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

Unified Diff: content/browser/site_per_process_browsertest.cc

Issue 2652643004: Make PageScaleFactor work for oopif subframes.
Patch Set: Put function prototype in correct place. Created 3 years, 11 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/site_per_process_browsertest.cc
diff --git a/content/browser/site_per_process_browsertest.cc b/content/browser/site_per_process_browsertest.cc
index c39b6e9dee2d767d51d6d8743a07b4b2723e85f7..c21972b8ab225011620196b8104e1f39192c8c78 100644
--- a/content/browser/site_per_process_browsertest.cc
+++ b/content/browser/site_per_process_browsertest.cc
@@ -8146,8 +8146,12 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessGestureBrowserTest,
child_frame_monitor.events_received()[2]);
EXPECT_EQ(blink::WebInputEvent::GestureScrollBegin,
child_frame_monitor.events_received()[3]);
- EXPECT_EQ(blink::WebInputEvent::GestureScrollEnd,
+ EXPECT_EQ(blink::WebInputEvent::GesturePinchBegin,
child_frame_monitor.events_received()[4]);
+ EXPECT_EQ(blink::WebInputEvent::GesturePinchEnd,
+ child_frame_monitor.events_received()[5]);
+ EXPECT_EQ(blink::WebInputEvent::GestureScrollEnd,
+ child_frame_monitor.events_received()[6]);
}
IN_PROC_BROWSER_TEST_F(SitePerProcessGestureBrowserTest,
@@ -8183,7 +8187,11 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessGestureBrowserTest,
root_frame_monitor.events_received()[6]);
// Verify child-RWHI gets no events.
- EXPECT_FALSE(child_frame_monitor.EventWasReceived());
+ EXPECT_TRUE(child_frame_monitor.EventWasReceived());
+ EXPECT_EQ(blink::WebInputEvent::GesturePinchBegin,
+ child_frame_monitor.events_received()[0]);
+ EXPECT_EQ(blink::WebInputEvent::GesturePinchEnd,
+ child_frame_monitor.events_received()[1]);
}
#endif

Powered by Google App Engine
This is Rietveld 408576698