RootLayerScrolling: Fix PaintControllerPaintTestForSlimmingPaintV2

RootLayerScrolling: Fix PaintControllerPaintTestForSlimmingPaintV2

Adjust expectations, and parameterize test for RLS.

BUG=490942
R=skobes@chromium.org,pdr@chromium.org
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_layout_tests_slimming_paint_v2

Committed: https://crrev.com/d0f785e2437ae0890363a8ab16da56153ea16262
Cr-Commit-Position: refs/heads/master@{#438684}

[szager1, 2016-12-13 23:54:44]

Description was changed from

==========
RootLayerScrolling: Fix PaintControllerPaintTestForSlimmingPaintV2

Adjust expectations, and parameterize test for RLS.

BUG=490942
R=skobes@chromium.org,pdr@chromium.org
==========

to

==========
RootLayerScrolling: Fix PaintControllerPaintTestForSlimmingPaintV2

Adjust expectations, and parameterize test for RLS.

BUG=490942
R=skobes@chromium.org,pdr@chromium.org
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_layout_tests_slimming_paint_v2
==========

[pdr., 2016-12-14 00:33:22]

On 2016/12/13 at 23:54:44, szager wrote:
> 

LGTM

[szager1, 2016-12-14 00:35:49]

The CQ bit was checked by szager@chromium.org

[commit-bot: I haz the power, 2016-12-14 00:36:24]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-12-14 02:37:29]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-12-14 02:37:30]

Try jobs failed on following builders:
  linux_layout_tests_slimming_paint_v2 on master.tryserver.chromium.linux
(JOB_TIMED_OUT, no build URL)

[szager1, 2016-12-14 22:20:50]

The CQ bit was checked by szager@chromium.org

[commit-bot: I haz the power, 2016-12-14 22:21:31]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-12-14 22:26:51]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-12-14 22:26:52]

Failed to apply patch for
third_party/WebKit/Source/core/paint/PaintControllerPaintTest.cpp:
While running git apply --index -p1;
  error: patch failed:
third_party/WebKit/Source/core/paint/PaintControllerPaintTest.cpp:146
  error: third_party/WebKit/Source/core/paint/PaintControllerPaintTest.cpp:
patch does not apply

Patch:       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
abca3afb1fe4e0bf4894604b4a81bff167d26ca5..dd9056848bb9d9406f6fdbbee79146d1eb6ce7d6
100644
--- a/third_party/WebKit/Source/core/paint/PaintControllerPaintTest.cpp
+++ b/third_party/WebKit/Source/core/paint/PaintControllerPaintTest.cpp
@@ -21,6 +21,10 @@ INSTANTIATE_TEST_CASE_P(All,
                         PaintControllerPaintTestForSlimmingPaintV1AndV2,
                         ::testing::Bool());
 
+INSTANTIATE_TEST_CASE_P(All,
+                        PaintControllerPaintTestForSlimmingPaintV2,
+                        ::testing::Bool());
+
 TEST_P(PaintControllerPaintTestForSlimmingPaintV1AndV2,
        FullDocumentPaintingWithCaret) {
   setBodyInnerHTML(
@@ -132,7 +136,7 @@ TEST_P(PaintControllerPaintTestForSlimmingPaintV1AndV2,
InlineRelayout) {
   }
 }
 
-TEST_F(PaintControllerPaintTestForSlimmingPaintV2, ChunkIdClientCacheFlag) {
+TEST_P(PaintControllerPaintTestForSlimmingPaintV2, ChunkIdClientCacheFlag) {
   setBodyInnerHTML(
       "<div id='div' style='width: 200px; height: 200px; opacity: 0.5'>"
       "  <div style='width: 100px; height: 100px; background-color: "
@@ -146,29 +150,48 @@ TEST_F(PaintControllerPaintTestForSlimmingPaintV2,
ChunkIdClientCacheFlag) {
   LayoutBlock& div = *toLayoutBlock(getLayoutObjectByElementId("div"));
   LayoutObject& subDiv = *div.firstChild();
   LayoutObject& subDiv2 = *subDiv.nextSibling();
-  EXPECT_DISPLAY_LIST(
-      rootPaintController().getDisplayItemList(), 11,
-      TestDisplayItem(layoutView(),
-                      DisplayItem::kClipFrameToVisibleContentRect),
-      TestDisplayItem(*layoutView().layer(), DisplayItem::kSubsequence),
-      TestDisplayItem(layoutView(), documentBackgroundType),
-      TestDisplayItem(htmlLayer, DisplayItem::kSubsequence),
-      TestDisplayItem(div, DisplayItem::kBeginCompositing),
-      TestDisplayItem(subDiv, backgroundType),
-      TestDisplayItem(subDiv2, backgroundType),
-      TestDisplayItem(div, DisplayItem::kEndCompositing),
-      TestDisplayItem(htmlLayer, DisplayItem::kEndSubsequence),
-      TestDisplayItem(*layoutView().layer(), DisplayItem::kEndSubsequence),
-      TestDisplayItem(layoutView(),
-                      DisplayItem::clipTypeToEndClipType(
-                          DisplayItem::kClipFrameToVisibleContentRect)));
+  if (RuntimeEnabledFeatures::rootLayerScrollingEnabled()) {
+    EXPECT_DISPLAY_LIST(
+        rootPaintController().getDisplayItemList(), 9,
+        TestDisplayItem(*layoutView().layer(), DisplayItem::kSubsequence),
+        TestDisplayItem(layoutView(), documentBackgroundType),
+        TestDisplayItem(htmlLayer, DisplayItem::kSubsequence),
+        TestDisplayItem(div, DisplayItem::kBeginCompositing),
+        TestDisplayItem(subDiv, backgroundType),
+        TestDisplayItem(subDiv2, backgroundType),
+        TestDisplayItem(div, DisplayItem::kEndCompositing),
+        TestDisplayItem(htmlLayer, DisplayItem::kEndSubsequence),
+        TestDisplayItem(*layoutView().layer(), DisplayItem::kEndSubsequence));
+  } else {
+    EXPECT_DISPLAY_LIST(
+        rootPaintController().getDisplayItemList(), 11,
+        TestDisplayItem(layoutView(),
+                        DisplayItem::kClipFrameToVisibleContentRect),
+        TestDisplayItem(*layoutView().layer(), DisplayItem::kSubsequence),
+        TestDisplayItem(layoutView(), documentBackgroundType),
+        TestDisplayItem(htmlLayer, DisplayItem::kSubsequence),
+        TestDisplayItem(div, DisplayItem::kBeginCompositing),
+        TestDisplayItem(subDiv, backgroundType),
+        TestDisplayItem(subDiv2, backgroundType),
+        TestDisplayItem(div, DisplayItem::kEndCompositing),
+        TestDisplayItem(htmlLayer, DisplayItem::kEndSubsequence),
+        TestDisplayItem(*layoutView().layer(), DisplayItem::kEndSubsequence),
+        TestDisplayItem(layoutView(),
+                        DisplayItem::clipTypeToEndClipType(
+                            DisplayItem::kClipFrameToVisibleContentRect)));
+  }
 
   const PaintChunk& backgroundChunk = rootPaintController().paintChunks()[0];
   EXPECT_TRUE(backgroundChunk.properties.scroll->isRoot());
 
   const EffectPaintPropertyNode* effectNode = div.paintProperties()->effect();
   EXPECT_EQ(0.5f, effectNode->opacity());
-  const PaintChunk& chunk = rootPaintController().paintChunks()[1];
+
+  // When RLS is enabled, an additional paint chunk will be created for the
+  // LayoutView's layer.
+  unsigned divChunkIndex =
+      RuntimeEnabledFeatures::rootLayerScrollingEnabled() ? 2 : 1;
+  const PaintChunk& chunk = rootPaintController().paintChunks()[divChunkIndex];
   EXPECT_EQ(*div.layer(), chunk.id->client);
   EXPECT_EQ(effectNode, chunk.properties.effect.get());
 
@@ -180,7 +203,7 @@ TEST_F(PaintControllerPaintTestForSlimmingPaintV2,
ChunkIdClientCacheFlag) {
   EXPECT_TRUE(rootPaintController().clientCacheIsValid(subDiv));
 }
 
-TEST_F(PaintControllerPaintTestForSlimmingPaintV2, CompositingFold) {
+TEST_P(PaintControllerPaintTestForSlimmingPaintV2, CompositingFold) {
   setBodyInnerHTML(
       "<div id='div' style='width: 200px; height: 200px; opacity: 0.5'>"
       "  <div style='width: 100px; height: 100px; background-color: "
@@ -192,21 +215,36 @@ TEST_F(PaintControllerPaintTestForSlimmingPaintV2,
CompositingFold) {
   LayoutBlock& div = *toLayoutBlock(getLayoutObjectByElementId("div"));
   LayoutObject& subDiv = *div.firstChild();
 
-  EXPECT_DISPLAY_LIST(
-      rootPaintController().getDisplayItemList(), 8,
-      TestDisplayItem(layoutView(),
-                      DisplayItem::kClipFrameToVisibleContentRect),
-      TestDisplayItem(*layoutView().layer(), DisplayItem::kSubsequence),
-      TestDisplayItem(layoutView(), documentBackgroundType),
-      TestDisplayItem(htmlLayer, DisplayItem::kSubsequence),
-      // The begin and end compositing display items have been folded into this
-      // one.
-      TestDisplayItem(subDiv, backgroundType),
-      TestDisplayItem(htmlLayer, DisplayItem::kEndSubsequence),
-      TestDisplayItem(*layoutView().layer(), DisplayItem::kEndSubsequence),
-      TestDisplayItem(layoutView(),
-                      DisplayItem::clipTypeToEndClipType(
-                          DisplayItem::kClipFrameToVisibleContentRect)));
+  if (RuntimeEnabledFeatures::rootLayerScrollingEnabled()) {
+    EXPECT_DISPLAY_LIST(
+        rootPaintController().getDisplayItemList(), 6,
+        TestDisplayItem(*layoutView().layer(), DisplayItem::kSubsequence),
+        TestDisplayItem(layoutView(), documentBackgroundType),
+        TestDisplayItem(htmlLayer, DisplayItem::kSubsequence),
+        // The begin and end compositing display items have been folded into
+        // this
+        // one.
+        TestDisplayItem(subDiv, backgroundType),
+        TestDisplayItem(htmlLayer, DisplayItem::kEndSubsequence),
+        TestDisplayItem(*layoutView().layer(), DisplayItem::kEndSubsequence));
+  } else {
+    EXPECT_DISPLAY_LIST(
+        rootPaintController().getDisplayItemList(), 8,
+        TestDisplayItem(layoutView(),
+                        DisplayItem::kClipFrameToVisibleContentRect),
+        TestDisplayItem(*layoutView().layer(), DisplayItem::kSubsequence),
+        TestDisplayItem(layoutView(), documentBackgroundType),
+        TestDisplayItem(htmlLayer, DisplayItem::kSubsequence),
+        // The begin and end compositing display items have been folded into
+        // this
+        // one.
+        TestDisplayItem(subDiv, backgroundType),
+        TestDisplayItem(htmlLayer, DisplayItem::kEndSubsequence),
+        TestDisplayItem(*layoutView().layer(), DisplayItem::kEndSubsequence),
+        TestDisplayItem(layoutView(),
+                        DisplayItem::clipTypeToEndClipType(
+                            DisplayItem::kClipFrameToVisibleContentRect)));
+  }
 }
 
 }  // namespace blink

[szager1, 2016-12-14 22:31:45]

The CQ bit was checked by szager@chromium.org

[szager1, 2016-12-14 22:31:45]

The patchset sent to the CQ was uploaded after l-g-t-m from pdr@chromium.org
Link to the patchset: https://codereview.chromium.org/2575663002/#ps20001
(title: "rebase")

[commit-bot: I haz the power, 2016-12-14 22:32:56]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-12-14 23:58:47]

CQ is committing da patch.

Bot data: {"patchset_id": 20001, "attempt_start_ts": 1481754705435130,
"parent_rev": "854ca3a80ccf6d9d05955664ba69c633f140450a", "commit_rev":
"29150a40416893abb5698af3cf0ccb254fbf420c"}

[commit-bot: I haz the power, 2016-12-14 23:59:15]

Description was changed from

==========
RootLayerScrolling: Fix PaintControllerPaintTestForSlimmingPaintV2

Adjust expectations, and parameterize test for RLS.

BUG=490942
R=skobes@chromium.org,pdr@chromium.org
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_layout_tests_slimming_paint_v2
==========

to

==========
RootLayerScrolling: Fix PaintControllerPaintTestForSlimmingPaintV2

Adjust expectations, and parameterize test for RLS.

BUG=490942
R=skobes@chromium.org,pdr@chromium.org
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_layout_tests_slimming_paint_v2

Review-Url: https://codereview.chromium.org/2575663002
==========

[commit-bot: I haz the power, 2016-12-14 23:59:16]

Committed patchset #2 (id:20001)

[commit-bot: I haz the power, 2016-12-15 00:01:48]

Description was changed from

==========
RootLayerScrolling: Fix PaintControllerPaintTestForSlimmingPaintV2

Adjust expectations, and parameterize test for RLS.

BUG=490942
R=skobes@chromium.org,pdr@chromium.org
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_layout_tests_slimming_paint_v2

Review-Url: https://codereview.chromium.org/2575663002
==========

to

==========
RootLayerScrolling: Fix PaintControllerPaintTestForSlimmingPaintV2

Adjust expectations, and parameterize test for RLS.

BUG=490942
R=skobes@chromium.org,pdr@chromium.org
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_layout_tests_slimming_paint_v2

Committed: https://crrev.com/d0f785e2437ae0890363a8ab16da56153ea16262
Cr-Commit-Position: refs/heads/master@{#438684}
==========

[commit-bot: I haz the power, 2016-12-15 00:01:49]

Patchset 2 (id:??) landed as
https://crrev.com/d0f785e2437ae0890363a8ab16da56153ea16262
Cr-Commit-Position: refs/heads/master@{#438684}