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

Side by Side Diff: Source/web/tests/ProgrammaticScrollTest.cpp

Issue 1163433003: Remove WebViewImpl helper methods for setting scroll offset. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Renamed outerViewport to layoutViewport 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 unified diff | Download patch
« no previous file with comments | « Source/web/tests/PinchViewportTest.cpp ('k') | Source/web/tests/TopControlsTest.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #include "config.h" 1 #include "config.h"
2 2
3 #include "core/frame/FrameView.h" 3 #include "core/frame/FrameView.h"
4 #include "core/layout/LayoutView.h" 4 #include "core/layout/LayoutView.h"
5 #include "platform/testing/URLTestHelpers.h" 5 #include "platform/testing/URLTestHelpers.h"
6 #include "public/platform/Platform.h" 6 #include "public/platform/Platform.h"
7 #include "public/platform/WebUnitTestSupport.h" 7 #include "public/platform/WebUnitTestSupport.h"
8 #include "public/web/WebFrame.h" 8 #include "public/web/WebFrame.h"
9 #include "public/web/WebFrameClient.h" 9 #include "public/web/WebFrameClient.h"
10 #include "public/web/WebHistoryItem.h" 10 #include "public/web/WebHistoryItem.h"
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 FrameTestHelpers::WebViewHelper webViewHelper; 54 FrameTestHelpers::WebViewHelper webViewHelper;
55 WebView* webView = webViewHelper.initializeAndLoad(m_baseURL + "long_scroll. html", true, 0, 0); 55 WebView* webView = webViewHelper.initializeAndLoad(m_baseURL + "long_scroll. html", true, 0, 0);
56 webView->resize(WebSize(1000, 1000)); 56 webView->resize(WebSize(1000, 1000));
57 webView->layout(); 57 webView->layout();
58 58
59 WebViewImpl* webViewImpl = toWebViewImpl(webView); 59 WebViewImpl* webViewImpl = toWebViewImpl(webView);
60 LocalFrame* frame = webViewImpl->mainFrameImpl()->frame(); 60 LocalFrame* frame = webViewImpl->mainFrameImpl()->frame();
61 frame->loader().setLoadType(FrameLoadTypeBackForward); 61 frame->loader().setLoadType(FrameLoadTypeBackForward);
62 62
63 webViewImpl->setPageScaleFactor(3.0f); 63 webViewImpl->setPageScaleFactor(3.0f);
64 webViewImpl->setMainFrameScrollOffset(WebPoint(0, 500)); 64 webViewImpl->mainFrame()->setScrollOffset(WebSize(0, 500));
65 frame->view()->setWasScrolledByUser(false); 65 frame->view()->setWasScrolledByUser(false);
66 frame->loader().currentItem()->setPageScaleFactor(2); 66 frame->loader().currentItem()->setPageScaleFactor(2);
67 frame->loader().currentItem()->setScrollPoint(WebPoint(0, 200)); 67 frame->loader().currentItem()->setScrollPoint(WebPoint(0, 200));
68 68
69 // Flip back the wasScrolledByUser flag which was set to true by setPageScal eFactor 69 // Flip back the wasScrolledByUser flag which was set to true by setPageScal eFactor
70 // because otherwise FrameLoader::restoreScrollPositionAndViewState does not hing. 70 // because otherwise FrameLoader::restoreScrollPositionAndViewState does not hing.
71 frame->view()->setWasScrolledByUser(false); 71 frame->view()->setWasScrolledByUser(false);
72 frame->loader().restoreScrollPositionAndViewState(); 72 frame->loader().restoreScrollPositionAndViewState();
73 73
74 // Expect that both scroll and scale were restored. 74 // Expect that both scroll and scale were restored.
75 EXPECT_EQ(2.0f, webViewImpl->pageScaleFactor()); 75 EXPECT_EQ(2.0f, webViewImpl->pageScaleFactor());
76 EXPECT_EQ(200, webViewImpl->mainFrameImpl()->scrollOffset().height); 76 EXPECT_EQ(200, webViewImpl->mainFrameImpl()->scrollOffset().height);
77 } 77 }
78 78
79 TEST_F(ProgrammaticScrollTest, RestoreScrollPositionAndViewStateWithoutScale) 79 TEST_F(ProgrammaticScrollTest, RestoreScrollPositionAndViewStateWithoutScale)
80 { 80 {
81 registerMockedHttpURLLoad("long_scroll.html"); 81 registerMockedHttpURLLoad("long_scroll.html");
82 82
83 FrameTestHelpers::WebViewHelper webViewHelper; 83 FrameTestHelpers::WebViewHelper webViewHelper;
84 WebView* webView = webViewHelper.initializeAndLoad(m_baseURL + "long_scroll. html", true, 0, 0); 84 WebView* webView = webViewHelper.initializeAndLoad(m_baseURL + "long_scroll. html", true, 0, 0);
85 webView->resize(WebSize(1000, 1000)); 85 webView->resize(WebSize(1000, 1000));
86 webView->layout(); 86 webView->layout();
87 87
88 WebViewImpl* webViewImpl = toWebViewImpl(webView); 88 WebViewImpl* webViewImpl = toWebViewImpl(webView);
89 LocalFrame* frame = webViewImpl->mainFrameImpl()->frame(); 89 LocalFrame* frame = webViewImpl->mainFrameImpl()->frame();
90 frame->loader().setLoadType(FrameLoadTypeBackForward); 90 frame->loader().setLoadType(FrameLoadTypeBackForward);
91 91
92 webViewImpl->setPageScaleFactor(3.0f); 92 webViewImpl->setPageScaleFactor(3.0f);
93 webViewImpl->setMainFrameScrollOffset(WebPoint(0, 500)); 93 webViewImpl->mainFrame()->setScrollOffset(WebSize(0, 500));
94 frame->view()->setWasScrolledByUser(false); 94 frame->view()->setWasScrolledByUser(false);
95 frame->loader().currentItem()->setPageScaleFactor(0); 95 frame->loader().currentItem()->setPageScaleFactor(0);
96 frame->loader().currentItem()->setScrollPoint(WebPoint(0, 400)); 96 frame->loader().currentItem()->setScrollPoint(WebPoint(0, 400));
97 97
98 // FrameLoader::restoreScrollPositionAndViewState flows differently if scale is zero. 98 // FrameLoader::restoreScrollPositionAndViewState flows differently if scale is zero.
99 frame->loader().restoreScrollPositionAndViewState(); 99 frame->loader().restoreScrollPositionAndViewState();
100 100
101 // Expect that only the scroll position was restored. 101 // Expect that only the scroll position was restored.
102 EXPECT_EQ(3.0f, webViewImpl->pageScaleFactor()); 102 EXPECT_EQ(3.0f, webViewImpl->pageScaleFactor());
103 EXPECT_EQ(400, webViewImpl->mainFrameImpl()->scrollOffset().height); 103 EXPECT_EQ(400, webViewImpl->mainFrameImpl()->scrollOffset().height);
104 } 104 }
105 105
106 } 106 }
OLDNEW
« no previous file with comments | « Source/web/tests/PinchViewportTest.cpp ('k') | Source/web/tests/TopControlsTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698