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

Unified Diff: Source/web/tests/PinchViewportTest.cpp

Issue 1207103002: Update WebLocalFrameImpl and RotationViewportAnchor for root layer scrolling. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 6 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
« no previous file with comments | « Source/web/WebLocalFrameImpl.cpp ('k') | Source/web/tests/WebFrameTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/tests/PinchViewportTest.cpp
diff --git a/Source/web/tests/PinchViewportTest.cpp b/Source/web/tests/PinchViewportTest.cpp
index 53b934a3bca8df80222114418136427e556f83af..2edd71fb5219066016b0db7cb363576fcfde48a5 100644
--- a/Source/web/tests/PinchViewportTest.cpp
+++ b/Source/web/tests/PinchViewportTest.cpp
@@ -290,7 +290,7 @@ TEST_P(ParameterizedPinchViewportTest, TestResizeAtFullyScrolledPreservesViewpor
// Test that the PinchViewport works as expected in case of a scaled
// and scrolled viewport - scroll down.
-TEST_F(PinchViewportTest, TestResizeAfterVerticalScroll)
+TEST_P(ParameterizedPinchViewportTest, TestResizeAfterVerticalScroll)
{
/*
200 200
@@ -332,7 +332,7 @@ TEST_F(PinchViewportTest, TestResizeAfterVerticalScroll)
// Scroll main frame to the bottom of the document
webViewImpl()->mainFrame()->setScrollOffset(WebSize(0, 400));
- EXPECT_POINT_EQ(IntPoint(0, 400), frame()->view()->scrollPosition());
+ EXPECT_POINT_EQ(IntPoint(0, 400), frame()->view()->layoutViewportScrollableArea()->scrollPosition());
webViewImpl()->setPageScaleFactor(2.0);
@@ -350,7 +350,7 @@ TEST_F(PinchViewportTest, TestResizeAfterVerticalScroll)
// After resizing the scale changes 2.0 -> 4.0
EXPECT_FLOAT_SIZE_EQ(FloatSize(50, 25), pinchViewport.visibleRect().size());
- EXPECT_POINT_EQ(IntPoint(0, 625), frame()->view()->scrollPosition());
+ EXPECT_POINT_EQ(IntPoint(0, 625), frame()->view()->layoutViewportScrollableArea()->scrollPosition());
EXPECT_FLOAT_POINT_EQ(FloatPoint(0, 75), pinchViewport.location());
}
« no previous file with comments | « Source/web/WebLocalFrameImpl.cpp ('k') | Source/web/tests/WebFrameTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698