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

Unified Diff: third_party/WebKit/Source/core/frame/FrameView.cpp

Issue 2737703002: Remove FrameHost::browserControls() (Closed)
Patch Set: Rebase 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 | « no previous file | third_party/WebKit/Source/core/page/scrolling/TopDocumentRootScrollerController.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/frame/FrameView.cpp
diff --git a/third_party/WebKit/Source/core/frame/FrameView.cpp b/third_party/WebKit/Source/core/frame/FrameView.cpp
index 51019808646d1dd8f1c3ba3116751307e6206892..85977cb686099cde2a01bc2b4e1861dcc3e901cb 100644
--- a/third_party/WebKit/Source/core/frame/FrameView.cpp
+++ b/third_party/WebKit/Source/core/frame/FrameView.cpp
@@ -1415,7 +1415,7 @@ FloatSize FrameView::viewportSizeForViewportUnits() const {
layoutSize.setWidth(layoutViewItem.viewWidth(IncludeScrollbars) / zoom);
layoutSize.setHeight(layoutViewItem.viewHeight(IncludeScrollbars) / zoom);
- BrowserControls& browserControls = m_frame->host()->browserControls();
+ BrowserControls& browserControls = m_frame->page()->browserControls();
if (RuntimeEnabledFeatures::inertTopControlsEnabled() &&
browserControls.permittedState() != WebBrowserControlsHidden) {
// We use the layoutSize rather than frameRect to calculate viewport units
@@ -1646,7 +1646,7 @@ void FrameView::viewportSizeChanged(bool widthChanged, bool heightChanged) {
}
if (RuntimeEnabledFeatures::inertTopControlsEnabled() && layoutView() &&
- m_frame->isMainFrame() && m_frame->host()->browserControls().height()) {
+ m_frame->isMainFrame() && m_frame->page()->browserControls().height()) {
if (layoutView()->style()->hasFixedBackgroundImage()) {
// In the case where we don't change layout size from top control resizes,
// we wont perform a layout. If we have a fixed background image however,
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/page/scrolling/TopDocumentRootScrollerController.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698