Convert Settings::rootLayerScrolls to RuntimeEnabledFeatures

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 <gtest/gtest.h>
 
 namespace blink {
 
 class PaintControllerPaintTestBase : public RenderingTest {
 public:
     PaintControllerPaintTestBase(bool enableSlimmingPaintV2)
-        : m_originalSlimmingPaintInvalidationEnabled(RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled())
-        , m_originalSlimmingPaintV2Enabled(RuntimeEnabledFeatures::slimmingPaintV2Enabled())
+        : m_originalSlimmingPaintV2Enabled(RuntimeEnabledFeatures::slimmingPaintV2Enabled())
         , m_enableSlimmingPaintV2(enableSlimmingPaintV2)
-    { }
+    {
+        RuntimeEnabledFeatures::setSlimmingPaintV2Enabled(enableSlimmingPaintV2);
+    }
+
+    ~PaintControllerPaintTestBase()
+    {
+        CHECK_EQ(m_enableSlimmingPaintV2, RuntimeEnabledFeatures::slimmingPaintV2Enabled());
+        RuntimeEnabledFeatures::setSlimmingPaintV2Enabled(m_originalSlimmingPaintV2Enabled);
+    }
 
 protected:
     LayoutView& layoutView() { return *document().layoutView(); }
     PaintController& rootPaintController() { return layoutView().layer()->graphicsLayerBacking()->getPaintController(); }
 
     void SetUp() override
     {
         RenderingTest::SetUp();
         enableCompositing();
-        RuntimeEnabledFeatures::setSlimmingPaintV2Enabled(m_enableSlimmingPaintV2);
-    }
-    void TearDown() override
-    {
-        RuntimeEnabledFeatures::setSlimmingPaintInvalidationEnabled(m_originalSlimmingPaintInvalidationEnabled);
-        RuntimeEnabledFeatures::setSlimmingPaintV2Enabled(m_originalSlimmingPaintV2Enabled);
     }
 
     bool paintWithoutCommit(const IntRect* interestRect = nullptr)
     {
         // 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;
         }
@@ skipping 19 matching lines @@
         for (auto& item : displayItemList) {
             if (item.client() == client && item.getType() == type)
                 return true;
         }
         return false;
     }
 
     int numCachedNewItems() { return rootPaintController().m_numCachedNewItems; }
 
 private:
-    bool m_originalSlimmingPaintInvalidationEnabled;

[esprehn, 2016/08/25 23:59:24]

is this unrelated, why did this change in this patch?

[trchen, 2016/08/26 00:15:11]

Yes, it is a drive-by change.

This flag wasn't toggled anywhere. Instead of save & restore it could be
converted into save & CHECK_EQ. I think we should simply clean it up.

     bool m_originalSlimmingPaintV2Enabled;
     bool m_enableSlimmingPaintV2;
 };
 
 class PaintControllerPaintTest : public PaintControllerPaintTestBase {
 public:
     PaintControllerPaintTest() : PaintControllerPaintTestBase(false) { }
 };
 
 class PaintControllerPaintTestForSlimmingPaintV2 : public PaintControllerPaintTestBase {
@@ skipping 38 matching lines @@
     } while (false);
 
 // Shorter names for frequently used display item types in tests.
 const DisplayItem::Type backgroundType = DisplayItem::BoxDecorationBackground;
 const DisplayItem::Type foregroundType = DisplayItem::paintPhaseToDrawingType(PaintPhaseForeground);
 const DisplayItem::Type documentBackgroundType = DisplayItem::DocumentBackground;
 
 } // namespace blink
 
 #endif // PaintControllerPaintTest_h