OLD | NEW |
1 #include "core/frame/FrameView.h" | 1 #include "core/frame/FrameView.h" |
2 #include "core/loader/DocumentLoader.h" | 2 #include "core/loader/DocumentLoader.h" |
3 #include "core/loader/FrameLoader.h" | 3 #include "core/loader/FrameLoader.h" |
4 #include "platform/testing/URLTestHelpers.h" | 4 #include "platform/testing/URLTestHelpers.h" |
5 #include "public/platform/Platform.h" | 5 #include "public/platform/Platform.h" |
6 #include "public/platform/WebURLLoaderMockFactory.h" | 6 #include "public/platform/WebURLLoaderMockFactory.h" |
7 #include "public/web/WebCache.h" | 7 #include "public/web/WebCache.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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
49 webView->updateAllLifecyclePhases(); | 49 webView->updateAllLifecyclePhases(); |
50 | 50 |
51 WebViewImpl* webViewImpl = toWebViewImpl(webView); | 51 WebViewImpl* webViewImpl = toWebViewImpl(webView); |
52 FrameLoader& loader = webViewImpl->mainFrameImpl()->frame()->loader(); | 52 FrameLoader& loader = webViewImpl->mainFrameImpl()->frame()->loader(); |
53 loader.setLoadType(FrameLoadTypeBackForward); | 53 loader.setLoadType(FrameLoadTypeBackForward); |
54 | 54 |
55 webViewImpl->setPageScaleFactor(3.0f); | 55 webViewImpl->setPageScaleFactor(3.0f); |
56 webViewImpl->mainFrame()->setScrollOffset(WebSize(0, 500)); | 56 webViewImpl->mainFrame()->setScrollOffset(WebSize(0, 500)); |
57 loader.documentLoader()->initialScrollState().wasScrolledByUser = false; | 57 loader.documentLoader()->initialScrollState().wasScrolledByUser = false; |
58 loader.currentItem()->setPageScaleFactor(2); | 58 loader.currentItem()->setPageScaleFactor(2); |
59 loader.currentItem()->setScrollPoint(WebPoint(0, 200)); | 59 loader.currentItem()->setScrollOffset(ScrollOffset(0, 200)); |
60 | 60 |
61 // Flip back the wasScrolledByUser flag which was set to true by setPageScaleF
actor | 61 // Flip back the wasScrolledByUser flag which was set to true by setPageScaleF
actor |
62 // because otherwise FrameLoader::restoreScrollPositionAndViewState does nothi
ng. | 62 // because otherwise FrameLoader::restoreScrollPositionAndViewState does nothi
ng. |
63 loader.documentLoader()->initialScrollState().wasScrolledByUser = false; | 63 loader.documentLoader()->initialScrollState().wasScrolledByUser = false; |
64 loader.restoreScrollPositionAndViewState(); | 64 loader.restoreScrollPositionAndViewState(); |
65 | 65 |
66 // Expect that both scroll and scale were restored. | 66 // Expect that both scroll and scale were restored. |
67 EXPECT_EQ(2.0f, webViewImpl->pageScaleFactor()); | 67 EXPECT_EQ(2.0f, webViewImpl->pageScaleFactor()); |
68 EXPECT_EQ(200, webViewImpl->mainFrameImpl()->scrollOffset().height); | 68 EXPECT_EQ(200, webViewImpl->mainFrameImpl()->scrollOffset().height); |
69 } | 69 } |
70 | 70 |
71 TEST_F(ProgrammaticScrollTest, RestoreScrollPositionAndViewStateWithoutScale) { | 71 TEST_F(ProgrammaticScrollTest, RestoreScrollPositionAndViewStateWithoutScale) { |
72 registerMockedHttpURLLoad("long_scroll.html"); | 72 registerMockedHttpURLLoad("long_scroll.html"); |
73 | 73 |
74 FrameTestHelpers::WebViewHelper webViewHelper; | 74 FrameTestHelpers::WebViewHelper webViewHelper; |
75 WebView* webView = webViewHelper.initializeAndLoad( | 75 WebView* webView = webViewHelper.initializeAndLoad( |
76 m_baseURL + "long_scroll.html", true, 0, 0); | 76 m_baseURL + "long_scroll.html", true, 0, 0); |
77 webView->resize(WebSize(1000, 1000)); | 77 webView->resize(WebSize(1000, 1000)); |
78 webView->updateAllLifecyclePhases(); | 78 webView->updateAllLifecyclePhases(); |
79 | 79 |
80 WebViewImpl* webViewImpl = toWebViewImpl(webView); | 80 WebViewImpl* webViewImpl = toWebViewImpl(webView); |
81 FrameLoader& loader = webViewImpl->mainFrameImpl()->frame()->loader(); | 81 FrameLoader& loader = webViewImpl->mainFrameImpl()->frame()->loader(); |
82 loader.setLoadType(FrameLoadTypeBackForward); | 82 loader.setLoadType(FrameLoadTypeBackForward); |
83 | 83 |
84 webViewImpl->setPageScaleFactor(3.0f); | 84 webViewImpl->setPageScaleFactor(3.0f); |
85 webViewImpl->mainFrame()->setScrollOffset(WebSize(0, 500)); | 85 webViewImpl->mainFrame()->setScrollOffset(WebSize(0, 500)); |
86 loader.documentLoader()->initialScrollState().wasScrolledByUser = false; | 86 loader.documentLoader()->initialScrollState().wasScrolledByUser = false; |
87 loader.currentItem()->setPageScaleFactor(0); | 87 loader.currentItem()->setPageScaleFactor(0); |
88 loader.currentItem()->setScrollPoint(WebPoint(0, 400)); | 88 loader.currentItem()->setScrollOffset(ScrollOffset(0, 400)); |
89 | 89 |
90 // FrameLoader::restoreScrollPositionAndViewState flows differently if scale i
s zero. | 90 // FrameLoader::restoreScrollPositionAndViewState flows differently if scale i
s zero. |
91 loader.restoreScrollPositionAndViewState(); | 91 loader.restoreScrollPositionAndViewState(); |
92 | 92 |
93 // Expect that only the scroll position was restored. | 93 // Expect that only the scroll position was restored. |
94 EXPECT_EQ(3.0f, webViewImpl->pageScaleFactor()); | 94 EXPECT_EQ(3.0f, webViewImpl->pageScaleFactor()); |
95 EXPECT_EQ(400, webViewImpl->mainFrameImpl()->scrollOffset().height); | 95 EXPECT_EQ(400, webViewImpl->mainFrameImpl()->scrollOffset().height); |
96 } | 96 } |
97 | 97 |
98 } // namespace blink | 98 } // namespace blink |
OLD | NEW |