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

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: Now 100% more buildable on debug 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
« no previous file with comments | « Source/core/html/ImageDocument.cpp ('k') | Source/core/rendering/RenderLayer.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/page/FrameView.cpp
diff --git a/Source/core/page/FrameView.cpp b/Source/core/page/FrameView.cpp
index 363b82651bbec69b06c27b1e955a19c7969cc76f..6c8c270817adc66ae49bbd73d7f4e4a120c4c9bd 100644
--- a/Source/core/page/FrameView.cpp
+++ b/Source/core/page/FrameView.cpp
@@ -584,7 +584,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) {
@@ -2706,8 +2706,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;
}
« no previous file with comments | « Source/core/html/ImageDocument.cpp ('k') | Source/core/rendering/RenderLayer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698