| 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/WebInputEvent.h" |
| 6 #include "public/platform/WebURLLoaderMockFactory.h" | 7 #include "public/platform/WebURLLoaderMockFactory.h" |
| 7 #include "public/web/WebCache.h" | 8 #include "public/web/WebCache.h" |
| 8 #include "public/web/WebFrame.h" | 9 #include "public/web/WebFrame.h" |
| 9 #include "public/web/WebFrameClient.h" | 10 #include "public/web/WebFrameClient.h" |
| 10 #include "public/web/WebHistoryItem.h" | 11 #include "public/web/WebHistoryItem.h" |
| 11 #include "public/web/WebInputEvent.h" | |
| 12 #include "public/web/WebScriptSource.h" | 12 #include "public/web/WebScriptSource.h" |
| 13 #include "public/web/WebSettings.h" | 13 #include "public/web/WebSettings.h" |
| 14 #include "public/web/WebView.h" | 14 #include "public/web/WebView.h" |
| 15 #include "testing/gtest/include/gtest/gtest.h" | 15 #include "testing/gtest/include/gtest/gtest.h" |
| 16 #include "web/WebLocalFrameImpl.h" | 16 #include "web/WebLocalFrameImpl.h" |
| 17 #include "web/WebViewImpl.h" | 17 #include "web/WebViewImpl.h" |
| 18 #include "web/tests/FrameTestHelpers.h" | 18 #include "web/tests/FrameTestHelpers.h" |
| 19 | 19 |
| 20 namespace blink { | 20 namespace blink { |
| 21 | 21 |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 91 // FrameLoader::restoreScrollPositionAndViewState flows differently if scale | 91 // FrameLoader::restoreScrollPositionAndViewState flows differently if scale |
| 92 // is zero. | 92 // is zero. |
| 93 loader.restoreScrollPositionAndViewState(); | 93 loader.restoreScrollPositionAndViewState(); |
| 94 | 94 |
| 95 // Expect that only the scroll position was restored. | 95 // Expect that only the scroll position was restored. |
| 96 EXPECT_EQ(3.0f, webViewImpl->pageScaleFactor()); | 96 EXPECT_EQ(3.0f, webViewImpl->pageScaleFactor()); |
| 97 EXPECT_EQ(400, webViewImpl->mainFrameImpl()->scrollOffset().height); | 97 EXPECT_EQ(400, webViewImpl->mainFrameImpl()->scrollOffset().height); |
| 98 } | 98 } |
| 99 | 99 |
| 100 } // namespace blink | 100 } // namespace blink |
| OLD | NEW |