compositor-worker: plumb element id and mutable properties

cc/blink/web_layer_impl.cc

Index: cc/blink/web_layer_impl.cc
diff --git a/cc/blink/web_layer_impl.cc b/cc/blink/web_layer_impl.cc
index b372408555996341e58d159004ff1aa765cdac73..6f0872f9e372f6f2365bcea84b00e3705679d68c 100644
--- a/cc/blink/web_layer_impl.cc
+++ b/cc/blink/web_layer_impl.cc
@@ -13,6 +13,7 @@
 #include "base/threading/thread_checker.h"
 #include "base/trace_event/trace_event_impl.h"
 #include "cc/animation/animation.h"
+#include "cc/animation/mutable_properties.h"
 #include "cc/base/region.h"
 #include "cc/base/switches.h"
 #include "cc/blink/web_animation_impl.h"
@@ -28,6 +29,7 @@
 #include "third_party/WebKit/public/platform/WebLayerClient.h"
 #include "third_party/WebKit/public/platform/WebLayerPositionConstraint.h"
 #include "third_party/WebKit/public/platform/WebLayerScrollClient.h"
+#include "third_party/WebKit/public/platform/WebMutableProperties.h"
 #include "third_party/WebKit/public/platform/WebSize.h"
 #include "third_party/skia/include/utils/SkMatrix44.h"
 #include "ui/gfx/geometry/rect_conversions.h"
@@ -492,6 +494,46 @@ void WebLayerImpl::setWebLayerClient(blink::WebLayerClient* client) {
   web_layer_client_ = client;
 }
 
+void WebLayerImpl::setElementId(uint64_t id) {
+  layer_->SetElementId(id);
+}
+
+uint64_t WebLayerImpl::elementId() const {
+  return layer_->element_id();
+}
+
+static_assert(static_cast<cc::MutableProperty>(blink::WebMutablePropertyNone) ==
+                  cc::kMutablePropertyNone,
+              "MutableProperty and WebMutableProperty enums must match");
+
+static_assert(
+    static_cast<cc::MutableProperty>(blink::WebMutablePropertyOpacity) ==
+        cc::kMutablePropertyOpacity,
+    "MutableProperty and WebMutableProperty enums must match");
+
+static_assert(
+    static_cast<cc::MutableProperty>(blink::WebMutablePropertyScrollLeft) ==
+        cc::kMutablePropertyScrollLeft,
+    "MutableProperty and WebMutableProperty enums must match");
+
+static_assert(
+    static_cast<cc::MutableProperty>(blink::WebMutablePropertyScrollTop) ==
+        cc::kMutablePropertyScrollTop,
+    "MutableProperty and WebMutableProperty enums must match");
+
+static_assert(
+    static_cast<cc::MutableProperty>(blink::WebMutablePropertyTransform) ==
+        cc::kMutablePropertyTransform,
+    "MutableProperty and WebMutableProperty enums must match");
+
+void WebLayerImpl::setMutableProperties(uint32_t properties) {
+  layer_->SetMutableProperties(properties);
+}
+
+uint32_t WebLayerImpl::mutableProperties() const {
+  return layer_->mutable_properties();
+}
+
 class TracedDebugInfo : public base::trace_event::ConvertableToTraceFormat {
  public:
   // This object takes ownership of the debug_info object.