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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2322073006: Turn off the old compositing path for SPv2. (Closed)
Patch Set: none Created 4 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/FramePainter.cpp ('K') | « third_party/WebKit/Source/core/paint/PaintLayer.cpp ('k') | third_party/WebKit/Source/core/paint/PaintPropertyTreePrinter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/paint/PaintLayerPainterTest.cpp
diff --git a/third_party/WebKit/Source/core/paint/PaintLayerPainterTest.cpp b/third_party/WebKit/Source/core/paint/PaintLayerPainterTest.cpp
index 1f3ec157245723a35e5513e5e4a454be7cc4a023..a93f0e82a3e960b2385ddb3634536d1f22224958 100644
--- a/third_party/WebKit/Source/core/paint/PaintLayerPainterTest.cpp
+++ b/third_party/WebKit/Source/core/paint/PaintLayerPainterTest.cpp
@@ -55,18 +55,37 @@ TEST_P(PaintLayerPainterTest, CachedSubsequence)
PaintLayer& container2Layer = *toLayoutBoxModelObject(container2).layer();
LayoutObject& content2 = *document().getElementById("content2")->layoutObject();
- EXPECT_DISPLAY_LIST(rootPaintController().getDisplayItemList(), 11,
- TestDisplayItem(layoutView(), documentBackgroundType),
- TestDisplayItem(htmlLayer, DisplayItem::kSubsequence),
- TestDisplayItem(container1Layer, DisplayItem::kSubsequence),
- TestDisplayItem(container1, backgroundType),
- TestDisplayItem(content1, backgroundType),
- TestDisplayItem(container1Layer, DisplayItem::kEndSubsequence),
- TestDisplayItem(container2Layer, DisplayItem::kSubsequence),
- TestDisplayItem(container2, backgroundType),
- TestDisplayItem(content2, backgroundType),
- TestDisplayItem(container2Layer, DisplayItem::kEndSubsequence),
- TestDisplayItem(htmlLayer, DisplayItem::kEndSubsequence));
+ if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
+ EXPECT_DISPLAY_LIST(rootPaintController().getDisplayItemList(), 15,
+ TestDisplayItem(layoutView(), DisplayItem::kClipFrameToVisibleContentRect),
+ TestDisplayItem(*layoutView().layer(), DisplayItem::kSubsequence),
+ TestDisplayItem(layoutView(), documentBackgroundType),
+ TestDisplayItem(htmlLayer, DisplayItem::kSubsequence),
+ TestDisplayItem(container1Layer, DisplayItem::kSubsequence),
+ TestDisplayItem(container1, backgroundType),
+ TestDisplayItem(content1, backgroundType),
+ TestDisplayItem(container1Layer, DisplayItem::kEndSubsequence),
+ TestDisplayItem(container2Layer, DisplayItem::kSubsequence),
+ TestDisplayItem(container2, backgroundType),
+ TestDisplayItem(content2, backgroundType),
+ TestDisplayItem(container2Layer, DisplayItem::kEndSubsequence),
+ TestDisplayItem(htmlLayer, DisplayItem::kEndSubsequence),
+ TestDisplayItem(*layoutView().layer(), DisplayItem::kEndSubsequence),
+ TestDisplayItem(layoutView(), DisplayItem::clipTypeToEndClipType(DisplayItem::kClipFrameToVisibleContentRect)));
+ } else {
+ EXPECT_DISPLAY_LIST(rootPaintController().getDisplayItemList(), 11,
+ TestDisplayItem(layoutView(), documentBackgroundType),
+ TestDisplayItem(htmlLayer, DisplayItem::kSubsequence),
+ TestDisplayItem(container1Layer, DisplayItem::kSubsequence),
+ TestDisplayItem(container1, backgroundType),
+ TestDisplayItem(content1, backgroundType),
+ TestDisplayItem(container1Layer, DisplayItem::kEndSubsequence),
+ TestDisplayItem(container2Layer, DisplayItem::kSubsequence),
+ TestDisplayItem(container2, backgroundType),
+ TestDisplayItem(content2, backgroundType),
+ TestDisplayItem(container2Layer, DisplayItem::kEndSubsequence),
+ TestDisplayItem(htmlLayer, DisplayItem::kEndSubsequence));
+ }
toHTMLElement(content1.node())->setAttribute(HTMLNames::styleAttr, "position: absolute; width: 100px; height: 100px; background-color: green");
document().view()->updateAllLifecyclePhasesExceptPaint();
@@ -76,18 +95,37 @@ TEST_P(PaintLayerPainterTest, CachedSubsequence)
commit();
- EXPECT_DISPLAY_LIST(rootPaintController().getDisplayItemList(), 11,
- TestDisplayItem(layoutView(), documentBackgroundType),
- TestDisplayItem(htmlLayer, DisplayItem::kSubsequence),
- TestDisplayItem(container1Layer, DisplayItem::kSubsequence),
- TestDisplayItem(container1, backgroundType),
- TestDisplayItem(content1, backgroundType),
- TestDisplayItem(container1Layer, DisplayItem::kEndSubsequence),
- TestDisplayItem(container2Layer, DisplayItem::kSubsequence),
- TestDisplayItem(container2, backgroundType),
- TestDisplayItem(content2, backgroundType),
- TestDisplayItem(container2Layer, DisplayItem::kEndSubsequence),
- TestDisplayItem(htmlLayer, DisplayItem::kEndSubsequence));
+ if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
+ EXPECT_DISPLAY_LIST(rootPaintController().getDisplayItemList(), 15,
+ TestDisplayItem(layoutView(), DisplayItem::kClipFrameToVisibleContentRect),
+ TestDisplayItem(*layoutView().layer(), DisplayItem::kSubsequence),
+ TestDisplayItem(layoutView(), documentBackgroundType),
+ TestDisplayItem(htmlLayer, DisplayItem::kSubsequence),
+ TestDisplayItem(container1Layer, DisplayItem::kSubsequence),
+ TestDisplayItem(container1, backgroundType),
+ TestDisplayItem(content1, backgroundType),
+ TestDisplayItem(container1Layer, DisplayItem::kEndSubsequence),
+ TestDisplayItem(container2Layer, DisplayItem::kSubsequence),
+ TestDisplayItem(container2, backgroundType),
+ TestDisplayItem(content2, backgroundType),
+ TestDisplayItem(container2Layer, DisplayItem::kEndSubsequence),
+ TestDisplayItem(htmlLayer, DisplayItem::kEndSubsequence),
+ TestDisplayItem(*layoutView().layer(), DisplayItem::kEndSubsequence),
+ TestDisplayItem(layoutView(), DisplayItem::clipTypeToEndClipType(DisplayItem::kClipFrameToVisibleContentRect)));
+ } else {
+ EXPECT_DISPLAY_LIST(rootPaintController().getDisplayItemList(), 11,
+ TestDisplayItem(layoutView(), documentBackgroundType),
+ TestDisplayItem(htmlLayer, DisplayItem::kSubsequence),
+ TestDisplayItem(container1Layer, DisplayItem::kSubsequence),
+ TestDisplayItem(container1, backgroundType),
+ TestDisplayItem(content1, backgroundType),
+ TestDisplayItem(container1Layer, DisplayItem::kEndSubsequence),
+ TestDisplayItem(container2Layer, DisplayItem::kSubsequence),
+ TestDisplayItem(container2, backgroundType),
+ TestDisplayItem(content2, backgroundType),
+ TestDisplayItem(container2Layer, DisplayItem::kEndSubsequence),
+ TestDisplayItem(htmlLayer, DisplayItem::kEndSubsequence));
+ }
}
TEST_P(PaintLayerPainterTest, CachedSubsequenceOnInterestRectChange)
@@ -197,18 +235,37 @@ TEST_P(PaintLayerPainterTest, CachedSubsequenceOnStyleChangeWithInterestRectClip
PaintLayer& container2Layer = *toLayoutBoxModelObject(container2).layer();
LayoutObject& content2 = *document().getElementById("content2")->layoutObject();
- EXPECT_DISPLAY_LIST(rootPaintController().getDisplayItemList(), 11,
- TestDisplayItem(layoutView(), documentBackgroundType),
- TestDisplayItem(htmlLayer, DisplayItem::kSubsequence),
- TestDisplayItem(container1Layer, DisplayItem::kSubsequence),
- TestDisplayItem(container1, backgroundType),
- TestDisplayItem(content1, backgroundType),
- TestDisplayItem(container1Layer, DisplayItem::kEndSubsequence),
- TestDisplayItem(container2Layer, DisplayItem::kSubsequence),
- TestDisplayItem(container2, backgroundType),
- TestDisplayItem(content2, backgroundType),
- TestDisplayItem(container2Layer, DisplayItem::kEndSubsequence),
- TestDisplayItem(htmlLayer, DisplayItem::kEndSubsequence));
+ if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
+ EXPECT_DISPLAY_LIST(rootPaintController().getDisplayItemList(), 15,
+ TestDisplayItem(layoutView(), DisplayItem::kClipFrameToVisibleContentRect),
+ TestDisplayItem(*layoutView().layer(), DisplayItem::kSubsequence),
+ TestDisplayItem(layoutView(), documentBackgroundType),
+ TestDisplayItem(htmlLayer, DisplayItem::kSubsequence),
+ TestDisplayItem(container1Layer, DisplayItem::kSubsequence),
+ TestDisplayItem(container1, backgroundType),
+ TestDisplayItem(content1, backgroundType),
+ TestDisplayItem(container1Layer, DisplayItem::kEndSubsequence),
+ TestDisplayItem(container2Layer, DisplayItem::kSubsequence),
+ TestDisplayItem(container2, backgroundType),
+ TestDisplayItem(content2, backgroundType),
+ TestDisplayItem(container2Layer, DisplayItem::kEndSubsequence),
+ TestDisplayItem(htmlLayer, DisplayItem::kEndSubsequence),
+ TestDisplayItem(*layoutView().layer(), DisplayItem::kEndSubsequence),
+ TestDisplayItem(layoutView(), DisplayItem::clipTypeToEndClipType(DisplayItem::kClipFrameToVisibleContentRect)));
+ } else {
+ EXPECT_DISPLAY_LIST(rootPaintController().getDisplayItemList(), 11,
+ TestDisplayItem(layoutView(), documentBackgroundType),
+ TestDisplayItem(htmlLayer, DisplayItem::kSubsequence),
+ TestDisplayItem(container1Layer, DisplayItem::kSubsequence),
+ TestDisplayItem(container1, backgroundType),
+ TestDisplayItem(content1, backgroundType),
+ TestDisplayItem(container1Layer, DisplayItem::kEndSubsequence),
+ TestDisplayItem(container2Layer, DisplayItem::kSubsequence),
+ TestDisplayItem(container2, backgroundType),
+ TestDisplayItem(content2, backgroundType),
+ TestDisplayItem(container2Layer, DisplayItem::kEndSubsequence),
+ TestDisplayItem(htmlLayer, DisplayItem::kEndSubsequence));
+ }
toHTMLElement(content1.node())->setAttribute(HTMLNames::styleAttr, "position: absolute; width: 100px; height: 100px; background-color: green");
document().view()->updateAllLifecyclePhasesExceptPaint();
@@ -218,18 +275,37 @@ TEST_P(PaintLayerPainterTest, CachedSubsequenceOnStyleChangeWithInterestRectClip
commit();
- EXPECT_DISPLAY_LIST(rootPaintController().getDisplayItemList(), 11,
- TestDisplayItem(layoutView(), documentBackgroundType),
- TestDisplayItem(htmlLayer, DisplayItem::kSubsequence),
- TestDisplayItem(container1Layer, DisplayItem::kSubsequence),
- TestDisplayItem(container1, backgroundType),
- TestDisplayItem(content1, backgroundType),
- TestDisplayItem(container1Layer, DisplayItem::kEndSubsequence),
- TestDisplayItem(container2Layer, DisplayItem::kSubsequence),
- TestDisplayItem(container2, backgroundType),
- TestDisplayItem(content2, backgroundType),
- TestDisplayItem(container2Layer, DisplayItem::kEndSubsequence),
- TestDisplayItem(htmlLayer, DisplayItem::kEndSubsequence));
+ if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
+ EXPECT_DISPLAY_LIST(rootPaintController().getDisplayItemList(), 15,
+ TestDisplayItem(layoutView(), DisplayItem::kClipFrameToVisibleContentRect),
+ TestDisplayItem(*layoutView().layer(), DisplayItem::kSubsequence),
+ TestDisplayItem(layoutView(), documentBackgroundType),
+ TestDisplayItem(htmlLayer, DisplayItem::kSubsequence),
+ TestDisplayItem(container1Layer, DisplayItem::kSubsequence),
+ TestDisplayItem(container1, backgroundType),
+ TestDisplayItem(content1, backgroundType),
+ TestDisplayItem(container1Layer, DisplayItem::kEndSubsequence),
+ TestDisplayItem(container2Layer, DisplayItem::kSubsequence),
+ TestDisplayItem(container2, backgroundType),
+ TestDisplayItem(content2, backgroundType),
+ TestDisplayItem(container2Layer, DisplayItem::kEndSubsequence),
+ TestDisplayItem(htmlLayer, DisplayItem::kEndSubsequence),
+ TestDisplayItem(*layoutView().layer(), DisplayItem::kEndSubsequence),
+ TestDisplayItem(layoutView(), DisplayItem::clipTypeToEndClipType(DisplayItem::kClipFrameToVisibleContentRect)));
+ } else {
+ EXPECT_DISPLAY_LIST(rootPaintController().getDisplayItemList(), 11,
+ TestDisplayItem(layoutView(), documentBackgroundType),
+ TestDisplayItem(htmlLayer, DisplayItem::kSubsequence),
+ TestDisplayItem(container1Layer, DisplayItem::kSubsequence),
+ TestDisplayItem(container1, backgroundType),
+ TestDisplayItem(content1, backgroundType),
+ TestDisplayItem(container1Layer, DisplayItem::kEndSubsequence),
+ TestDisplayItem(container2Layer, DisplayItem::kSubsequence),
+ TestDisplayItem(container2, backgroundType),
+ TestDisplayItem(content2, backgroundType),
+ TestDisplayItem(container2Layer, DisplayItem::kEndSubsequence),
+ TestDisplayItem(htmlLayer, DisplayItem::kEndSubsequence));
+ }
}
TEST_P(PaintLayerPainterTest, PaintPhaseOutline)
« third_party/WebKit/Source/core/paint/FramePainter.cpp ('K') | « third_party/WebKit/Source/core/paint/PaintLayer.cpp ('k') | third_party/WebKit/Source/core/paint/PaintPropertyTreePrinter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698