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

Unified Diff: third_party/WebKit/Source/core/paint/BoxPaintInvalidatorTest.cpp

Issue 2504573002: Don't call isURLAllowed() from layout. (Closed)
Patch Set: Fix bad formatting that caused clang-format-diff to get confused. Created 4 years, 1 month 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
Index: third_party/WebKit/Source/core/paint/BoxPaintInvalidatorTest.cpp
diff --git a/third_party/WebKit/Source/core/paint/BoxPaintInvalidatorTest.cpp b/third_party/WebKit/Source/core/paint/BoxPaintInvalidatorTest.cpp
index 5ff11925faa05504b284679c8fb438041db1d338..5425e633748bf9f064a3c72665640e6a4bc1dc6a 100644
--- a/third_party/WebKit/Source/core/paint/BoxPaintInvalidatorTest.cpp
+++ b/third_party/WebKit/Source/core/paint/BoxPaintInvalidatorTest.cpp
@@ -316,8 +316,7 @@ TEST_P(BoxPaintInvalidatorTest, NonCompositedLayoutViewResize) {
" iframe { display: block; width: 100px; height: 100px; border: none; }"
"</style>"
"<iframe id='iframe'></iframe>");
- Document& frameDocument = setupChildIframe(
- "iframe",
+ setChildFrameHTML(
"<style>"
" ::-webkit-scrollbar { display: none }"
" body { margin: 0; background: green; height: 0 }"
@@ -325,7 +324,7 @@ TEST_P(BoxPaintInvalidatorTest, NonCompositedLayoutViewResize) {
"<div id='content' style='width: 200px; height: 200px'></div>");
document().view()->updateAllLifecyclePhases();
Element* iframe = document().getElementById("iframe");
- Element* content = frameDocument.getElementById("content");
+ Element* content = childDocument().getElementById("content");
EXPECT_EQ(layoutView(),
content->layoutObject()->containerForPaintInvalidation());
@@ -370,8 +369,7 @@ TEST_P(BoxPaintInvalidatorTest, NonCompositedLayoutViewGradientResize) {
" iframe { display: block; width: 100px; height: 100px; border: none; }"
"</style>"
"<iframe id='iframe'></iframe>");
- Document& frameDocument = setupChildIframe(
- "iframe",
+ setChildFrameHTML(
"<style>"
" ::-webkit-scrollbar { display: none }"
" body {"
@@ -383,7 +381,7 @@ TEST_P(BoxPaintInvalidatorTest, NonCompositedLayoutViewGradientResize) {
"<div id='content' style='width: 200px; height: 200px'></div>");
document().view()->updateAllLifecyclePhases();
Element* iframe = document().getElementById("iframe");
- Element* content = frameDocument.getElementById("content");
+ Element* content = childDocument().getElementById("content");
LayoutView* frameLayoutView = content->layoutObject()->view();
EXPECT_EQ(layoutView(),
content->layoutObject()->containerForPaintInvalidation());

Powered by Google App Engine
This is Rietveld 408576698