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

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

Issue 336553003: Change Page::m_mainFrame to be a Frame. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebased Created 6 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/tests/MHTMLTest.cpp ('k') | Source/web/tests/ViewportTest.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 14d4fe0647933c9de808e1c3af62e30eea164d61..45af9e5741880989c4ed83fbbd5c4549e5cd2606 100644
--- a/Source/web/tests/PinchViewportTest.cpp
+++ b/Source/web/tests/PinchViewportTest.cpp
@@ -535,17 +535,17 @@ TEST_F(PinchViewportTest, TestSavedToHistoryItem)
navigateTo(m_baseURL + "200-by-300.html");
EXPECT_FLOAT_POINT_EQ(FloatPoint(0, 0),
- webViewImpl()->page()->mainFrame()->loader().currentItem()->pinchViewportScrollPoint());
+ toLocalFrame(webViewImpl()->page()->mainFrame())->loader().currentItem()->pinchViewportScrollPoint());
PinchViewport& pinchViewport = frame()->page()->frameHost().pinchViewport();
pinchViewport.setScale(2);
- EXPECT_EQ(2, webViewImpl()->page()->mainFrame()->loader().currentItem()->pageScaleFactor());
+ EXPECT_EQ(2, toLocalFrame(webViewImpl()->page()->mainFrame())->loader().currentItem()->pageScaleFactor());
pinchViewport.setLocation(FloatPoint(10, 20));
EXPECT_FLOAT_POINT_EQ(FloatPoint(10, 20),
- webViewImpl()->page()->mainFrame()->loader().currentItem()->pinchViewportScrollPoint());
+ toLocalFrame(webViewImpl()->page()->mainFrame())->loader().currentItem()->pinchViewportScrollPoint());
}
// Test restoring a HistoryItem properly restores the pinch viewport's state.
« no previous file with comments | « Source/web/tests/MHTMLTest.cpp ('k') | Source/web/tests/ViewportTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698