Source/core/testing/Internals.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/testing/Internals.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/storage/StorageArea.cpp ('k') | Source/modules/geolocation/testing/InternalsGeolocation.cpp » ('j') | Source/modules/geolocation/testing/InternalsGeolocation.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/testing/Internals.cpp

diff --git a/Source/core/testing/Internals.cpp b/Source/core/testing/Internals.cpp

index 58ae5411fb34bc30aa723a12ad376b036497acfe..753197aeea236b1fc8445f3eaa2ebe88a0f8ef88 100644

--- a/Source/core/testing/Internals.cpp

+++ b/Source/core/testing/Internals.cpp

@@ -1602,9 +1602,9 @@ unsigned Internals::numberOfScrollableAreas(Document* document, ExceptionState&)

if (frame->view()->scrollableAreas())

count += frame->view()->scrollableAreas()->size();

- for (LocalFrame* child = frame->tree().firstChild(); child; child = child->tree().nextSibling()) {

- if (child->view() && child->view()->scrollableAreas())

- count += child->view()->scrollableAreas()->size();

+ for (Frame* child = frame->tree().firstChild(); child; child = child->tree().nextSibling()) {

+ if (child->isLocalFrame() && toLocalFrame(child)->view() && toLocalFrame(child)->view()->scrollableAreas())

+ count += toLocalFrame(child)->view()->scrollableAreas()->size();

}

return count;