Revert "Virtual test suites for slimming paint phase 2"

This reverts commit e43a87f1b1012746a95937f546f723f7737a46b1.

BUG=525772
TBR=wangxianzhu@chromium.org
NOTRY=true

Review URL: https://codereview.chromium.org/1308953005 .

git-svn-id: svn://svn.chromium.org/blink/trunk@201336 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/LayoutTests/TestExpectations

-crbug.com/524134 virtual/spv2/compositing/repaint/fixed-pos-inside-composited-intermediate-layer.html [ NeedsRebaseline ]
-crbug.com/524134 virtual/spv2/compositing/repaint/invalidations-on-composited-layers.html [ NeedsRebaseline ]
-crbug.com/524134 virtual/spv2/compositing/repaint/resize-repaint.html [ NeedsRebaseline ]
-crbug.com/524134 virtual/spv2/fast/repaint/background-resize-height.html [ NeedsRebaseline ]
-crbug.com/524134 virtual/spv2/fast/repaint/background-resize-width.html [ NeedsRebaseline ]
-crbug.com/524134 virtual/spv2/fast/repaint/child-of-sub-pixel-offset-composited-layer.html [ NeedsRebaseline ]
-crbug.com/524134 virtual/spv2/fast/repaint/delete-into-nested-block.html [ NeedsRebaseline ]
-crbug.com/524134 virtual/spv2/fast/repaint/filter-invalidation-with-composited-container-change.html [ NeedsRebaseline ]
-crbug.com/524134 virtual/spv2/fast/repaint/filter-repaint-accelerated-child-with-filter-child.html [ NeedsRebaseline ]
-crbug.com/524134 virtual/spv2/fast/repaint/filter-repaint-accelerated-on-accelerated-filter.html [ NeedsRebaseline ]
-crbug.com/524134 virtual/spv2/fast/repaint/filter-repaint-on-accelerated-layer.html [ NeedsRebaseline ]
-crbug.com/524134 virtual/spv2/fast/repaint/fixed-under-composited-absolute-scrolled.html [ NeedsRebaseline ]
-crbug.com/524134 virtual/spv2/fast/repaint/fixed-under-composited-fixed-scrolled.html [ NeedsRebaseline ]
-crbug.com/524134 virtual/spv2/fast/repaint/multicol-as-paint-container.html [ NeedsRebaseline ]
-crbug.com/524134 virtual/spv2/fast/repaint/offset-change-wrong-invalidation-with-float.html [ NeedsRebaseline ]
-crbug.com/524134 virtual/spv2/fast/repaint/relative-inline-positioned-movement-repaint.html [ NeedsRebaseline ]
-crbug.com/524134 virtual/spv2/fast/repaint/scroll-stacking-context-backface-visiblity-leaves-traces.html [ NeedsRebaseline ]
-crbug.com/524134 virtual/spv2/paint/invalidation/animated-gif-transformed-offscreen.html [ NeedsRebaseline ]
-crbug.com/524134 virtual/spv2/fast/repaint/vertical-rl-as-paint-container.html [ NeedsRebaseline ]
-crbug.com/524134 virtual/spv2/fast/repaint/invalidate-paint-in-iframe-in-composited-layer.html [ NeedsRebaseline ]
-crbug.com/524134 virtual/spv2/paint/selection/selection-within-composited-scroller.html [ NeedsRebaseline ]
-
-# TODO(wangxianzhu): Triage the failures
-crbug.com/524134 virtual/spv2/compositing/repaint/opacity-between-absolute.html [ ImageOnlyFailure ]
-crbug.com/524134 virtual/spv2/compositing/repaint/opacity-between-absolute2.html [ ImageOnlyFailure ]
-crbug.com/524134 virtual/spv2/fast/repaint/absolute-position-changed.html [ Failure ImageOnlyFailure ]
-crbug.com/524134 virtual/spv2/fast/repaint/align-self-change-keeping-geometry-grid.html [ Failure ]
-crbug.com/524134 virtual/spv2/fast/repaint/block-selection-gap-in-composited-layer.html [ ImageOnlyFailure ]
-crbug.com/524134 virtual/spv2/fast/repaint/clip-path-constant-repaint.html [ Failure ]
-crbug.com/524134 virtual/spv2/fast/repaint/composited-iframe-scroll-repaint.html [ Failure ]
-crbug.com/524134 virtual/spv2/fast/repaint/dont-invalidate-root-layer-when-composited-layer-becomes-visible.html [ Failure ]
-crbug.com/524134 virtual/spv2/fast/repaint/fixed-element-repaint-after-compositing-update.html [ Failure ]
-crbug.com/524134 virtual/spv2/fast/repaint/fixed-position-layer-moved.html [ Failure ]
-crbug.com/524134 virtual/spv2/fast/repaint/japanese-rl-selection-clear.html [ Failure ]
-crbug.com/524134 virtual/spv2/fast/repaint/japanese-rl-selection-repaint.html [ Failure ]
-crbug.com/524134 virtual/spv2/fast/repaint/justify-self-change-keeping-geometry.html [ Failure ]
-crbug.com/524134 virtual/spv2/fast/repaint/overflow-move-after-scroll.html [ Failure ]
-crbug.com/524134 virtual/spv2/fast/repaint/overflow-scroll-after-move.html [ Failure ]
-crbug.com/524134 virtual/spv2/fast/repaint/relative-positioned-movement-repaint.html [ Failure ]
-crbug.com/524134 virtual/spv2/fast/repaint/relayout-fixed-position-after-scale.html [ Failure ]
-crbug.com/524134 virtual/spv2/fast/repaint/repaint-composited-child-in-scrolled-container.html [ Failure ]
-crbug.com/524134 virtual/spv2/fast/repaint/selection-after-delete.html [ Failure ]
-crbug.com/524134 virtual/spv2/fast/repaint/selection-after-remove.html [ Failure ]
-crbug.com/524134 virtual/spv2/fast/repaint/selection-change-in-iframe-with-relative-parent.html [ Failure ]
-crbug.com/524134 virtual/spv2/fast/repaint/selection-clear.html [ Failure ]
-crbug.com/524134 virtual/spv2/fast/repaint/selection-gap-absolute-child.html [ Failure ]
-crbug.com/524134 virtual/spv2/fast/repaint/selection-gap-fixed-child.html [ Failure ]
-crbug.com/524134 virtual/spv2/fast/repaint/selection-gap-flipped-absolute-child.html [ Failure ]
-crbug.com/524134 virtual/spv2/fast/repaint/selection-gap-flipped-fixed-child.html [ Failure ]
-crbug.com/524134 virtual/spv2/fast/repaint/selection-gap-overflow-scroll-2.html [ Failure ]
-crbug.com/524134 virtual/spv2/fast/repaint/selection-gap-overflow-scroll.html [ Failure ]
-crbug.com/524134 virtual/spv2/fast/repaint/selection-gap-transformed-absolute-child.html [ Failure ]
-crbug.com/524134 virtual/spv2/fast/repaint/selection-gap-transformed-fixed-child.html [ Failure ]
-crbug.com/524134 virtual/spv2/fast/repaint/selection-partial-invalidation-between-blocks.html [ Failure ]
-crbug.com/524134 virtual/spv2/fast/repaint/stacking-context-lost.html [ Failure ]
-crbug.com/524134 virtual/spv2/fast/repaint/video-mute-repaint.html [ Failure ]
-crbug.com/524134 virtual/spv2/fast/repaint/video-unmute-repaint.html [ Failure ]
-crbug.com/524134 virtual/spv2/paint/invalidation/invalidate-after-composited-scroll.html [ Failure ]
-crbug.com/524134 virtual/spv2/paint/selection/text-selection-drag.html [ ImageOnlyFailure ]
-crbug.com/524134 virtual/spv2/paint/deprecatedpaintlayer/non-self-painting-layer-overrides-visibility.html [ Crash ]
-
-crbug.com/524236 virtual/spv2/compositing/repaint/clipping-should-not-repaint-composited-descendants.html [ Failure ]
-crbug.com/524236 virtual/spv2/compositing/repaint/scroll-fixed-layer-no-content.html [ Failure ]
-crbug.com/524236 virtual/spv2/compositing/repaint/scroll-fixed-layer-out-of-view.html [ Failure ]
-crbug.com/524236 virtual/spv2/compositing/repaint/scroll-fixed-squahed-layer.html [ Failure ]
-crbug.com/524236 virtual/spv2/compositing/repaint/should-not-clip-composited-overflow-scrolling-layer.html [ Failure ]
-crbug.com/524236 virtual/spv2/compositing/repaint/should-not-repaint-composited-descendants-on-overflow-change.html [ Failure ]
-crbug.com/524236 virtual/spv2/compositing/repaint/should-not-repaint-composited-descendants.html [ Failure ]
-crbug.com/524236 virtual/spv2/compositing/repaint/should-not-repaint-composited-filter.html [ Failure ]
-crbug.com/524236 virtual/spv2/compositing/repaint/should-not-repaint-composited-opacity.html [ Failure ]
-crbug.com/524236 virtual/spv2/compositing/repaint/should-not-repaint-composited-transform.html [ Failure ]
-crbug.com/524236 virtual/spv2/compositing/repaint/should-not-repaint-composited-z-index.html [ Failure ]
-crbug.com/524236 virtual/spv2/fast/repaint/absolute-layer-specified-left-or-right-auto-width-moved-vertically.html [ Failure ]
-
-crbug.com/504613 crbug.com/524248 paint/images/image-backgrounds-not-antialiased.html [ Skip ]
-crbug.com/504613 crbug.com/524248 virtual/spv2/paint/images/image-backgrounds-not-antialiased.html [ Skip ]
+# also crbug.com/524248 
+crbug.com/504613 paint/images/image-backgrounds-not-antialiased.html [ Skip ]
+
 crbug.com/502531 fast/borders/border-antialiasing.html [ ImageOnlyFailure ]
 
 crbug.com/417782 [ Linux Win ] virtual/rootlayerscrolls/fast/scrolling/fractional-scroll-offset-fixed-position-non-composited.html [ ImageOnlyFailure ]
@@ -904,8 +831,6 @@ crbug.com/67587  virtual/gpu/fast/canvas/canvas-toBlob-webp-maximum-quality.html
 crbug.com/524596 paint/invalidation/composited-non-stacking-context-descendant-change-color.html [ ImageOnlyFailure ]
 crbug.com/524596 paint/invalidation/composited-non-stacking-context-descendant-move.html [ ImageOnlyFailure ]
 crbug.com/524596 paint/invalidation/fixed-position-descendant-paint-offset-indirect.html [ ImageOnlyFailure ]
-crbug.com/524596 virtual/spv2/paint/invalidation/composited-non-stacking-context-descendant-move.html [ Skip ]
-crbug.com/524596 virtual/spv2/paint/invalidation/fixed-position-descendant-paint-offset-indirect.html [ Skip ]
 
 crbug.com/425113 svg/clip-path/clip-path-multiple-children.svg [ ImageOnlyFailure ]
 

third_party/WebKit/LayoutTests/VirtualTestSuites

@@ -168,23 +168,5 @@
     "prefix": "threaded",
     "base": "fast/idle-callback",
     "args": ["--enable-threaded-compositing"]
-  },
-  {
-    "prefix": "spv2",
-    "base": "compositing/repaint",
-    "args": ["--enable-slimming-paint-v2",
-             "--enable-blink-features=SelectionPaintingWithoutSelectionGaps"]
-  },
-  {
-    "prefix": "spv2",
-    "base": "fast/repaint",
-    "args": ["--enable-slimming-paint-v2",
-             "--enable-blink-features=SelectionPaintingWithoutSelectionGaps"]
-  },
-  {
-    "prefix": "spv2",
-    "base": "paint",
-    "args": ["--enable-slimming-paint-v2",
-             "--enable-blink-features=SelectionPaintingWithoutSelectionGaps"]
   }
 ]

third_party/WebKit/LayoutTests/virtual/spv2/compositing/repaint/README.txt

-# This suite runs tests with --enable-slimming-paint-v2
-# We also have try bots running full set of layout tests for spv2:
-# https://codereview.chromium.org/1283823002

third_party/WebKit/LayoutTests/virtual/spv2/fast/repaint/README.txt

-# This suite runs tests with --enable-slimming-paint-v2
-# We also have try bots running full set of layout tests for spv2:
-# https://codereview.chromium.org/1283823002

third_party/WebKit/LayoutTests/virtual/spv2/paint/README.txt

-# This suite runs tests with --enable-slimming-paint-v2
-# We also have try bots running full set of layout tests for spv2:
-# https://codereview.chromium.org/1283823002

third_party/WebKit/Source/core/layout/compositing/DeprecatedPaintLayerCompositor.cpp

@@ -878,16 +878,9 @@ void DeprecatedPaintLayerCompositor::resetTrackedPaintInvalidationRects()
 
 void DeprecatedPaintLayerCompositor::setTracksPaintInvalidations(bool tracksPaintInvalidations)
 {
-#if ENABLE(ASSERT)
-    if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
-        ASSERT(lifecycle().state() == DocumentLifecycle::CompositingForSlimmingPaintV2Clean
-            // TODO(wangxianzhu): Remove this when we remove the old path for spv2.
-            || lifecycle().state() == DocumentLifecycle::PaintInvalidationClean);
-    } else {
-        ASSERT(lifecycle().state() == DocumentLifecycle::PaintInvalidationClean);
-    }
-#endif
-
+    ASSERT(lifecycle().state() ==
+        (RuntimeEnabledFeatures::slimmingPaintV2Enabled()
+            ? DocumentLifecycle::CompositingForSlimmingPaintV2Clean : DocumentLifecycle::PaintInvalidationClean));
     m_isTrackingPaintInvalidations = tracksPaintInvalidations;
 }