Source/core/rendering/FastTextAutosizer.cpp - Issue 317493002: Change FrameTree to return Frames instead of LocalFrames.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 317493002: Change FrameTree to return Frames instead of LocalFrames. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Fixed conflicts 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

« Source/core/page/FrameTree.cpp ('K') | « Source/core/page/Page.cpp ('k') | Source/core/rendering/TextAutosizer.cpp » ('j') | Source/modules/geolocation/testing/InternalsGeolocation.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/rendering/FastTextAutosizer.cpp

diff --git a/Source/core/rendering/FastTextAutosizer.cpp b/Source/core/rendering/FastTextAutosizer.cpp

index 97039c667df51feb4e0390daae391468451d2115..4de9ad058ce016f7950c5bafb1a8d4c6f5f1454f 100644

--- a/Source/core/rendering/FastTextAutosizer.cpp

+++ b/Source/core/rendering/FastTextAutosizer.cpp

@@ -476,8 +476,10 @@ void FastTextAutosizer::updatePageInfoInAllFrames()

{

ASSERT(!m_document->frame() || m_document->frame()->isMainFrame());

- for (LocalFrame* frame = m_document->frame(); frame; frame = frame->tree().traverseNext()) {

- if (FastTextAutosizer* textAutosizer = frame->document()->fastTextAutosizer())

+ for (Frame* frame = m_document->frame(); frame; frame = frame->tree().traverseNext()) {

+ if (!frame->isLocalFrame())

+ continue;

+ if (FastTextAutosizer* textAutosizer = toLocalFrame(frame)->document()->fastTextAutosizer())

textAutosizer->updatePageInfo();

}

« Source/core/page/FrameTree.cpp ('K') | « Source/core/page/Page.cpp ('k') | Source/core/rendering/TextAutosizer.cpp » ('j') | Source/modules/geolocation/testing/InternalsGeolocation.cpp » ('J')