Convert Settings::rootLayerScrolls to RuntimeEnabledFeatures

third_party/WebKit/Source/web/tests/CompositorWorkerTest.cpp

 // 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.
 
 #include "core/frame/FrameView.h"
 #include "core/layout/api/LayoutViewItem.h"
 #include "core/layout/compositing/CompositedLayerMapping.h"
 #include "core/layout/compositing/PaintLayerCompositor.h"
 #include "core/page/Page.h"
 #include "platform/graphics/CompositorMutableProperties.h"
 #include "platform/graphics/CompositorMutation.h"
 #include "platform/graphics/GraphicsLayer.h"
 #include "platform/testing/URLTestHelpers.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebLayer.h"
 #include "public/platform/WebLayerTreeView.h"
 #include "public/platform/WebURLLoaderMockFactory.h"
 #include "public/web/WebCache.h"
 #include "public/web/WebSettings.h"
 #include "public/web/WebViewClient.h"
 #include "web/WebLocalFrameImpl.h"
 #include "web/WebViewImpl.h"
 #include "web/tests/FrameTestHelpers.h"
 #include "wtf/PtrUtil.h"
 #include <gtest/gtest.h>
 #include <memory>
 
 namespace blink {
 
+typedef bool TestParamRootLayerScrolling;
 class CompositorWorkerTest
     : public testing::Test
-    , public testing::WithParamInterface<FrameTestHelpers::SettingOverrideFunction>
-    , public FrameTestHelpers::SettingOverrider {
+    , public testing::WithParamInterface<TestParamRootLayerScrolling> {
 
 public:
     CompositorWorkerTest()
-        : m_baseURL("http://www.test.com/")
-        , m_helper(this)
+        : m_originalRootLayerScrollingEnabled(RuntimeEnabledFeatures::rootLayerScrollingEnabled())
+        , m_enableRootLayerScrolling(GetParam())
+        , m_originalCompositorWorkerEnabled(RuntimeEnabledFeatures::compositorWorkerEnabled())
+        , m_baseURL("http://www.test.com/")
     {
+        RuntimeEnabledFeatures::setRootLayerScrollingEnabled(m_enableRootLayerScrolling);
+        RuntimeEnabledFeatures::setCompositorWorkerEnabled(true);
     }
 
     void SetUp() override
     {
-        RuntimeEnabledFeatures::setCompositorWorkerEnabled(true);
         m_helper.initialize(true, nullptr, &m_mockWebViewClient, nullptr, &configureSettings);
         webViewImpl()->resize(IntSize(320, 240));
     }
 
     ~CompositorWorkerTest() override
     {
         Platform::current()->getURLLoaderMockFactory()->unregisterAllURLs();
         WebCache::clear();
-    }
 
-    void overrideSettings(WebSettings *settings) override
-    {
-        GetParam()(settings);
+        CHECK_EQ(m_enableRootLayerScrolling, RuntimeEnabledFeatures::rootLayerScrollingEnabled());
+        CHECK_EQ(true, RuntimeEnabledFeatures::compositorWorkerEnabled());
+        RuntimeEnabledFeatures::setCompositorWorkerEnabled(m_originalCompositorWorkerEnabled);
+        RuntimeEnabledFeatures::setRootLayerScrollingEnabled(m_originalRootLayerScrollingEnabled);

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

more manual?

     }
 
     void navigateTo(const String& url)
     {
         FrameTestHelpers::loadFrame(webViewImpl()->mainFrame(), url.utf8().data());
     }
 
     void forceFullCompositingUpdate()
     {
         webViewImpl()->updateAllLifecyclePhases();
     }
 
     void registerMockedHttpURLLoad(const std::string& fileName)
     {
         URLTestHelpers::registerMockedURLFromBaseURL(m_baseURL, WebString::fromUTF8(fileName.c_str()));
     }
 
     WebLayer* getRootScrollLayer()
     {
-        Settings* settings = frame()->settings();
-        bool rootLayerScrolls = settings && settings->rootLayerScrolls();
-        if (rootLayerScrolls) {
+        if (RuntimeEnabledFeatures::rootLayerScrollingEnabled()) {
             DCHECK(frame());
             DCHECK(frame()->view());
             DCHECK(frame()->view()->layoutViewportScrollableArea());
             DCHECK(frame()->view()->layoutViewportScrollableArea()->layerForScrolling());
             return frame()->view()->layoutViewportScrollableArea()->layerForScrolling()->platformLayer();
         }
         PaintLayerCompositor* compositor = frame()->contentLayoutItem().compositor();
         DCHECK(compositor);
         DCHECK(compositor->scrollLayer());
 
         WebLayer* webScrollLayer = compositor->scrollLayer()->platformLayer();
         return webScrollLayer;
     }
 
     WebViewImpl* webViewImpl() const { return m_helper.webView(); }
     LocalFrame* frame() const { return m_helper.webView()->mainFrameImpl()->frame(); }
 
+private:
+    bool m_originalRootLayerScrollingEnabled;
+    bool m_enableRootLayerScrolling;
+    bool m_originalCompositorWorkerEnabled;
+
 protected:
     String m_baseURL;
     FrameTestHelpers::TestWebViewClient m_mockWebViewClient;
 
 private:
     static void configureSettings(WebSettings* settings)
     {
         settings->setJavaScriptEnabled(true);
         settings->setAcceleratedCompositingEnabled(true);
         settings->setPreferCompositingToLCDTextEnabled(true);
@@ skipping 34 matching lines @@
 }
 
 static WebLayer* webLayerFromElement(Element* element)
 {
     CompositedLayerMapping* compositedLayerMapping = mappingFromElement(element);
     if (!compositedLayerMapping)
         return nullptr;
     return webLayerFromGraphicsLayer(compositedLayerMapping->mainGraphicsLayer());
 }
 
-INSTANTIATE_TEST_CASE_P(All, CompositorWorkerTest, ::testing::Values(
-    FrameTestHelpers::DefaultSettingOverride,
-    FrameTestHelpers::RootLayerScrollsSettingOverride));
+INSTANTIATE_TEST_CASE_P(All, CompositorWorkerTest, ::testing::Bool());
 
 TEST_P(CompositorWorkerTest, plumbingElementIdAndMutableProperties)
 {
     registerMockedHttpURLLoad("compositor-proxy-basic.html");
     navigateTo(m_baseURL + "compositor-proxy-basic.html");
 
     forceFullCompositingUpdate();
 
     Document* document = frame()->document();
 
@@ skipping 160 matching lines @@
     {
         const String& transformValue =  document->domWindow()->getComputedStyle(proxiedElement, String())->getPropertyValueInternal(CSSPropertyTransform);
         EXPECT_EQ("matrix3d(11, 12, 13, 14, 21, 22, 23, 24, 31, 32, 33, 34, 41, 42, 43, 44)", transformValue);
 
         const String& opacityValue = document->domWindow()->getComputedStyle(proxiedElement, String())->getPropertyValueInternal(CSSPropertyOpacity);
         EXPECT_EQ("0.8", opacityValue);
     }
 }
 
 } // namespace blink