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

Unified Diff: third_party/WebKit/Source/core/loader/FrameLoader.cpp

Issue 2730573003: Moved FrameHost::m_visualViewport to Page (Closed)
Patch Set: Fixed some compile errors on mac and android Created 3 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/core/loader/EmptyClients.cpp ('k') | third_party/WebKit/Source/core/page/Page.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/loader/FrameLoader.cpp
diff --git a/third_party/WebKit/Source/core/loader/FrameLoader.cpp b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
index c62bf542fd782894d871b71ee394e0dcdf53ce78..90715009cd17ed152842ac047ed4e2c38052a198 100644
--- a/third_party/WebKit/Source/core/loader/FrameLoader.cpp
+++ b/third_party/WebKit/Source/core/loader/FrameLoader.cpp
@@ -279,7 +279,7 @@ void FrameLoader::saveScrollState() {
m_frame->view()->layoutViewportScrollableArea())
m_currentItem->setScrollOffset(layoutScrollableArea->getScrollOffset());
m_currentItem->setVisualViewportScrollOffset(toScrollOffset(
- m_frame->host()->visualViewport().visibleRect().location()));
+ m_frame->page()->visualViewport().visibleRect().location()));
if (m_frame->isMainFrame())
m_currentItem->setPageScaleFactor(m_frame->page()->pageScaleFactor());
@@ -1452,7 +1452,7 @@ void FrameLoader::restoreScrollPositionAndViewStateForLoadType(
view->layoutViewportScrollableArea()->getScrollOffset();
}
- VisualViewport& visualViewport = m_frame->host()->visualViewport();
+ VisualViewport& visualViewport = m_frame->page()->visualViewport();
if (shouldRestoreScale && shouldRestoreScroll) {
visualViewport.setScaleAndLocation(m_currentItem->pageScaleFactor(),
FloatPoint(visualViewportOffset));
« no previous file with comments | « third_party/WebKit/Source/core/loader/EmptyClients.cpp ('k') | third_party/WebKit/Source/core/page/Page.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698