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

Unified Diff: third_party/WebKit/Source/web/tests/VisualViewportTest.cpp

Issue 2940863005: Move loading methods from WebFrame to WebLocalFrame. (Closed)
Patch Set: Fixing build problems introduced by rebasing... Created 3 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
Index: third_party/WebKit/Source/web/tests/VisualViewportTest.cpp
diff --git a/third_party/WebKit/Source/web/tests/VisualViewportTest.cpp b/third_party/WebKit/Source/web/tests/VisualViewportTest.cpp
index e4c82c7de4ba9ce4f465aa64fe931b3d07137340..7bc48f4f0c6365122643e36ce37679c446fc6df7 100644
--- a/third_party/WebKit/Source/web/tests/VisualViewportTest.cpp
+++ b/third_party/WebKit/Source/web/tests/VisualViewportTest.cpp
@@ -136,7 +136,7 @@ class VisualViewportTest
}
void NavigateTo(const std::string& url) {
- FrameTestHelpers::LoadFrame(WebViewImpl()->MainFrame(), url);
+ FrameTestHelpers::LoadFrame(WebViewImpl()->MainFrameImpl(), url);
}
void ForceFullCompositingUpdate() {
@@ -909,7 +909,7 @@ TEST_P(VisualViewportTest, TestRestoredFromHistoryItem) {
item.SetVisualViewportScrollOffset(WebFloatPoint(100, 120));
item.SetPageScaleFactor(2);
- FrameTestHelpers::LoadHistoryItem(WebViewImpl()->MainFrame(), item,
+ FrameTestHelpers::LoadHistoryItem(WebViewImpl()->MainFrameImpl(), item,
kWebHistoryDifferentDocumentLoad,
WebCachePolicy::kUseProtocolCachePolicy);
@@ -940,7 +940,7 @@ TEST_P(VisualViewportTest, TestRestoredFromLegacyHistoryItem) {
item.SetScrollOffset(WebPoint(120, 180));
item.SetPageScaleFactor(2);
- FrameTestHelpers::LoadHistoryItem(WebViewImpl()->MainFrame(), item,
+ FrameTestHelpers::LoadHistoryItem(WebViewImpl()->MainFrameImpl(), item,
kWebHistoryDifferentDocumentLoad,
WebCachePolicy::kUseProtocolCachePolicy);
@@ -2373,7 +2373,7 @@ TEST_P(VisualViewportTest, InvalidateLayoutViewWhenDocumentSmallerThanView) {
web_view_impl->ResizeWithBrowserControls(WebSize(page_width, page_height),
browser_controls_height, true);
- FrameTestHelpers::LoadFrame(web_view_impl->MainFrame(), "about:blank");
+ FrameTestHelpers::LoadFrame(web_view_impl->MainFrameImpl(), "about:blank");
web_view_impl->UpdateAllLifecyclePhases();
Document* document =

Powered by Google App Engine
This is Rietveld 408576698