compositor-worker: blink->cc plumbing

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/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/WebUnitTestSupport.h"
 #include "public/web/WebSettings.h"
 #include "public/web/WebViewClient.h"
 #include "web/WebLocalFrameImpl.h"
 #include "web/WebViewImpl.h"
@@ skipping 194 matching lines @@
     registerMockedHttpURLLoad("compositor-proxy-basic.html");
     navigateTo(m_baseURL + "compositor-proxy-basic.html");
 
     forceFullCompositingUpdate();
 
     Document* document = frame()->document();
 
     {
         Element* proxiedElement = document->getElementById("proxied-transform");
         WebLayer* proxiedLayer = webLayerFromElement(proxiedElement);
-        EXPECT_TRUE(proxiedLayer->compositorMutableProperties() & CompositorMutablePropertyTransform);
-        EXPECT_FALSE(proxiedLayer->compositorMutableProperties() & (CompositorMutablePropertyScrollLeft | CompositorMutablePropertyScrollTop | CompositorMutablePropertyOpacity));
+        EXPECT_TRUE(proxiedLayer->compositorMutableProperties() & CompositorMutableProperty::kTransform);
+        EXPECT_FALSE(proxiedLayer->compositorMutableProperties() & (CompositorMutableProperty::kScrollLeft | CompositorMutableProperty::kScrollTop | CompositorMutableProperty::kOpacity));
         uint64_t elementId = proxiedLayer->elementId();
         EXPECT_NE(0UL, elementId);
 
         TransformationMatrix transformMatrix(11, 12, 13, 14, 21, 22, 23, 24, 31, 32, 33, 34, 41, 42, 43, 44);
         OwnPtrWillBeRawPtr<CompositorMutation> mutation = adoptPtr(new CompositorMutation);
         mutation->setTransform(TransformationMatrix::toSkMatrix44(transformMatrix));
 
         CompositorMutations mutations;
         mutations.map.add(elementId, mutation.release());
 
         webViewImpl()->applyMutations(mutations);
 
         const String& cssValue = proxiedElement->inlineStyle()->getPropertyValue(CSSPropertyTransform);
         EXPECT_EQ(String("matrix3d(11px, 12px, 13px, 14px, 21px, 22px, 23px, 24px, 31px, 32px, 33px, 34px, 41px, 42px, 43px, 44px)"), cssValue);
     }
     {
         Element* proxiedElement = document->getElementById("proxied-opacity");
         WebLayer* proxiedLayer = webLayerFromElement(proxiedElement);
-        EXPECT_TRUE(proxiedLayer->compositorMutableProperties() & CompositorMutablePropertyOpacity);
-        EXPECT_FALSE(proxiedLayer->compositorMutableProperties() & (CompositorMutablePropertyScrollLeft | CompositorMutablePropertyScrollTop | CompositorMutablePropertyTransform));
+        EXPECT_TRUE(proxiedLayer->compositorMutableProperties() & CompositorMutableProperty::kOpacity);
+        EXPECT_FALSE(proxiedLayer->compositorMutableProperties() & (CompositorMutableProperty::kScrollLeft | CompositorMutableProperty::kScrollTop | CompositorMutableProperty::kTransform));
         uint64_t elementId = proxiedLayer->elementId();
         EXPECT_NE(0UL, elementId);
 
         OwnPtrWillBeRawPtr<CompositorMutation> mutation = adoptPtr(new CompositorMutation);
         mutation->setOpacity(0.5);
 
         CompositorMutations mutations;
         mutations.map.add(elementId, mutation.release());
 
         webViewImpl()->applyMutations(mutations);
 
         const String& cssValue = proxiedElement->inlineStyle()->getPropertyValue(CSSPropertyOpacity);
         EXPECT_EQ(String("0.5"), cssValue);
     }
 }
 
 } // namespace blink