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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1375393002: Output subsequence for children layers (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix blink_platform_unittests and address pdr's comments Created 5 years, 3 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
« third_party/WebKit/Source/core/paint/DeprecatedPaintLayerPainter.cpp ('K') | « third_party/WebKit/Source/core/paint/DeprecatedPaintLayerPainter.cpp ('k') | third_party/WebKit/Source/core/paint/DisplayItemListPaintTest.h » ('j') | third_party/WebKit/Source/platform/graphics/paint/DisplayItemListTest.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/paint/DeprecatedPaintLayerPainterTest.cpp
diff --git a/third_party/WebKit/Source/core/paint/DeprecatedPaintLayerPainterTest.cpp b/third_party/WebKit/Source/core/paint/DeprecatedPaintLayerPainterTest.cpp
index 58152a6e465cc25e2c4aa2c431b17aa0fba40ac4..4aa102d8b8b5841bc31f092d2b12f2a589b9ef84 100644
--- a/third_party/WebKit/Source/core/paint/DeprecatedPaintLayerPainterTest.cpp
+++ b/third_party/WebKit/Source/core/paint/DeprecatedPaintLayerPainterTest.cpp
@@ -17,11 +17,11 @@ TEST_F(DeprecatedPaintLayerPainterTest, CachedSubsequence)
RuntimeEnabledFeatures::setSlimmingPaintSubsequenceCachingEnabled(true);
setBodyInnerHTML(
- "<div id='container1' style='position: relative; width: 200px; height: 200px; background-color: blue'>"
- " <div id='content1' style='width: 100px; height: 100px; background-color: red'></div>"
+ "<div id='container1' style='position: relative; z-index: 1; width: 200px; height: 200px; background-color: blue'>"
+ " <div id='content1' style='position: absolute; width: 100px; height: 100px; background-color: red'></div>"
"</div>"
- "<div id='container2' style='position: relative; width: 200px; height: 200px; background-color: blue'>"
- " <div id='content2' style='width: 100px; height: 100px; background-color: green'></div>"
+ "<div id='container2' style='position: relative; z-index: 1; width: 200px; height: 200px; background-color: blue'>"
+ " <div id='content2' style='position: absolute; width: 100px; height: 100px; background-color: green'></div>"
"</div>");
document().view()->updateAllLifecyclePhases();
@@ -40,74 +40,76 @@ TEST_F(DeprecatedPaintLayerPainterTest, CachedSubsequence)
rootDisplayItemList().commitNewDisplayItems();
EXPECT_DISPLAY_LIST(rootDisplayItemList().displayItems(), 13,
- TestDisplayItem(rootLayer, DisplayItem::BeginSubsequence),
- TestDisplayItem(layoutView(), DisplayItem::BoxDecorationBackground),
- TestDisplayItem(htmlLayer, DisplayItem::BeginSubsequence),
- TestDisplayItem(container1Layer, DisplayItem::BeginSubsequence),
- TestDisplayItem(container1, DisplayItem::BoxDecorationBackground),
- TestDisplayItem(content1, DisplayItem::BoxDecorationBackground),
- TestDisplayItem(container1Layer, DisplayItem::EndSubsequence),
- TestDisplayItem(container2Layer, DisplayItem::BeginSubsequence),
- TestDisplayItem(container2, DisplayItem::BoxDecorationBackground),
- TestDisplayItem(content2, DisplayItem::BoxDecorationBackground),
- TestDisplayItem(container2Layer, DisplayItem::EndSubsequence),
- TestDisplayItem(htmlLayer, DisplayItem::EndSubsequence),
- TestDisplayItem(rootLayer, DisplayItem::EndSubsequence));
-
- toHTMLElement(content1.node())->setAttribute(HTMLNames::styleAttr, "width: 100px; height: 100px; background-color: green");
+ TestDisplayItem(layoutView(), backgroundType),
+ TestDisplayItem(rootLayer, subsequenceType),
+ TestDisplayItem(htmlLayer, subsequenceType),
+ TestDisplayItem(container1, backgroundType),
+ TestDisplayItem(container1Layer, subsequenceType),
+ TestDisplayItem(content1, backgroundType),
+ TestDisplayItem(container1Layer, endSubsequenceType),
+ TestDisplayItem(container2, backgroundType),
+ TestDisplayItem(container2Layer, subsequenceType),
+ TestDisplayItem(content2, backgroundType),
+ TestDisplayItem(container2Layer, endSubsequenceType),
+ TestDisplayItem(htmlLayer, endSubsequenceType),
+ TestDisplayItem(rootLayer, endSubsequenceType));
+
+ toHTMLElement(content1.node())->setAttribute(HTMLNames::styleAttr, "position: absolute; width: 100px; height: 100px; background-color: green");
document().view()->updateAllLifecyclePhases();
DeprecatedPaintLayerPainter(rootLayer).paintLayerContents(&context, paintingInfo, PaintLayerPaintingCompositingAllPhases);
- EXPECT_DISPLAY_LIST(rootDisplayItemList().newDisplayItems(), 10,
- TestDisplayItem(rootLayer, DisplayItem::BeginSubsequence),
- TestDisplayItem(layoutView(), DisplayItem::drawingTypeToCachedDrawingType(DisplayItem::BoxDecorationBackground)),
- TestDisplayItem(htmlLayer, DisplayItem::BeginSubsequence),
- TestDisplayItem(container1Layer, DisplayItem::BeginSubsequence),
- TestDisplayItem(container1, DisplayItem::drawingTypeToCachedDrawingType(DisplayItem::BoxDecorationBackground)),
- TestDisplayItem(content1, DisplayItem::BoxDecorationBackground),
- TestDisplayItem(container1Layer, DisplayItem::EndSubsequence),
- TestDisplayItem(container2Layer, DisplayItem::CachedSubsequence),
- TestDisplayItem(htmlLayer, DisplayItem::EndSubsequence),
- TestDisplayItem(rootLayer, DisplayItem::EndSubsequence));
+ EXPECT_DISPLAY_LIST(rootDisplayItemList().newDisplayItems(), 11,
+ TestDisplayItem(layoutView(), cachedBackgroundType),
+ TestDisplayItem(rootLayer, subsequenceType),
+ TestDisplayItem(htmlLayer, subsequenceType),
+ TestDisplayItem(container1, cachedBackgroundType),
+ TestDisplayItem(container1Layer, subsequenceType),
+ TestDisplayItem(content1, backgroundType),
+ TestDisplayItem(container1Layer, endSubsequenceType),
+ TestDisplayItem(container2, cachedBackgroundType),
+ TestDisplayItem(container2Layer, cachedSubsequenceType),
+ TestDisplayItem(htmlLayer, endSubsequenceType),
+ TestDisplayItem(rootLayer, endSubsequenceType));
rootDisplayItemList().commitNewDisplayItems();
EXPECT_DISPLAY_LIST(rootDisplayItemList().displayItems(), 13,
- TestDisplayItem(rootLayer, DisplayItem::BeginSubsequence),
- TestDisplayItem(layoutView(), DisplayItem::BoxDecorationBackground),
- TestDisplayItem(htmlLayer, DisplayItem::BeginSubsequence),
- TestDisplayItem(container1Layer, DisplayItem::BeginSubsequence),
- TestDisplayItem(container1, DisplayItem::BoxDecorationBackground),
- TestDisplayItem(content1, DisplayItem::BoxDecorationBackground),
- TestDisplayItem(container1Layer, DisplayItem::EndSubsequence),
- TestDisplayItem(container2Layer, DisplayItem::BeginSubsequence),
- TestDisplayItem(container2, DisplayItem::BoxDecorationBackground),
- TestDisplayItem(content2, DisplayItem::BoxDecorationBackground),
- TestDisplayItem(container2Layer, DisplayItem::EndSubsequence),
- TestDisplayItem(htmlLayer, DisplayItem::EndSubsequence),
- TestDisplayItem(rootLayer, DisplayItem::EndSubsequence));
+ TestDisplayItem(layoutView(), backgroundType),
+ TestDisplayItem(rootLayer, subsequenceType),
+ TestDisplayItem(htmlLayer, subsequenceType),
+ TestDisplayItem(container1, backgroundType),
+ TestDisplayItem(container1Layer, subsequenceType),
+ TestDisplayItem(content1, backgroundType),
+ TestDisplayItem(container1Layer, endSubsequenceType),
+ TestDisplayItem(container2, backgroundType),
+ TestDisplayItem(container2Layer, subsequenceType),
+ TestDisplayItem(content2, backgroundType),
+ TestDisplayItem(container2Layer, endSubsequenceType),
+ TestDisplayItem(htmlLayer, endSubsequenceType),
+ TestDisplayItem(rootLayer, endSubsequenceType));
// Repeated painting should just generate the root cached subsequence.
DeprecatedPaintLayerPainter(rootLayer).paintLayerContents(&context, paintingInfo, PaintLayerPaintingCompositingAllPhases);
- EXPECT_DISPLAY_LIST(rootDisplayItemList().newDisplayItems(), 1,
- TestDisplayItem(rootLayer, DisplayItem::CachedSubsequence));
+ EXPECT_DISPLAY_LIST(rootDisplayItemList().newDisplayItems(), 2,
+ TestDisplayItem(layoutView(), cachedBackgroundType),
+ TestDisplayItem(rootLayer, cachedSubsequenceType));
rootDisplayItemList().commitNewDisplayItems();
EXPECT_DISPLAY_LIST(rootDisplayItemList().displayItems(), 13,
- TestDisplayItem(rootLayer, DisplayItem::BeginSubsequence),
- TestDisplayItem(layoutView(), DisplayItem::BoxDecorationBackground),
- TestDisplayItem(htmlLayer, DisplayItem::BeginSubsequence),
- TestDisplayItem(container1Layer, DisplayItem::BeginSubsequence),
- TestDisplayItem(container1, DisplayItem::BoxDecorationBackground),
- TestDisplayItem(content1, DisplayItem::BoxDecorationBackground),
- TestDisplayItem(container1Layer, DisplayItem::EndSubsequence),
- TestDisplayItem(container2Layer, DisplayItem::BeginSubsequence),
- TestDisplayItem(container2, DisplayItem::BoxDecorationBackground),
- TestDisplayItem(content2, DisplayItem::BoxDecorationBackground),
- TestDisplayItem(container2Layer, DisplayItem::EndSubsequence),
- TestDisplayItem(htmlLayer, DisplayItem::EndSubsequence),
- TestDisplayItem(rootLayer, DisplayItem::EndSubsequence));
+ TestDisplayItem(layoutView(), backgroundType),
+ TestDisplayItem(rootLayer, subsequenceType),
+ TestDisplayItem(htmlLayer, subsequenceType),
+ TestDisplayItem(container1, backgroundType),
+ TestDisplayItem(container1Layer, subsequenceType),
+ TestDisplayItem(content1, backgroundType),
+ TestDisplayItem(container1Layer, endSubsequenceType),
+ TestDisplayItem(container2, backgroundType),
+ TestDisplayItem(container2Layer, subsequenceType),
+ TestDisplayItem(content2, backgroundType),
+ TestDisplayItem(container2Layer, endSubsequenceType),
+ TestDisplayItem(htmlLayer, endSubsequenceType),
+ TestDisplayItem(rootLayer, endSubsequenceType));
}
TEST_F(DeprecatedPaintLayerPainterTest, CachedSubsequenceOnInterestRectChange)
@@ -115,21 +117,29 @@ TEST_F(DeprecatedPaintLayerPainterTest, CachedSubsequenceOnInterestRectChange)
RuntimeEnabledFeatures::setSlimmingPaintSubsequenceCachingEnabled(true);
setBodyInnerHTML(
- "<div id='container1' style='position: relative; width: 200px; height: 200px; background-color: blue'></div>"
- "<div id='container2' style='position: absolute; z-index: 1; width: 200px; height: 200px; background-color: blue'>"
- " <div id='content2' style='position: relative; top: 200px; width: 100px; height: 100px; background-color: green'></div>"
+ "<div id='container1' style='position: relative; z-index: 1; width: 200px; height: 200px; background-color: blue'>"
+ " <div id='content1' style='position: absolute; width: 100px; height: 100px; background-color: green'></div>"
"</div>"
- "<div id='container3' style='position: absolute; z-index: 2; left: 300px; top: 0; width: 200px; height: 200px; background-color: blue'></div>");
+ "<div id='container2' style='position: relative; z-index: 1; width: 200px; height: 200px; background-color: blue'>"
+ " <div id='content2a' style='position: absolute; width: 100px; height: 100px; background-color: green'></div>"
+ " <div id='content2b' style='position: absolute; top: 200px; width: 100px; height: 100px; background-color: green'></div>"
+ "</div>"
+ "<div id='container3' style='position: absolute; z-index: 2; left: 300px; top: 0; width: 200px; height: 200px; background-color: blue'>"
+ " <div id='content3' style='position: absolute; width: 200px; height: 200px; background-color: green'></div>"
+ "</div>");
rootDisplayItemList().invalidateAll();
DeprecatedPaintLayer& rootLayer = *layoutView().layer();
DeprecatedPaintLayer& htmlLayer = *toLayoutBoxModelObject(document().documentElement()->layoutObject())->layer();
LayoutObject& container1 = *document().getElementById("container1")->layoutObject();
DeprecatedPaintLayer& container1Layer = *toLayoutBoxModelObject(container1).layer();
+ LayoutObject& content1 = *document().getElementById("content1")->layoutObject();
LayoutObject& container2 = *document().getElementById("container2")->layoutObject();
DeprecatedPaintLayer& container2Layer = *toLayoutBoxModelObject(container2).layer();
+ LayoutObject& content2a = *document().getElementById("content2a")->layoutObject();
LayoutObject& container3 = *document().getElementById("container3")->layoutObject();
DeprecatedPaintLayer& container3Layer = *toLayoutBoxModelObject(container3).layer();
+ LayoutObject& content3 = *document().getElementById("content3")->layoutObject();
document().view()->updateAllLifecyclePhases();
GraphicsContext context(&rootDisplayItemList());
@@ -139,67 +149,74 @@ TEST_F(DeprecatedPaintLayerPainterTest, CachedSubsequenceOnInterestRectChange)
// Container1 is fully in the interest rect;
// Container2 is partly (including its stacking chidren) in the interest rect;
- // Content2 is out of the interest rect and output nothing;
- // Container3 is fully in the interest rect.
- EXPECT_DISPLAY_LIST(rootDisplayItemList().displayItems(), 14,
- TestDisplayItem(rootLayer, DisplayItem::BeginSubsequence),
- TestDisplayItem(layoutView(), DisplayItem::BoxDecorationBackground),
- TestDisplayItem(htmlLayer, DisplayItem::BeginSubsequence),
- TestDisplayItem(container1Layer, DisplayItem::BeginSubsequence),
- TestDisplayItem(container1, DisplayItem::BoxDecorationBackground),
- TestDisplayItem(container1Layer, DisplayItem::EndSubsequence),
- TestDisplayItem(container2Layer, DisplayItem::BeginSubsequence),
- TestDisplayItem(container2, DisplayItem::BoxDecorationBackground),
- TestDisplayItem(container2Layer, DisplayItem::EndSubsequence),
- TestDisplayItem(container3Layer, DisplayItem::BeginSubsequence),
- TestDisplayItem(container3, DisplayItem::BoxDecorationBackground),
- TestDisplayItem(container3Layer, DisplayItem::EndSubsequence),
- TestDisplayItem(htmlLayer, DisplayItem::EndSubsequence),
- TestDisplayItem(rootLayer, DisplayItem::EndSubsequence));
+ // Content2b is out of the interest rect and output nothing;
+ // Container3 is partly in the interest rect.
+ EXPECT_DISPLAY_LIST(rootDisplayItemList().displayItems(), 17,
+ TestDisplayItem(layoutView(), backgroundType),
+ TestDisplayItem(rootLayer, subsequenceType),
+ TestDisplayItem(htmlLayer, subsequenceType),
+ TestDisplayItem(container1, backgroundType),
+ TestDisplayItem(container1Layer, subsequenceType),
+ TestDisplayItem(content1, backgroundType),
+ TestDisplayItem(container1Layer, endSubsequenceType),
+ TestDisplayItem(container2, backgroundType),
+ TestDisplayItem(container2Layer, subsequenceType),
+ TestDisplayItem(content2a, backgroundType),
+ TestDisplayItem(container2Layer, endSubsequenceType),
+ TestDisplayItem(container3, backgroundType),
+ TestDisplayItem(container3Layer, subsequenceType),
+ TestDisplayItem(content3, backgroundType),
+ TestDisplayItem(container3Layer, endSubsequenceType),
+ TestDisplayItem(htmlLayer, endSubsequenceType),
+ TestDisplayItem(rootLayer, endSubsequenceType));
// Container1 becomes partly in the interest rect, but uses cached subsequence
// because it was fully painted before;
// Container2's intersection with the interest rect changes;
- // Content2 is out of the interest rect and outputs nothing;
+ // Content2b is out of the interest rect and outputs nothing;
// Container3 becomes out of the interest rect and outputs nothing.
DeprecatedPaintLayerPaintingInfo paintingInfo1(&rootLayer, LayoutRect(0, 100, 300, 300), GlobalPaintNormalPhase, LayoutSize());
DeprecatedPaintLayerPainter(rootLayer).paintLayerContents(&context, paintingInfo1, PaintLayerPaintingCompositingAllPhases);
- EXPECT_DISPLAY_LIST(rootDisplayItemList().newDisplayItems(), 9,
- TestDisplayItem(rootLayer, DisplayItem::BeginSubsequence),
- TestDisplayItem(layoutView(), DisplayItem::drawingTypeToCachedDrawingType(DisplayItem::BoxDecorationBackground)),
- TestDisplayItem(htmlLayer, DisplayItem::BeginSubsequence),
- TestDisplayItem(container1Layer, DisplayItem::CachedSubsequence),
- TestDisplayItem(container2Layer, DisplayItem::BeginSubsequence),
- TestDisplayItem(container2, DisplayItem::drawingTypeToCachedDrawingType(DisplayItem::BoxDecorationBackground)),
- TestDisplayItem(container2Layer, DisplayItem::EndSubsequence),
- TestDisplayItem(htmlLayer, DisplayItem::EndSubsequence),
- TestDisplayItem(rootLayer, DisplayItem::EndSubsequence));
+ EXPECT_DISPLAY_LIST(rootDisplayItemList().newDisplayItems(), 11,
+ TestDisplayItem(layoutView(), cachedBackgroundType),
+ TestDisplayItem(rootLayer, subsequenceType),
+ TestDisplayItem(htmlLayer, subsequenceType),
+ TestDisplayItem(container1, cachedBackgroundType),
+ TestDisplayItem(container1Layer, cachedSubsequenceType),
+ TestDisplayItem(container2, cachedBackgroundType),
+ TestDisplayItem(container2Layer, subsequenceType),
+ TestDisplayItem(content2a, cachedBackgroundType),
+ TestDisplayItem(container2Layer, endSubsequenceType),
+ TestDisplayItem(htmlLayer, endSubsequenceType),
+ TestDisplayItem(rootLayer, endSubsequenceType));
rootDisplayItemList().commitNewDisplayItems();
- EXPECT_DISPLAY_LIST(rootDisplayItemList().displayItems(), 11,
- TestDisplayItem(rootLayer, DisplayItem::BeginSubsequence),
- TestDisplayItem(layoutView(), DisplayItem::BoxDecorationBackground),
- TestDisplayItem(htmlLayer, DisplayItem::BeginSubsequence),
- TestDisplayItem(container1Layer, DisplayItem::BeginSubsequence),
- TestDisplayItem(container1, DisplayItem::BoxDecorationBackground),
- TestDisplayItem(container1Layer, DisplayItem::EndSubsequence),
- TestDisplayItem(container2Layer, DisplayItem::BeginSubsequence),
- TestDisplayItem(container2, DisplayItem::BoxDecorationBackground),
- TestDisplayItem(container2Layer, DisplayItem::EndSubsequence),
- TestDisplayItem(htmlLayer, DisplayItem::EndSubsequence),
- TestDisplayItem(rootLayer, DisplayItem::EndSubsequence));
+ EXPECT_DISPLAY_LIST(rootDisplayItemList().displayItems(), 13,
+ TestDisplayItem(layoutView(), backgroundType),
+ TestDisplayItem(rootLayer, subsequenceType),
+ TestDisplayItem(htmlLayer, subsequenceType),
+ TestDisplayItem(container1, backgroundType),
+ TestDisplayItem(container1Layer, subsequenceType),
+ TestDisplayItem(content1, backgroundType),
+ TestDisplayItem(container1Layer, endSubsequenceType),
+ TestDisplayItem(container2, backgroundType),
+ TestDisplayItem(container2Layer, subsequenceType),
+ TestDisplayItem(content2a, backgroundType),
+ TestDisplayItem(container2Layer, endSubsequenceType),
+ TestDisplayItem(htmlLayer, endSubsequenceType),
+ TestDisplayItem(rootLayer, endSubsequenceType));
}
TEST_F(DeprecatedPaintLayerPainterTestForSlimmingPaintV2, CachedSubsequence)
{
setBodyInnerHTML(
- "<div id='container1' style='position: relative; width: 200px; height: 200px; background-color: blue'>"
- " <div id='content1' style='width: 100px; height: 100px; background-color: red'></div>"
+ "<div id='container1' style='position: relative; z-index: 1; width: 200px; height: 200px; background-color: blue'>"
+ " <div id='content1' style='position: absolute; width: 100px; height: 100px; background-color: red'></div>"
"</div>"
- "<div id='container2' style='position: relative; width: 200px; height: 200px; background-color: blue'>"
- " <div id='content2' style='width: 100px; height: 100px; background-color: green'></div>"
+ "<div id='container2' style='position: relative; z-index: 1; width: 200px; height: 200px; background-color: blue'>"
+ " <div id='content2' style='position: absolute; width: 100px; height: 100px; background-color: green'></div>"
"</div>");
document().view()->updateAllLifecyclePhases();
@@ -213,151 +230,168 @@ TEST_F(DeprecatedPaintLayerPainterTestForSlimmingPaintV2, CachedSubsequence)
LayoutObject& content2 = *document().getElementById("content2")->layoutObject();
EXPECT_DISPLAY_LIST(rootDisplayItemList().displayItems(), 13,
- TestDisplayItem(rootLayer, DisplayItem::BeginSubsequence),
- TestDisplayItem(layoutView(), DisplayItem::BoxDecorationBackground),
- TestDisplayItem(htmlLayer, DisplayItem::BeginSubsequence),
- TestDisplayItem(container1Layer, DisplayItem::BeginSubsequence),
- TestDisplayItem(container1, DisplayItem::BoxDecorationBackground),
- TestDisplayItem(content1, DisplayItem::BoxDecorationBackground),
- TestDisplayItem(container1Layer, DisplayItem::EndSubsequence),
- TestDisplayItem(container2Layer, DisplayItem::BeginSubsequence),
- TestDisplayItem(container2, DisplayItem::BoxDecorationBackground),
- TestDisplayItem(content2, DisplayItem::BoxDecorationBackground),
- TestDisplayItem(container2Layer, DisplayItem::EndSubsequence),
- TestDisplayItem(htmlLayer, DisplayItem::EndSubsequence),
- TestDisplayItem(rootLayer, DisplayItem::EndSubsequence));
-
- toHTMLElement(content1.node())->setAttribute(HTMLNames::styleAttr, "width: 100px; height: 100px; background-color: green");
+ TestDisplayItem(layoutView(), backgroundType),
+ TestDisplayItem(rootLayer, subsequenceType),
+ TestDisplayItem(htmlLayer, subsequenceType),
+ TestDisplayItem(container1, backgroundType),
+ TestDisplayItem(container1Layer, subsequenceType),
+ TestDisplayItem(content1, backgroundType),
+ TestDisplayItem(container1Layer, endSubsequenceType),
+ TestDisplayItem(container2, backgroundType),
+ TestDisplayItem(container2Layer, subsequenceType),
+ TestDisplayItem(content2, backgroundType),
+ TestDisplayItem(container2Layer, endSubsequenceType),
+ TestDisplayItem(htmlLayer, endSubsequenceType),
+ TestDisplayItem(rootLayer, endSubsequenceType));
+
+ toHTMLElement(content1.node())->setAttribute(HTMLNames::styleAttr, "position: absolute; width: 100px; height: 100px; background-color: green");
updateLifecyclePhasesToPaintClean(LayoutRect::infiniteRect());
- EXPECT_DISPLAY_LIST(rootDisplayItemList().newDisplayItems(), 10,
- TestDisplayItem(rootLayer, DisplayItem::BeginSubsequence),
- TestDisplayItem(layoutView(), DisplayItem::drawingTypeToCachedDrawingType(DisplayItem::BoxDecorationBackground)),
- TestDisplayItem(htmlLayer, DisplayItem::BeginSubsequence),
- TestDisplayItem(container1Layer, DisplayItem::BeginSubsequence),
- TestDisplayItem(container1, DisplayItem::drawingTypeToCachedDrawingType(DisplayItem::BoxDecorationBackground)),
- TestDisplayItem(content1, DisplayItem::BoxDecorationBackground),
- TestDisplayItem(container1Layer, DisplayItem::EndSubsequence),
- TestDisplayItem(container2Layer, DisplayItem::CachedSubsequence),
- TestDisplayItem(htmlLayer, DisplayItem::EndSubsequence),
- TestDisplayItem(rootLayer, DisplayItem::EndSubsequence));
+ EXPECT_DISPLAY_LIST(rootDisplayItemList().newDisplayItems(), 11,
+ TestDisplayItem(layoutView(), cachedBackgroundType),
+ TestDisplayItem(rootLayer, subsequenceType),
+ TestDisplayItem(htmlLayer, subsequenceType),
+ TestDisplayItem(container1, cachedBackgroundType),
+ TestDisplayItem(container1Layer, subsequenceType),
+ TestDisplayItem(content1, backgroundType),
+ TestDisplayItem(container1Layer, endSubsequenceType),
+ TestDisplayItem(container2, cachedBackgroundType),
+ TestDisplayItem(container2Layer, cachedSubsequenceType),
+ TestDisplayItem(htmlLayer, endSubsequenceType),
+ TestDisplayItem(rootLayer, endSubsequenceType));
compositeForSlimmingPaintV2();
EXPECT_DISPLAY_LIST(rootDisplayItemList().displayItems(), 13,
- TestDisplayItem(rootLayer, DisplayItem::BeginSubsequence),
- TestDisplayItem(layoutView(), DisplayItem::BoxDecorationBackground),
- TestDisplayItem(htmlLayer, DisplayItem::BeginSubsequence),
- TestDisplayItem(container1Layer, DisplayItem::BeginSubsequence),
- TestDisplayItem(container1, DisplayItem::BoxDecorationBackground),
- TestDisplayItem(content1, DisplayItem::BoxDecorationBackground),
- TestDisplayItem(container1Layer, DisplayItem::EndSubsequence),
- TestDisplayItem(container2Layer, DisplayItem::BeginSubsequence),
- TestDisplayItem(container2, DisplayItem::BoxDecorationBackground),
- TestDisplayItem(content2, DisplayItem::BoxDecorationBackground),
- TestDisplayItem(container2Layer, DisplayItem::EndSubsequence),
- TestDisplayItem(htmlLayer, DisplayItem::EndSubsequence),
- TestDisplayItem(rootLayer, DisplayItem::EndSubsequence));
+ TestDisplayItem(layoutView(), backgroundType),
+ TestDisplayItem(rootLayer, subsequenceType),
+ TestDisplayItem(htmlLayer, subsequenceType),
+ TestDisplayItem(container1, backgroundType),
+ TestDisplayItem(container1Layer, subsequenceType),
+ TestDisplayItem(content1, backgroundType),
+ TestDisplayItem(container1Layer, endSubsequenceType),
+ TestDisplayItem(container2, backgroundType),
+ TestDisplayItem(container2Layer, subsequenceType),
+ TestDisplayItem(content2, backgroundType),
+ TestDisplayItem(container2Layer, endSubsequenceType),
+ TestDisplayItem(htmlLayer, endSubsequenceType),
+ TestDisplayItem(rootLayer, endSubsequenceType));
// Repeated painting should just generate the root cached subsequence.
setNeedsDisplayWithoutInvalidationForRoot();
updateLifecyclePhasesToPaintClean();
- EXPECT_DISPLAY_LIST(rootDisplayItemList().newDisplayItems(), 1,
- TestDisplayItem(rootLayer, DisplayItem::CachedSubsequence));
+ EXPECT_DISPLAY_LIST(rootDisplayItemList().newDisplayItems(), 2,
+ TestDisplayItem(layoutView(), cachedBackgroundType),
+ TestDisplayItem(rootLayer, cachedSubsequenceType));
compositeForSlimmingPaintV2();
EXPECT_DISPLAY_LIST(rootDisplayItemList().displayItems(), 13,
- TestDisplayItem(rootLayer, DisplayItem::BeginSubsequence),
- TestDisplayItem(layoutView(), DisplayItem::BoxDecorationBackground),
- TestDisplayItem(htmlLayer, DisplayItem::BeginSubsequence),
- TestDisplayItem(container1Layer, DisplayItem::BeginSubsequence),
- TestDisplayItem(container1, DisplayItem::BoxDecorationBackground),
- TestDisplayItem(content1, DisplayItem::BoxDecorationBackground),
- TestDisplayItem(container1Layer, DisplayItem::EndSubsequence),
- TestDisplayItem(container2Layer, DisplayItem::BeginSubsequence),
- TestDisplayItem(container2, DisplayItem::BoxDecorationBackground),
- TestDisplayItem(content2, DisplayItem::BoxDecorationBackground),
- TestDisplayItem(container2Layer, DisplayItem::EndSubsequence),
- TestDisplayItem(htmlLayer, DisplayItem::EndSubsequence),
- TestDisplayItem(rootLayer, DisplayItem::EndSubsequence));
+ TestDisplayItem(layoutView(), backgroundType),
+ TestDisplayItem(rootLayer, subsequenceType),
+ TestDisplayItem(htmlLayer, subsequenceType),
+ TestDisplayItem(container1, backgroundType),
+ TestDisplayItem(container1Layer, subsequenceType),
+ TestDisplayItem(content1, backgroundType),
+ TestDisplayItem(container1Layer, endSubsequenceType),
+ TestDisplayItem(container2, backgroundType),
+ TestDisplayItem(container2Layer, subsequenceType),
+ TestDisplayItem(content2, backgroundType),
+ TestDisplayItem(container2Layer, endSubsequenceType),
+ TestDisplayItem(htmlLayer, endSubsequenceType),
+ TestDisplayItem(rootLayer, endSubsequenceType));
}
TEST_F(DeprecatedPaintLayerPainterTestForSlimmingPaintV2, CachedSubsequenceOnInterestRectChange)
{
setBodyInnerHTML(
- "<div id='container1' style='position: relative; width: 200px; height: 200px; background-color: blue'></div>"
- "<div id='container2' style='position: absolute; z-index: 1; width: 200px; height: 200px; background-color: blue'>"
- " <div id='content2' style='position: relative; top: 200px; width: 100px; height: 100px; background-color: green'></div>"
+ "<div id='container1' style='position: relative; z-index: 1; width: 200px; height: 200px; background-color: blue'>"
+ " <div id='content1' style='position: absolute; width: 100px; height: 100px; background-color: green'></div>"
"</div>"
- "<div id='container3' style='position: absolute; z-index: 2; left: 300px; top: 0; width: 200px; height: 200px; background-color: blue'></div>");
+ "<div id='container2' style='position: relative; z-index: 1; width: 200px; height: 200px; background-color: blue'>"
+ " <div id='content2a' style='position: absolute; width: 100px; height: 100px; background-color: green'></div>"
+ " <div id='content2b' style='position: absolute; top: 200px; width: 100px; height: 100px; background-color: green'></div>"
+ "</div>"
+ "<div id='container3' style='position: absolute; z-index: 2; left: 300px; top: 0; width: 200px; height: 200px; background-color: blue'>"
+ " <div id='content3' style='position: absolute; width: 200px; height: 200px; background-color: green'></div>"
+ "</div>");
setNeedsDisplayForRoot();
DeprecatedPaintLayer& rootLayer = *layoutView().layer();
DeprecatedPaintLayer& htmlLayer = *toLayoutBoxModelObject(document().documentElement()->layoutObject())->layer();
LayoutObject& container1 = *document().getElementById("container1")->layoutObject();
DeprecatedPaintLayer& container1Layer = *toLayoutBoxModelObject(container1).layer();
+ LayoutObject& content1 = *document().getElementById("content1")->layoutObject();
LayoutObject& container2 = *document().getElementById("container2")->layoutObject();
DeprecatedPaintLayer& container2Layer = *toLayoutBoxModelObject(container2).layer();
+ LayoutObject& content2a = *document().getElementById("content2a")->layoutObject();
LayoutObject& container3 = *document().getElementById("container3")->layoutObject();
DeprecatedPaintLayer& container3Layer = *toLayoutBoxModelObject(container3).layer();
+ LayoutObject& content3 = *document().getElementById("content3")->layoutObject();
document().view()->updateAllLifecyclePhases(LayoutRect(0, 0, 400, 300));
// Container1 is fully in the interest rect;
// Container2 is partly (including its stacking chidren) in the interest rect;
- // Content2 is out of the interest rect and output nothing;
- // Container3 is fully in the interest rect.
- EXPECT_DISPLAY_LIST(rootDisplayItemList().displayItems(), 14,
- TestDisplayItem(rootLayer, DisplayItem::BeginSubsequence),
- TestDisplayItem(layoutView(), DisplayItem::BoxDecorationBackground),
- TestDisplayItem(htmlLayer, DisplayItem::BeginSubsequence),
- TestDisplayItem(container1Layer, DisplayItem::BeginSubsequence),
- TestDisplayItem(container1, DisplayItem::BoxDecorationBackground),
- TestDisplayItem(container1Layer, DisplayItem::EndSubsequence),
- TestDisplayItem(container2Layer, DisplayItem::BeginSubsequence),
- TestDisplayItem(container2, DisplayItem::BoxDecorationBackground),
- TestDisplayItem(container2Layer, DisplayItem::EndSubsequence),
- TestDisplayItem(container3Layer, DisplayItem::BeginSubsequence),
- TestDisplayItem(container3, DisplayItem::BoxDecorationBackground),
- TestDisplayItem(container3Layer, DisplayItem::EndSubsequence),
- TestDisplayItem(htmlLayer, DisplayItem::EndSubsequence),
- TestDisplayItem(rootLayer, DisplayItem::EndSubsequence));
+ // Content2b is out of the interest rect and output nothing;
+ // Container3 is partly in the interest rect.
+ EXPECT_DISPLAY_LIST(rootDisplayItemList().displayItems(), 17,
+ TestDisplayItem(layoutView(), backgroundType),
+ TestDisplayItem(rootLayer, subsequenceType),
+ TestDisplayItem(htmlLayer, subsequenceType),
+ TestDisplayItem(container1, backgroundType),
+ TestDisplayItem(container1Layer, subsequenceType),
+ TestDisplayItem(content1, backgroundType),
+ TestDisplayItem(container1Layer, endSubsequenceType),
+ TestDisplayItem(container2, backgroundType),
+ TestDisplayItem(container2Layer, subsequenceType),
+ TestDisplayItem(content2a, backgroundType),
+ TestDisplayItem(container2Layer, endSubsequenceType),
+ TestDisplayItem(container3, backgroundType),
+ TestDisplayItem(container3Layer, subsequenceType),
+ TestDisplayItem(content3, backgroundType),
+ TestDisplayItem(container3Layer, endSubsequenceType),
+ TestDisplayItem(htmlLayer, endSubsequenceType),
+ TestDisplayItem(rootLayer, endSubsequenceType));
setNeedsDisplayWithoutInvalidationForRoot();
// Container1 becomes partly in the interest rect, but uses cached subsequence
// because it was fully painted before;
// Container2's intersection with the interest rect changes;
- // Content2 is out of the interest rect and outputs nothing;
+ // Content2b is out of the interest rect and outputs nothing;
// Container3 becomes out of the interest rect and outputs nothing.
updateLifecyclePhasesToPaintClean(LayoutRect(0, 100, 300, 300));
- EXPECT_DISPLAY_LIST(rootDisplayItemList().newDisplayItems(), 9,
- TestDisplayItem(rootLayer, DisplayItem::BeginSubsequence),
- TestDisplayItem(layoutView(), DisplayItem::drawingTypeToCachedDrawingType(DisplayItem::BoxDecorationBackground)),
- TestDisplayItem(htmlLayer, DisplayItem::BeginSubsequence),
- TestDisplayItem(container1Layer, DisplayItem::CachedSubsequence),
- TestDisplayItem(container2Layer, DisplayItem::BeginSubsequence),
- TestDisplayItem(container2, DisplayItem::drawingTypeToCachedDrawingType(DisplayItem::BoxDecorationBackground)),
- TestDisplayItem(container2Layer, DisplayItem::EndSubsequence),
- TestDisplayItem(htmlLayer, DisplayItem::EndSubsequence),
- TestDisplayItem(rootLayer, DisplayItem::EndSubsequence));
+ EXPECT_DISPLAY_LIST(rootDisplayItemList().newDisplayItems(), 11,
+ TestDisplayItem(layoutView(), cachedBackgroundType),
+ TestDisplayItem(rootLayer, subsequenceType),
+ TestDisplayItem(htmlLayer, subsequenceType),
+ TestDisplayItem(container1, cachedBackgroundType),
+ TestDisplayItem(container1Layer, cachedSubsequenceType),
+ TestDisplayItem(container2, cachedBackgroundType),
+ TestDisplayItem(container2Layer, subsequenceType),
+ TestDisplayItem(content2a, cachedBackgroundType),
+ TestDisplayItem(container2Layer, endSubsequenceType),
+ TestDisplayItem(htmlLayer, endSubsequenceType),
+ TestDisplayItem(rootLayer, endSubsequenceType));
compositeForSlimmingPaintV2();
- EXPECT_DISPLAY_LIST(rootDisplayItemList().displayItems(), 11,
- TestDisplayItem(rootLayer, DisplayItem::BeginSubsequence),
- TestDisplayItem(layoutView(), DisplayItem::BoxDecorationBackground),
- TestDisplayItem(htmlLayer, DisplayItem::BeginSubsequence),
- TestDisplayItem(container1Layer, DisplayItem::BeginSubsequence),
- TestDisplayItem(container1, DisplayItem::BoxDecorationBackground),
- TestDisplayItem(container1Layer, DisplayItem::EndSubsequence),
- TestDisplayItem(container2Layer, DisplayItem::BeginSubsequence),
- TestDisplayItem(container2, DisplayItem::BoxDecorationBackground),
- TestDisplayItem(container2Layer, DisplayItem::EndSubsequence),
- TestDisplayItem(htmlLayer, DisplayItem::EndSubsequence),
- TestDisplayItem(rootLayer, DisplayItem::EndSubsequence));
+ EXPECT_DISPLAY_LIST(rootDisplayItemList().displayItems(), 13,
+ TestDisplayItem(layoutView(), backgroundType),
+ TestDisplayItem(rootLayer, subsequenceType),
+ TestDisplayItem(htmlLayer, subsequenceType),
+ TestDisplayItem(container1, backgroundType),
+ TestDisplayItem(container1Layer, subsequenceType),
+ TestDisplayItem(content1, backgroundType),
+ TestDisplayItem(container1Layer, endSubsequenceType),
+ TestDisplayItem(container2, backgroundType),
+ TestDisplayItem(container2Layer, subsequenceType),
+ TestDisplayItem(content2a, backgroundType),
+ TestDisplayItem(container2Layer, endSubsequenceType),
+ TestDisplayItem(htmlLayer, endSubsequenceType),
+ TestDisplayItem(rootLayer, endSubsequenceType));
}
} // namespace blink
« third_party/WebKit/Source/core/paint/DeprecatedPaintLayerPainter.cpp ('K') | « third_party/WebKit/Source/core/paint/DeprecatedPaintLayerPainter.cpp ('k') | third_party/WebKit/Source/core/paint/DisplayItemListPaintTest.h » ('j') | third_party/WebKit/Source/platform/graphics/paint/DisplayItemListTest.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698