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

Unified Diff: Source/core/rendering/FastTextAutosizer.cpp

Issue 336553003: Change Page::m_mainFrame to be a Frame. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebased Created 6 years, 6 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/plugins/DOMMimeType.cpp ('k') | Source/core/rendering/TextAutosizer.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/FastTextAutosizer.cpp
diff --git a/Source/core/rendering/FastTextAutosizer.cpp b/Source/core/rendering/FastTextAutosizer.cpp
index 0e22dc763473827f82cd1aef7c11f0f658cc1dde..0844ee43687ab92a6dc40fea618cda23af81f61b 100644
--- a/Source/core/rendering/FastTextAutosizer.cpp
+++ b/Source/core/rendering/FastTextAutosizer.cpp
@@ -513,7 +513,7 @@ void FastTextAutosizer::updatePageInfo()
RenderView* renderView = m_document->renderView();
bool horizontalWritingMode = isHorizontalWritingMode(renderView->style()->writingMode());
- LocalFrame* mainFrame = m_document->page()->mainFrame();
+ LocalFrame* mainFrame = m_document->page()->deprecatedLocalMainFrame();
IntSize frameSize = m_document->settings()->textAutosizingWindowSizeOverride();
if (frameSize.isEmpty())
frameSize = mainFrame->view()->unscaledVisibleContentSize(IncludeScrollbars);
@@ -1116,7 +1116,7 @@ FastTextAutosizer::TableLayoutScope::TableLayoutScope(RenderTable* table)
}
FastTextAutosizer::DeferUpdatePageInfo::DeferUpdatePageInfo(Page* page)
- : m_mainFrame(page->mainFrame())
+ : m_mainFrame(page->deprecatedLocalMainFrame())
{
if (FastTextAutosizer* textAutosizer = m_mainFrame->document()->fastTextAutosizer()) {
ASSERT(!textAutosizer->m_updatePageInfoDeferred);
« no previous file with comments | « Source/core/plugins/DOMMimeType.cpp ('k') | Source/core/rendering/TextAutosizer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698