Chromium Code Reviews| Index: Source/core/rendering/TextAutosizer.cpp |
| diff --git a/Source/core/rendering/TextAutosizer.cpp b/Source/core/rendering/TextAutosizer.cpp |
| index 226c2894214abbd795d09dd63e2337002984b9a1..8685e0fce5cf979207fd6fefc206c0ce0139a8ad 100644 |
| --- a/Source/core/rendering/TextAutosizer.cpp |
| +++ b/Source/core/rendering/TextAutosizer.cpp |
| @@ -509,7 +509,13 @@ void TextAutosizer::updatePageInfo() |
| RenderView* renderView = m_document->renderView(); |
| bool horizontalWritingMode = isHorizontalWritingMode(renderView->style()->writingMode()); |
| - LocalFrame* mainFrame = m_document->page()->deprecatedLocalMainFrame(); |
| + // FIXME: With out-of-process iframes, the top frame can be remote and |
| + // doesn't have sizing information. Just return if this is the case. |
| + Frame* frame = m_document->frame()->tree().top(); |
| + if (frame->isRemoteFrame()) |
| + return; |
| + |
| + LocalFrame* mainFrame = toLocalFrame(frame); |
|
dcheng
2014/10/23 21:48:17
I would probably still use dprecatedLocalMainFrame
nasko
2014/10/23 21:50:44
Done.
|
| IntSize frameSize = m_document->settings()->textAutosizingWindowSizeOverride(); |
| if (frameSize.isEmpty()) |
| frameSize = windowSize(); |