| OLD | NEW |
| 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 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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->setMainFrameScrollOffset(WebPoint(0, 500)); |
| 94 frame->view()->setWasScrolledByUser(false); | 94 frame->view()->setWasScrolledByUser(false); |
| 95 frame->loader().currentItem()->setPageScaleFactor(0); | 95 frame->loader().currentItem()->setPageScaleFactor(1.0f); |
| 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 1. |
| 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 } |
| OLD | NEW |