compositor-worker: blink->cc plumbing

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

Index: third_party/WebKit/Source/web/tests/CompositorWorkerTest.cpp
diff --git a/third_party/WebKit/Source/web/tests/CompositorWorkerTest.cpp b/third_party/WebKit/Source/web/tests/CompositorWorkerTest.cpp
index 9cd2ed26e8973746afd80ccbe471bffefc77b3a8..053278dad95f48481e51b3e9f22e1900ea0f5f71 100644
--- a/third_party/WebKit/Source/web/tests/CompositorWorkerTest.cpp
+++ b/third_party/WebKit/Source/web/tests/CompositorWorkerTest.cpp
@@ -8,6 +8,7 @@
 #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"
@@ -222,8 +223,8 @@ TEST_F(CompositorWorkerTest, applyingMutations)
     {
         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);
 
@@ -242,8 +243,8 @@ TEST_F(CompositorWorkerTest, applyingMutations)
     {
         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);