compositor-worker: Remove code from cc_blink

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/LayoutView.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/GraphicsLayer.h"
 #include "platform/testing/URLTestHelpers.h"
 #include "public/platform/Platform.h"
-#include "public/platform/WebCompositorMutableProperties.h"
 #include "public/platform/WebLayer.h"
 #include "public/platform/WebLayerTreeView.h"
 #include "public/platform/WebUnitTestSupport.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 <gtest/gtest.h>
 
@@ skipping 104 matching lines @@
     forceFullCompositingUpdate();
 
     Document* document = frame()->document();
 
     Element* tallElement = document->getElementById("tall");
     WebLayer* tallLayer = webLayerFromElement(tallElement);
     EXPECT_TRUE(!tallLayer);
 
     Element* proxiedElement = document->getElementById("proxied");
     WebLayer* proxiedLayer = webLayerFromElement(proxiedElement);
-    EXPECT_TRUE(proxiedLayer->compositorMutableProperties() & WebCompositorMutablePropertyTransform);
-    EXPECT_FALSE(proxiedLayer->compositorMutableProperties() & (WebCompositorMutablePropertyScrollLeft | WebCompositorMutablePropertyScrollTop | WebCompositorMutablePropertyOpacity));
+    EXPECT_TRUE(proxiedLayer->compositorMutableProperties() & CompositorMutableProperty::kTransform);
+    EXPECT_FALSE(proxiedLayer->compositorMutableProperties() & (CompositorMutableProperty::kScrollLeft | CompositorMutableProperty::kScrollTop | CompositorMutableProperty::kOpacity));
     EXPECT_NE(0UL, proxiedLayer->elementId());
 
     Element* scrollElement = document->getElementById("proxied-scroller");
     WebLayer* scrollLayer = scrollingWebLayerFromElement(scrollElement);
-    EXPECT_TRUE(scrollLayer->compositorMutableProperties() & (WebCompositorMutablePropertyScrollLeft | WebCompositorMutablePropertyScrollTop));
-    EXPECT_FALSE(scrollLayer->compositorMutableProperties() & (WebCompositorMutablePropertyTransform | WebCompositorMutablePropertyOpacity));
+    EXPECT_TRUE(scrollLayer->compositorMutableProperties() & (CompositorMutableProperty::kScrollLeft | CompositorMutableProperty::kScrollTop));
+    EXPECT_FALSE(scrollLayer->compositorMutableProperties() & (CompositorMutableProperty::kTransform | CompositorMutableProperty::kOpacity));
     EXPECT_NE(0UL, scrollLayer->elementId());
 
     WebLayer* rootScrollLayer = getRootScrollLayer();
-    EXPECT_TRUE(rootScrollLayer->compositorMutableProperties() & (WebCompositorMutablePropertyScrollLeft | WebCompositorMutablePropertyScrollTop));
-    EXPECT_FALSE(rootScrollLayer->compositorMutableProperties() & (WebCompositorMutablePropertyTransform | WebCompositorMutablePropertyOpacity));
+    EXPECT_TRUE(rootScrollLayer->compositorMutableProperties() & (CompositorMutableProperty::kScrollLeft | CompositorMutableProperty::kScrollTop));
+    EXPECT_FALSE(rootScrollLayer->compositorMutableProperties() & (CompositorMutableProperty::kTransform | CompositorMutableProperty::kOpacity));
 
     EXPECT_NE(0UL, rootScrollLayer->elementId());
 }
 
 TEST_F(CompositorWorkerTest, noProxies)
 {
     // This case is identical to compositor-proxy-basic, but no proxies have
     // actually been created.
     registerMockedHttpURLLoad("compositor-proxy-plumbing-no-proxies.html");
     navigateTo(m_baseURL + "compositor-proxy-plumbing-no-proxies.html");
@@ skipping 43 matching lines @@
     WebLayer* scrollLayer = scrollingWebLayerFromElement(scrollElement);
     EXPECT_FALSE(!!scrollLayer->compositorMutableProperties());
     EXPECT_EQ(0UL, scrollLayer->elementId());
 
     WebLayer* rootScrollLayer = getRootScrollLayer();
     EXPECT_FALSE(!!rootScrollLayer->compositorMutableProperties());
     EXPECT_EQ(0UL, rootScrollLayer->elementId());
 }
 
 } // namespace blink