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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2936423003: Move Get/SetScrollOffset methods from WebFrame to WebLocalFrame. (Closed)
Patch Set: 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
« third_party/WebKit/Source/web/WebViewImpl.cpp ('K') | « third_party/WebKit/Source/web/tests/WebFrameTest.cpp ('k') | third_party/WebKit/public/web/WebFrame.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/web/tests/WebViewTest.cpp
diff --git a/third_party/WebKit/Source/web/tests/WebViewTest.cpp b/third_party/WebKit/Source/web/tests/WebViewTest.cpp
index 25c4c424e110b3d1b5930546dac898489c0d09f5..2b5c41dac1e25e046b788cce1dae5230e8cce994 100644
--- a/third_party/WebKit/Source/web/tests/WebViewTest.cpp
+++ b/third_party/WebKit/Source/web/tests/WebViewTest.cpp
@@ -1330,8 +1330,8 @@ TEST_P(WebViewTest, FinishCompositionDoesNotRevealSelection) {
web_view_helper_.InitializeAndLoad(base_url_ + "form_with_input.html");
web_view->Resize(WebSize(800, 600));
web_view->SetInitialFocus(false);
- EXPECT_EQ(0, web_view->MainFrame()->GetScrollOffset().width);
- EXPECT_EQ(0, web_view->MainFrame()->GetScrollOffset().height);
+ EXPECT_EQ(0, web_view->MainFrameImpl()->GetScrollOffset().width);
+ EXPECT_EQ(0, web_view->MainFrameImpl()->GetScrollOffset().height);
// Set up a composition from existing text that needs to be committed.
Vector<CompositionUnderline> empty_underlines;
@@ -1343,8 +1343,8 @@ TEST_P(WebViewTest, FinishCompositionDoesNotRevealSelection) {
Element* element = static_cast<Element*>(
web_view->MainFrame()->GetDocument().GetElementById("btn"));
element->scrollIntoView();
- float offset_height = web_view->MainFrame()->GetScrollOffset().height;
- EXPECT_EQ(0, web_view->MainFrame()->GetScrollOffset().width);
+ float offset_height = web_view->MainFrameImpl()->GetScrollOffset().height;
+ EXPECT_EQ(0, web_view->MainFrameImpl()->GetScrollOffset().width);
EXPECT_LT(0, offset_height);
WebTextInputInfo info = frame->GetInputMethodController()->TextInputInfo();
@@ -1354,8 +1354,8 @@ TEST_P(WebViewTest, FinishCompositionDoesNotRevealSelection) {
frame->FrameWidget()
->GetActiveWebInputMethodController()
->FinishComposingText(WebInputMethodController::kDoNotKeepSelection);
- EXPECT_EQ(0, web_view->MainFrame()->GetScrollOffset().width);
- EXPECT_EQ(offset_height, web_view->MainFrame()->GetScrollOffset().height);
+ EXPECT_EQ(0, web_view->MainFrameImpl()->GetScrollOffset().width);
+ EXPECT_EQ(offset_height, web_view->MainFrameImpl()->GetScrollOffset().height);
}
TEST_P(WebViewTest, InsertNewLinePlacementAfterFinishComposingText) {
@@ -1663,15 +1663,15 @@ TEST_P(WebViewTest, HistoryResetScrollAndScaleState) {
web_view_helper_.InitializeAndLoad(base_url_ + "200-by-300.html");
web_view_impl->Resize(WebSize(100, 150));
web_view_impl->UpdateAllLifecyclePhases();
- EXPECT_EQ(0, web_view_impl->MainFrame()->GetScrollOffset().width);
- EXPECT_EQ(0, web_view_impl->MainFrame()->GetScrollOffset().height);
+ EXPECT_EQ(0, web_view_impl->MainFrameImpl()->GetScrollOffset().width);
+ EXPECT_EQ(0, web_view_impl->MainFrameImpl()->GetScrollOffset().height);
// Make the page scale and scroll with the given paremeters.
web_view_impl->SetPageScaleFactor(2.0f);
- web_view_impl->MainFrame()->SetScrollOffset(WebSize(94, 111));
+ web_view_impl->MainFrameImpl()->SetScrollOffset(WebSize(94, 111));
EXPECT_EQ(2.0f, web_view_impl->PageScaleFactor());
- EXPECT_EQ(94, web_view_impl->MainFrame()->GetScrollOffset().width);
- EXPECT_EQ(111, web_view_impl->MainFrame()->GetScrollOffset().height);
+ EXPECT_EQ(94, web_view_impl->MainFrameImpl()->GetScrollOffset().width);
+ EXPECT_EQ(111, web_view_impl->MainFrameImpl()->GetScrollOffset().height);
LocalFrame* main_frame_local =
ToLocalFrame(web_view_impl->GetPage()->MainFrame());
main_frame_local->Loader().SaveScrollState();
@@ -1693,8 +1693,8 @@ TEST_P(WebViewTest, HistoryResetScrollAndScaleState) {
// Confirm that resetting the page state resets the saved scroll position.
web_view_impl->ResetScrollAndScaleState();
EXPECT_EQ(1.0f, web_view_impl->PageScaleFactor());
- EXPECT_EQ(0, web_view_impl->MainFrame()->GetScrollOffset().width);
- EXPECT_EQ(0, web_view_impl->MainFrame()->GetScrollOffset().height);
+ EXPECT_EQ(0, web_view_impl->MainFrameImpl()->GetScrollOffset().width);
+ EXPECT_EQ(0, web_view_impl->MainFrameImpl()->GetScrollOffset().height);
EXPECT_EQ(1.0f, main_frame_local->Loader()
.GetDocumentLoader()
->GetHistoryItem()
@@ -1719,7 +1719,7 @@ TEST_P(WebViewTest, BackForwardRestoreScroll) {
web_view_impl->UpdateAllLifecyclePhases();
// Emulate a user scroll
- web_view_impl->MainFrame()->SetScrollOffset(WebSize(0, 900));
+ web_view_impl->MainFrameImpl()->SetScrollOffset(WebSize(0, 900));
LocalFrame* main_frame_local =
ToLocalFrame(web_view_impl->GetPage()->MainFrame());
Persistent<HistoryItem> item1 =
@@ -1763,8 +1763,8 @@ TEST_P(WebViewTest, BackForwardRestoreScroll) {
FrameLoadRequest(nullptr, item3->GenerateResourceRequest(
WebCachePolicy::kUseProtocolCachePolicy)),
kFrameLoadTypeBackForward, item3.Get(), kHistorySameDocumentLoad);
- EXPECT_EQ(0, web_view_impl->MainFrame()->GetScrollOffset().width);
- EXPECT_GT(web_view_impl->MainFrame()->GetScrollOffset().height, 2000);
+ EXPECT_EQ(0, web_view_impl->MainFrameImpl()->GetScrollOffset().width);
+ EXPECT_GT(web_view_impl->MainFrameImpl()->GetScrollOffset().height, 2000);
}
// Tests that we restore scroll and scale *after* the fullscreen styles are
@@ -1777,8 +1777,8 @@ TEST_P(WebViewTest, FullscreenResetScrollAndScaleFullscreenStyles) {
web_view_impl->UpdateAllLifecyclePhases();
// Scroll the page down.
- web_view_impl->MainFrame()->SetScrollOffset(WebSize(0, 2000));
- ASSERT_EQ(2000, web_view_impl->MainFrame()->GetScrollOffset().height);
+ web_view_impl->MainFrameImpl()->SetScrollOffset(WebSize(0, 2000));
+ ASSERT_EQ(2000, web_view_impl->MainFrameImpl()->GetScrollOffset().height);
// Enter fullscreen.
Document* document =
@@ -1790,7 +1790,7 @@ TEST_P(WebViewTest, FullscreenResetScrollAndScaleFullscreenStyles) {
web_view_impl->UpdateAllLifecyclePhases();
// Sanity-check. There should be no scrolling possible.
- ASSERT_EQ(0, web_view_impl->MainFrame()->GetScrollOffset().height);
+ ASSERT_EQ(0, web_view_impl->MainFrameImpl()->GetScrollOffset().height);
ASSERT_EQ(0, web_view_impl->MainFrameImpl()
->GetFrameView()
->MaximumScrollOffset()
@@ -1804,7 +1804,7 @@ TEST_P(WebViewTest, FullscreenResetScrollAndScaleFullscreenStyles) {
EXPECT_TRUE(web_view_impl->MainFrameImpl()->GetFrameView()->NeedsLayout());
web_view_impl->UpdateAllLifecyclePhases();
- EXPECT_EQ(2000, web_view_impl->MainFrame()->GetScrollOffset().height);
+ EXPECT_EQ(2000, web_view_impl->MainFrameImpl()->GetScrollOffset().height);
}
// Tests that exiting and immediately reentering fullscreen doesn't cause the
@@ -1817,8 +1817,8 @@ TEST_P(WebViewTest, FullscreenResetScrollAndScaleExitAndReenter) {
web_view_impl->UpdateAllLifecyclePhases();
// Scroll the page down.
- web_view_impl->MainFrame()->SetScrollOffset(WebSize(0, 2000));
- ASSERT_EQ(2000, web_view_impl->MainFrame()->GetScrollOffset().height);
+ web_view_impl->MainFrameImpl()->SetScrollOffset(WebSize(0, 2000));
+ ASSERT_EQ(2000, web_view_impl->MainFrameImpl()->GetScrollOffset().height);
// Enter fullscreen.
Document* document =
@@ -1830,7 +1830,7 @@ TEST_P(WebViewTest, FullscreenResetScrollAndScaleExitAndReenter) {
web_view_impl->UpdateAllLifecyclePhases();
// Sanity-check. There should be no scrolling possible.
- ASSERT_EQ(0, web_view_impl->MainFrame()->GetScrollOffset().height);
+ ASSERT_EQ(0, web_view_impl->MainFrameImpl()->GetScrollOffset().height);
ASSERT_EQ(0, web_view_impl->MainFrameImpl()
->GetFrameView()
->MaximumScrollOffset()
@@ -1845,7 +1845,7 @@ TEST_P(WebViewTest, FullscreenResetScrollAndScaleExitAndReenter) {
web_view_impl->UpdateAllLifecyclePhases();
// Sanity-check. There should be no scrolling possible.
- ASSERT_EQ(0, web_view_impl->MainFrame()->GetScrollOffset().height);
+ ASSERT_EQ(0, web_view_impl->MainFrameImpl()->GetScrollOffset().height);
ASSERT_EQ(0, web_view_impl->MainFrameImpl()
->GetFrameView()
->MaximumScrollOffset()
@@ -1855,7 +1855,7 @@ TEST_P(WebViewTest, FullscreenResetScrollAndScaleExitAndReenter) {
web_view_impl->DidExitFullscreen();
web_view_impl->UpdateAllLifecyclePhases();
- EXPECT_EQ(2000, web_view_impl->MainFrame()->GetScrollOffset().height);
+ EXPECT_EQ(2000, web_view_impl->MainFrameImpl()->GetScrollOffset().height);
}
TEST_P(WebViewTest, EnterFullscreenResetScrollAndScaleState) {
@@ -1864,16 +1864,16 @@ TEST_P(WebViewTest, EnterFullscreenResetScrollAndScaleState) {
web_view_helper_.InitializeAndLoad(base_url_ + "200-by-300.html");
web_view_impl->Resize(WebSize(100, 150));
web_view_impl->UpdateAllLifecyclePhases();
- EXPECT_EQ(0, web_view_impl->MainFrame()->GetScrollOffset().width);
- EXPECT_EQ(0, web_view_impl->MainFrame()->GetScrollOffset().height);
+ EXPECT_EQ(0, web_view_impl->MainFrameImpl()->GetScrollOffset().width);
+ EXPECT_EQ(0, web_view_impl->MainFrameImpl()->GetScrollOffset().height);
// Make the page scale and scroll with the given paremeters.
web_view_impl->SetPageScaleFactor(2.0f);
- web_view_impl->MainFrame()->SetScrollOffset(WebSize(94, 111));
+ web_view_impl->MainFrameImpl()->SetScrollOffset(WebSize(94, 111));
web_view_impl->SetVisualViewportOffset(WebFloatPoint(12, 20));
EXPECT_EQ(2.0f, web_view_impl->PageScaleFactor());
- EXPECT_EQ(94, web_view_impl->MainFrame()->GetScrollOffset().width);
- EXPECT_EQ(111, web_view_impl->MainFrame()->GetScrollOffset().height);
+ EXPECT_EQ(94, web_view_impl->MainFrameImpl()->GetScrollOffset().width);
+ EXPECT_EQ(111, web_view_impl->MainFrameImpl()->GetScrollOffset().height);
EXPECT_EQ(12, web_view_impl->VisualViewportOffset().x);
EXPECT_EQ(20, web_view_impl->VisualViewportOffset().y);
@@ -1897,8 +1897,8 @@ TEST_P(WebViewTest, EnterFullscreenResetScrollAndScaleState) {
web_view_impl->UpdateAllLifecyclePhases();
EXPECT_EQ(2.0f, web_view_impl->PageScaleFactor());
- EXPECT_EQ(94, web_view_impl->MainFrame()->GetScrollOffset().width);
- EXPECT_EQ(111, web_view_impl->MainFrame()->GetScrollOffset().height);
+ EXPECT_EQ(94, web_view_impl->MainFrameImpl()->GetScrollOffset().width);
+ EXPECT_EQ(111, web_view_impl->MainFrameImpl()->GetScrollOffset().height);
EXPECT_EQ(12, web_view_impl->VisualViewportOffset().x);
EXPECT_EQ(20, web_view_impl->VisualViewportOffset().y);
}
« third_party/WebKit/Source/web/WebViewImpl.cpp ('K') | « third_party/WebKit/Source/web/tests/WebFrameTest.cpp ('k') | third_party/WebKit/public/web/WebFrame.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698