Revert of Use element id's for animations

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 <stddef.h>
 #include <stdint.h>
 
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/strings/string_util.h"
 #include "base/threading/thread_checker.h"
 #include "base/trace_event/trace_event_impl.h"
-#include "cc/animation/element_id.h"
 #include "cc/base/region.h"
 #include "cc/base/switches.h"
 #include "cc/blink/web_blend_mode.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/WebFloatPoint.h"
 #include "third_party/WebKit/public/platform/WebFloatRect.h"
 #include "third_party/WebKit/public/platform/WebLayerPositionConstraint.h"
 #include "third_party/WebKit/public/platform/WebLayerScrollClient.h"
@@ skipping 345 matching lines @@
 }
 
 const cc::Layer* WebLayerImpl::ccLayer() const {
   return layer_.get();
 }
 
 cc::Layer* WebLayerImpl::ccLayer() {
   return layer_.get();
 }
 
-void WebLayerImpl::setElementId(const cc::ElementId& id) {
+void WebLayerImpl::setElementId(uint64_t id) {
   layer_->SetElementId(id);
 }
 
-cc::ElementId WebLayerImpl::elementId() const {
+uint64_t WebLayerImpl::elementId() const {
   return layer_->element_id();
 }
 
 void WebLayerImpl::setCompositorMutableProperties(uint32_t properties) {
   layer_->SetMutableProperties(properties);
 }
 
 uint32_t WebLayerImpl::compositorMutableProperties() const {
   return layer_->mutable_properties();
 }
@@ skipping 18 matching lines @@
 
 void WebLayerImpl::SetContentsOpaqueIsFixed(bool fixed) {
   contents_opaque_is_fixed_ = fixed;
 }
 
 void WebLayerImpl::setHasWillChangeTransformHint(bool has_will_change) {
   layer_->SetHasWillChangeTransformHint(has_will_change);
 }
 
 }  // namespace cc_blink