Turn off the old compositing path for SPv2.

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef PaintControllerPaintTest_h
 #define PaintControllerPaintTest_h
 
 #include "core/frame/FrameView.h"
 #include "core/layout/LayoutTestHelper.h"
 #include "core/layout/LayoutView.h"
 #include "core/paint/PaintLayer.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/GraphicsLayer.h"
+#include "platform/graphics/paint/CullRect.h"
 #include "platform/testing/RuntimeEnabledFeaturesTestHelpers.h"
 #include <gtest/gtest.h>
 
 namespace blink {
 
 class PaintControllerPaintTestBase
     : private ScopedSlimmingPaintV2ForTest
     , public RenderingTest {
 public:
     PaintControllerPaintTestBase(bool enableSlimmingPaintV2) : ScopedSlimmingPaintV2ForTest(enableSlimmingPaintV2) { }
 
 protected:
     LayoutView& layoutView() { return *document().layoutView(); }
-    PaintController& rootPaintController() { return layoutView().layer()->graphicsLayerBacking()->getPaintController(); }
+    PaintController& rootPaintController()
+    {
+        if (RuntimeEnabledFeatures::slimmingPaintV2Enabled())
+            return *document().view()->paintController();
+        return layoutView().layer()->graphicsLayerBacking()->getPaintController();
+    }
 
     void SetUp() override
     {
         RenderingTest::SetUp();
         enableCompositing();
     }
 
     bool paintWithoutCommit(const IntRect* interestRect = nullptr)
     {
+        document().view()->lifecycle().advanceTo(DocumentLifecycle::InPaint);
+        if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
+            if (layoutView().layer()->needsRepaint()) {
+                GraphicsContext graphicsContext(rootPaintController());
+                document().view()->paint(graphicsContext, CullRect(LayoutRect::infiniteIntRect()));
+                return true;
+            }
+            document().view()->lifecycle().advanceTo(DocumentLifecycle::PaintClean);
+            return false;
+        }
         // Only root graphics layer is supported.
-        document().view()->lifecycle().advanceTo(DocumentLifecycle::InPaint);
         if (!layoutView().layer()->graphicsLayerBacking()->paintWithoutCommit(interestRect)) {
             document().view()->lifecycle().advanceTo(DocumentLifecycle::PaintClean);
             return false;
         }
         return true;
     }
 
     void commit()
     {
         // Only root graphics layer is supported.
@@ skipping 67 matching lines @@
     } while (false);
 
 // Shorter names for frequently used display item types in tests.
 const DisplayItem::Type backgroundType = DisplayItem::kBoxDecorationBackground;
 const DisplayItem::Type foregroundType = DisplayItem::paintPhaseToDrawingType(PaintPhaseForeground);
 const DisplayItem::Type documentBackgroundType = DisplayItem::kDocumentBackground;
 
 } // namespace blink
 
 #endif // PaintControllerPaintTest_h