Revert of Fold compositing display items into contained drawings if the drawing is a singleton.

third_party/WebKit/Source/core/paint/PaintControllerPaintTest.cpp

Index: third_party/WebKit/Source/core/paint/PaintControllerPaintTest.cpp
diff --git a/third_party/WebKit/Source/core/paint/PaintControllerPaintTest.cpp b/third_party/WebKit/Source/core/paint/PaintControllerPaintTest.cpp
index 861bc87882da27ffeb8d8effece54325ef023634..13148f5d0160a27b84af428b528ccc8b5e4b1ff8 100644
--- a/third_party/WebKit/Source/core/paint/PaintControllerPaintTest.cpp
+++ b/third_party/WebKit/Source/core/paint/PaintControllerPaintTest.cpp
@@ -69,18 +69,16 @@
     setBodyInnerHTML(
         "<div id='div' style='width: 200px; height: 200px; opacity: 0.5'>"
         "  <div style='width: 100px; height: 100px; background-color: blue'></div>"
-        "  <div style='width: 100px; height: 100px; background-color: blue'></div>"
         "</div>");
     PaintLayer& htmlLayer = *toLayoutBoxModelObject(document().documentElement()->layoutObject())->layer();
     LayoutBlock& div = *toLayoutBlock(getLayoutObjectByElementId("div"));
     LayoutObject& subDiv = *div.firstChild();
-    LayoutObject& subDiv2 = *subDiv.nextSibling();
-    EXPECT_DISPLAY_LIST(rootPaintController().getDisplayItemList(), 7,
+
+    EXPECT_DISPLAY_LIST(rootPaintController().getDisplayItemList(), 6,
         TestDisplayItem(layoutView(), documentBackgroundType),
         TestDisplayItem(htmlLayer, DisplayItem::Subsequence),
         TestDisplayItem(div, DisplayItem::BeginCompositing),
         TestDisplayItem(subDiv, backgroundType),
-        TestDisplayItem(subDiv2, backgroundType),
         TestDisplayItem(div, DisplayItem::EndCompositing),
         TestDisplayItem(htmlLayer, DisplayItem::EndSubsequence));
 
@@ -98,23 +96,4 @@
     EXPECT_TRUE(rootPaintController().clientCacheIsValid(subDiv));
 }
 
-TEST_F(PaintControllerPaintTestForSlimmingPaintV2, CompositingFold)
-{
-    setBodyInnerHTML(
-        "<div id='div' style='width: 200px; height: 200px; opacity: 0.5'>"
-        "  <div style='width: 100px; height: 100px; background-color: blue'></div>"
-        "</div>");
-    PaintLayer& htmlLayer = *toLayoutBoxModelObject(document().documentElement()->layoutObject())->layer();
-    LayoutBlock& div = *toLayoutBlock(getLayoutObjectByElementId("div"));
-    LayoutObject& subDiv = *div.firstChild();
-
-    EXPECT_DISPLAY_LIST(rootPaintController().getDisplayItemList(), 4,
-        TestDisplayItem(layoutView(), documentBackgroundType),
-        TestDisplayItem(htmlLayer, DisplayItem::Subsequence),
-        // The begin and end compositing display items have been folded into this one.
-        TestDisplayItem(subDiv, backgroundType),
-        TestDisplayItem(htmlLayer, DisplayItem::EndSubsequence));
-}
-
-
 } // namespace blink