compositor-worker: plumb element id and mutable properties

cc/blink/web_layer_impl.cc

 // Copyright 2014 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 "cc/blink/web_layer_impl.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/strings/string_util.h"
 #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"
 #include "cc/blink/web_blend_mode.h"
 #include "cc/blink/web_filter_operations_impl.h"
 #include "cc/blink/web_to_cc_animation_delegate_adapter.h"
 #include "cc/layers/layer.h"
 #include "cc/layers/layer_position_constraint.h"
 #include "cc/trees/layer_tree_host.h"
+#include "third_party/WebKit/public/platform/WebCompositorMutableProperties.h"
 #include "third_party/WebKit/public/platform/WebFloatPoint.h"
 #include "third_party/WebKit/public/platform/WebFloatRect.h"
 #include "third_party/WebKit/public/platform/WebGraphicsLayerDebugInfo.h"
 #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/WebSize.h"
 #include "third_party/skia/include/utils/SkMatrix44.h"
 #include "ui/gfx/geometry/rect_conversions.h"
 #include "ui/gfx/geometry/vector2d_conversions.h"
@@ skipping 450 matching lines @@
 }
 
 bool WebLayerImpl::isOrphan() const {
   return !layer_->layer_tree_host();
 }
 
 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::WebCompositorMutablePropertyNone) ==
+        cc::kMutablePropertyNone,
+    "MutableProperty and WebCompositorMutableProperty enums must match");
+
+static_assert(
+    static_cast<cc::MutableProperty>(
+        blink::WebCompositorMutablePropertyOpacity) ==
+        cc::kMutablePropertyOpacity,
+    "MutableProperty and WebCompositorMutableProperty enums must match");
+
+static_assert(
+    static_cast<cc::MutableProperty>(
+        blink::WebCompositorMutablePropertyScrollLeft) ==
+        cc::kMutablePropertyScrollLeft,
+    "MutableProperty and WebCompositorMutableProperty enums must match");
+
+static_assert(
+    static_cast<cc::MutableProperty>(
+        blink::WebCompositorMutablePropertyScrollTop) ==
+        cc::kMutablePropertyScrollTop,
+    "MutableProperty and WebCompositorMutableProperty enums must match");
+
+static_assert(
+    static_cast<cc::MutableProperty>(
+        blink::WebCompositorMutablePropertyTransform) ==
+        cc::kMutablePropertyTransform,
+    "MutableProperty and WebCompositorMutableProperty 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.
   explicit TracedDebugInfo(blink::WebGraphicsLayerDebugInfo* debug_info)
       : debug_info_(debug_info) {}
   void AppendAsTraceFormat(std::string* out) const override {
     DCHECK(thread_checker_.CalledOnValidThread());
     blink::WebString web_string;
     debug_info_->appendAsTraceFormat(&web_string);
     out->append(web_string.utf8());
@@ skipping 34 matching lines @@
 
 Layer* WebLayerImpl::layer() const {
   return layer_.get();
 }
 
 void WebLayerImpl::SetContentsOpaqueIsFixed(bool fixed) {
   contents_opaque_is_fixed_ = fixed;
 }
 
 }  // namespace cc_blink