| OLD | NEW |
| 1 #include "core/frame/FrameView.h" | 1 #include "core/frame/FrameView.h" |
| 2 #include "core/layout/LayoutView.h" | |
| 3 #include "core/loader/DocumentLoader.h" | 2 #include "core/loader/DocumentLoader.h" |
| 4 #include "core/loader/FrameLoader.h" | 3 #include "core/loader/FrameLoader.h" |
| 5 #include "platform/testing/URLTestHelpers.h" | 4 #include "platform/testing/URLTestHelpers.h" |
| 6 #include "public/platform/Platform.h" | 5 #include "public/platform/Platform.h" |
| 7 #include "public/platform/WebURLLoaderMockFactory.h" | 6 #include "public/platform/WebURLLoaderMockFactory.h" |
| 8 #include "public/web/WebCache.h" | 7 #include "public/web/WebCache.h" |
| 9 #include "public/web/WebFrame.h" | 8 #include "public/web/WebFrame.h" |
| 10 #include "public/web/WebFrameClient.h" | 9 #include "public/web/WebFrameClient.h" |
| 11 #include "public/web/WebHistoryItem.h" | 10 #include "public/web/WebHistoryItem.h" |
| 12 #include "public/web/WebInputEvent.h" | 11 #include "public/web/WebInputEvent.h" |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 94 | 93 |
| 95 // FrameLoader::restoreScrollPositionAndViewState flows differently if scale
is zero. | 94 // FrameLoader::restoreScrollPositionAndViewState flows differently if scale
is zero. |
| 96 loader.restoreScrollPositionAndViewState(); | 95 loader.restoreScrollPositionAndViewState(); |
| 97 | 96 |
| 98 // Expect that only the scroll position was restored. | 97 // Expect that only the scroll position was restored. |
| 99 EXPECT_EQ(3.0f, webViewImpl->pageScaleFactor()); | 98 EXPECT_EQ(3.0f, webViewImpl->pageScaleFactor()); |
| 100 EXPECT_EQ(400, webViewImpl->mainFrameImpl()->scrollOffset().height); | 99 EXPECT_EQ(400, webViewImpl->mainFrameImpl()->scrollOffset().height); |
| 101 } | 100 } |
| 102 | 101 |
| 103 } // namespace blink | 102 } // namespace blink |
| OLD | NEW |