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

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

Issue 2936423003: Move Get/SetScrollOffset methods from WebFrame to WebLocalFrame. (Closed)
Patch Set: Use WebViewHelper::LocalMainFrame() where possible. 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/BrowserControlsTest.cpp
diff --git a/third_party/WebKit/Source/web/tests/BrowserControlsTest.cpp b/third_party/WebKit/Source/web/tests/BrowserControlsTest.cpp
index 009e19355c50c9b21953aca317a0f3a720cb5430..e54a7ddb1dfd726b724a8f67db0ff8f02d35d243 100644
--- a/third_party/WebKit/Source/web/tests/BrowserControlsTest.cpp
+++ b/third_party/WebKit/Source/web/tests/BrowserControlsTest.cpp
@@ -582,21 +582,21 @@ TEST_F(BrowserControlsTest, MAYBE(ScrollUpPastLimitDoesNotHide)) {
web_view->SetPageScaleFactor(2.0);
// Fully scroll frameview but visualviewport remains scrollable
- web_view->MainFrame()->SetScrollOffset(WebSize(0, 10000));
+ web_view->MainFrameImpl()->SetScrollOffset(WebSize(0, 10000));
GetVisualViewport().SetLocation(FloatPoint(0, 0));
VerticalScroll(-10.f);
EXPECT_FLOAT_EQ(40, web_view->GetBrowserControls().ContentOffset());
web_view->GetBrowserControls().SetShownRatio(1);
// Fully scroll visual veiwport but frameview remains scrollable
- web_view->MainFrame()->SetScrollOffset(WebSize(0, 0));
+ web_view->MainFrameImpl()->SetScrollOffset(WebSize(0, 0));
GetVisualViewport().SetLocation(FloatPoint(0, 10000));
VerticalScroll(-20.f);
EXPECT_FLOAT_EQ(30, web_view->GetBrowserControls().ContentOffset());
web_view->GetBrowserControls().SetShownRatio(1);
// Fully scroll both frameview and visual viewport
- web_view->MainFrame()->SetScrollOffset(WebSize(0, 10000));
+ web_view->MainFrameImpl()->SetScrollOffset(WebSize(0, 10000));
GetVisualViewport().SetLocation(FloatPoint(0, 10000));
VerticalScroll(-30.f);
// Browser controls should not move because neither frameview nor visual
« no previous file with comments | « third_party/WebKit/Source/web/WebViewImpl.cpp ('k') | third_party/WebKit/Source/web/tests/ProgrammaticScrollTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698