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

Unified Diff: Source/web/tests/WebFrameTest.cpp

Issue 317493002: Change FrameTree to return Frames instead of LocalFrames. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: dcheng's comment addressed 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/web/WebViewImpl.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/tests/WebFrameTest.cpp
diff --git a/Source/web/tests/WebFrameTest.cpp b/Source/web/tests/WebFrameTest.cpp
index b0fdef8e6bd66b00cd63cdd97ed88eed4ba6fd7b..786e119f528bee9b74d0cd8ec830c0158d3b9c08 100644
--- a/Source/web/tests/WebFrameTest.cpp
+++ b/Source/web/tests/WebFrameTest.cpp
@@ -760,17 +760,21 @@ TEST_F(WebFrameTest, SetFrameRectInvalidatesTextAutosizingMultipliers)
webViewHelper.webViewImpl()->resize(WebSize(viewportWidth, viewportHeight));
webViewHelper.webViewImpl()->layout();
- for (WebCore::LocalFrame* frame = mainFrame; frame; frame = frame->tree().traverseNext()) {
- EXPECT_TRUE(setTextAutosizingMultiplier(frame->document(), 2));
- for (WebCore::RenderObject* renderer = frame->document()->renderView(); renderer; renderer = renderer->nextInPreOrder()) {
+ for (WebCore::Frame* frame = mainFrame; frame; frame = frame->tree().traverseNext()) {
+ if (!frame->isLocalFrame())
+ continue;
+ EXPECT_TRUE(setTextAutosizingMultiplier(toLocalFrame(frame)->document(), 2));
+ for (WebCore::RenderObject* renderer = toLocalFrame(frame)->document()->renderView(); renderer; renderer = renderer->nextInPreOrder()) {
if (renderer->isText())
EXPECT_FALSE(renderer->needsLayout());
}
}
frameView->setFrameRect(WebCore::IntRect(0, 0, 200, 200));
- for (WebCore::LocalFrame* frame = mainFrame; frame; frame = frame->tree().traverseNext()) {
- for (WebCore::RenderObject* renderer = frame->document()->renderView(); renderer; renderer = renderer->nextInPreOrder()) {
+ for (WebCore::Frame* frame = mainFrame; frame; frame = frame->tree().traverseNext()) {
+ if (!frame->isLocalFrame())
+ continue;
+ for (WebCore::RenderObject* renderer = toLocalFrame(frame)->document()->renderView(); renderer; renderer = renderer->nextInPreOrder()) {
if (renderer->isText())
EXPECT_TRUE(renderer->needsLayout());
}
« no previous file with comments | « Source/web/WebViewImpl.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698