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

Unified Diff: Source/core/page/FrameView.cpp

Issue 26444008: Remove several Page.h includes in preparation for removing page/ dependencies from the rest of core (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 2 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
Index: Source/core/page/FrameView.cpp
diff --git a/Source/core/page/FrameView.cpp b/Source/core/page/FrameView.cpp
index f8d64d9fff304c4fcc2e6c45d99eb79e53bbaa99..43ebe1fa5ccdcfd1dde93775b28038f9b9ddf0a6 100644
--- a/Source/core/page/FrameView.cpp
+++ b/Source/core/page/FrameView.cpp
@@ -583,7 +583,7 @@ void FrameView::applyOverflowToViewport(RenderObject* o, ScrollbarMode& hMode, S
}
bool ignoreOverflowHidden = false;
- if (m_frame->page()->settings().ignoreMainFrameOverflowHiddenQuirk() && m_frame->page()->mainFrame() == m_frame)
+ if (m_frame->settings()->ignoreMainFrameOverflowHiddenQuirk() && m_frame->page()->mainFrame() == m_frame)
ignoreOverflowHidden = true;
switch (overflowX) {
@@ -2693,8 +2693,8 @@ void FrameView::notifyPageThatContentAreaWillPaint() const
bool FrameView::scrollAnimatorEnabled() const
{
- if (Page* page = m_frame->page())
- return page->settings().scrollAnimatorEnabled();
+ if (m_frame->settings())
+ return m_frame->settings()->scrollAnimatorEnabled();
return false;
}

Powered by Google App Engine
This is Rietveld 408576698