compositor-worker: Remove code from cc_blink

third_party/WebKit/Source/core/dom/CompositorProxy.cpp

Index: third_party/WebKit/Source/core/dom/CompositorProxy.cpp
diff --git a/third_party/WebKit/Source/core/dom/CompositorProxy.cpp b/third_party/WebKit/Source/core/dom/CompositorProxy.cpp
index f45d7ccd873781ab03c0e2647bde0a0d21b72021..3ad9c0ce20af8a90ac9321a1f1f75e433abca58e 100644
--- a/third_party/WebKit/Source/core/dom/CompositorProxy.cpp
+++ b/third_party/WebKit/Source/core/dom/CompositorProxy.cpp
@@ -10,8 +10,8 @@
 #include "core/dom/ExceptionCode.h"
 #include "core/dom/ExecutionContext.h"
 #include "platform/ThreadSafeFunctional.h"
+#include "platform/graphics/CompositorMutableProperties.h"
 #include "public/platform/Platform.h"
-#include "public/platform/WebCompositorMutableProperties.h"
 #include "public/platform/WebTraceLocation.h"
 #include <algorithm>
 
@@ -19,21 +19,21 @@ namespace blink {
 
 static const struct {
     const char* name;
-    WebCompositorMutableProperty property;
+    uint32_t property;
 } allowedProperties[] = {
-    { "opacity", WebCompositorMutablePropertyOpacity },
-    { "scrollleft", WebCompositorMutablePropertyScrollLeft },
-    { "scrolltop", WebCompositorMutablePropertyScrollTop },
-    { "transform", WebCompositorMutablePropertyTransform },
+    { "opacity", CompositorMutableProperty::kOpacity },
+    { "scrollleft", CompositorMutableProperty::kScrollLeft },
+    { "scrolltop", CompositorMutableProperty::kScrollTop },
+    { "transform", CompositorMutableProperty::kTransform },
 };
 
-static WebCompositorMutableProperty compositorMutablePropertyForName(const String& attributeName)
+static uint32_t compositorMutablePropertyForName(const String& attributeName)
 {
     for (const auto& mapping : allowedProperties) {
         if (equalIgnoringCase(mapping.name, attributeName))
             return mapping.property;
     }
-    return WebCompositorMutablePropertyNone;
+    return CompositorMutableProperty::kNone;
 }
 
 static bool isControlThread()
@@ -84,7 +84,7 @@ static uint32_t compositorMutablePropertiesFromNames(const Vector<String>& attri
 {
     uint32_t properties = 0;
     for (const auto& attribute : attributeArray) {
-        properties |= static_cast<uint32_t>(compositorMutablePropertyForName(attribute));
+        properties |= compositorMutablePropertyForName(attribute);
     }
     return properties;
 }
@@ -145,14 +145,14 @@ CompositorProxy::~CompositorProxy()
 
 bool CompositorProxy::supports(const String& attributeName) const
 {
-    return !!(m_compositorMutableProperties & static_cast<uint32_t>(compositorMutablePropertyForName(attributeName)));
+    return m_compositorMutableProperties & compositorMutablePropertyForName(attributeName);
 }
 
 double CompositorProxy::opacity(ExceptionState& exceptionState) const
 {
     if (raiseExceptionIfMutationNotAllowed(exceptionState))
         return 0.0;
-    if (raiseExceptionIfNotMutable(static_cast<uint32_t>(WebCompositorMutablePropertyOpacity), exceptionState))
+    if (raiseExceptionIfNotMutable(CompositorMutableProperty::kOpacity, exceptionState))
         return 0.0;
     return m_opacity;
 }
@@ -161,7 +161,7 @@ double CompositorProxy::scrollLeft(ExceptionState& exceptionState) const
 {
     if (raiseExceptionIfMutationNotAllowed(exceptionState))
         return 0.0;
-    if (raiseExceptionIfNotMutable(static_cast<uint32_t>(WebCompositorMutablePropertyScrollLeft), exceptionState))
+    if (raiseExceptionIfNotMutable(CompositorMutableProperty::kScrollLeft, exceptionState))
         return 0.0;
     return m_scrollLeft;
 }
@@ -170,7 +170,7 @@ double CompositorProxy::scrollTop(ExceptionState& exceptionState) const
 {
     if (raiseExceptionIfMutationNotAllowed(exceptionState))
         return 0.0;
-    if (raiseExceptionIfNotMutable(static_cast<uint32_t>(WebCompositorMutablePropertyScrollTop), exceptionState))
+    if (raiseExceptionIfNotMutable(CompositorMutableProperty::kScrollTop, exceptionState))
         return 0.0;
     return m_scrollTop;
 }
@@ -179,7 +179,7 @@ DOMMatrix* CompositorProxy::transform(ExceptionState& exceptionState) const
 {
     if (raiseExceptionIfMutationNotAllowed(exceptionState))
         return nullptr;
-    if (raiseExceptionIfNotMutable(static_cast<uint32_t>(WebCompositorMutablePropertyTransform), exceptionState))
+    if (raiseExceptionIfNotMutable(CompositorMutableProperty::kTransform, exceptionState))
         return nullptr;
     return m_transform;
 }
@@ -188,40 +188,40 @@ void CompositorProxy::setOpacity(double opacity, ExceptionState& exceptionState)
 {
     if (raiseExceptionIfMutationNotAllowed(exceptionState))
         return;
-    if (raiseExceptionIfNotMutable(static_cast<uint32_t>(WebCompositorMutablePropertyOpacity), exceptionState))
+    if (raiseExceptionIfNotMutable(CompositorMutableProperty::kOpacity, exceptionState))
         return;
     m_opacity = std::min(1., std::max(0., opacity));
-    m_mutatedProperties |= static_cast<uint32_t>(WebCompositorMutablePropertyTransform);
+    m_mutatedProperties |= CompositorMutableProperty::kTransform;
 }
 
 void CompositorProxy::setScrollLeft(double scrollLeft, ExceptionState& exceptionState)
 {
     if (raiseExceptionIfMutationNotAllowed(exceptionState))
         return;
-    if (raiseExceptionIfNotMutable(static_cast<uint32_t>(WebCompositorMutablePropertyScrollLeft), exceptionState))
+    if (raiseExceptionIfNotMutable(CompositorMutableProperty::kScrollLeft, exceptionState))
         return;
     m_scrollLeft = scrollLeft;
-    m_mutatedProperties |= static_cast<uint32_t>(WebCompositorMutablePropertyScrollLeft);
+    m_mutatedProperties |= CompositorMutableProperty::kScrollLeft;
 }
 
 void CompositorProxy::setScrollTop(double scrollTop, ExceptionState& exceptionState)
 {
     if (raiseExceptionIfMutationNotAllowed(exceptionState))
         return;
-    if (raiseExceptionIfNotMutable(static_cast<uint32_t>(WebCompositorMutablePropertyScrollTop), exceptionState))
+    if (raiseExceptionIfNotMutable(CompositorMutableProperty::kScrollTop, exceptionState))
         return;
     m_scrollTop = scrollTop;
-    m_mutatedProperties |= static_cast<uint32_t>(WebCompositorMutablePropertyScrollTop);
+    m_mutatedProperties |= CompositorMutableProperty::kScrollTop;
 }
 
 void CompositorProxy::setTransform(DOMMatrix* transform, ExceptionState& exceptionState)
 {
     if (raiseExceptionIfMutationNotAllowed(exceptionState))
         return;
-    if (raiseExceptionIfNotMutable(static_cast<uint32_t>(WebCompositorMutablePropertyTransform), exceptionState))
+    if (raiseExceptionIfNotMutable(CompositorMutableProperty::kTransform, exceptionState))
         return;
     m_transform = transform;
-    m_mutatedProperties |= static_cast<uint32_t>(WebCompositorMutablePropertyTransform);
+    m_mutatedProperties |= CompositorMutableProperty::kTransform;
 }
 
 bool CompositorProxy::raiseExceptionIfNotMutable(uint32_t property, ExceptionState& exceptionState) const