Fix cc scrollbar layer issues with initialization, and use element ids throughout.

third_party/WebKit/Source/platform/graphics/CompositorElementId.cpp

Index: third_party/WebKit/Source/platform/graphics/CompositorElementId.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/CompositorElementId.cpp b/third_party/WebKit/Source/platform/graphics/CompositorElementId.cpp
index eec2d1131b72df13f5a32912641ffd4d0026fd6b..68d4ee754116f0b1911d796be0a36c56f2fe9798 100644
--- a/third_party/WebKit/Source/platform/graphics/CompositorElementId.cpp
+++ b/third_party/WebKit/Source/platform/graphics/CompositorElementId.cpp
@@ -6,28 +6,33 @@
 
 namespace blink {
 
+static const int numBitsToShift = 3;

[wkorman, 2017/05/12 22:29:39]

See prev comment re: kNamespaceBits.

[chrishtr, 2017/05/12 23:44:16]

Done.

+
 CompositorElementId CreateCompositorElementId(
-    DOMNodeId dom_node_id,
-    CompositorSubElementId sub_element_id) {
-  DCHECK(dom_node_id > 0 &&
-         dom_node_id < std::numeric_limits<DOMNodeId>::max() /
-                           static_cast<unsigned>(
-                               CompositorSubElementId::kNumSubElementTypes));
-  cc::ElementIdType id =
-      dom_node_id << 2;  // Shift to make room for sub_element_id enum bits.
-  id += static_cast<uint64_t>(sub_element_id);
+    uint64_t dom_node_id,
+    CompositorElementIdNamespace namespace_id) {
+  DCHECK(
+      dom_node_id > 0 &&
+      dom_node_id <
+          std::numeric_limits<uint64_t>::max() /
+              static_cast<unsigned>(
+                  CompositorElementIdNamespace::kMaxRepresentableNamespaceId));
+  // Shift to make room for namespace_id enum bits.
+  cc::ElementIdType id = dom_node_id << numBitsToShift;
+  id += static_cast<uint64_t>(namespace_id);
   return CompositorElementId(id);
 }
 
-DOMNodeId DomNodeIdFromCompositorElementId(CompositorElementId element_id) {
-  return element_id.id_ >> 2;
+uint64_t IdFromCompositorElementId(CompositorElementId element_id) {
+  return element_id.id_ >> numBitsToShift;
 }
 
-CompositorSubElementId SubElementIdFromCompositorElementId(
+CompositorElementIdNamespace NamespaceFromCompositorElementId(
     CompositorElementId element_id) {
-  return static_cast<CompositorSubElementId>(
+  return static_cast<CompositorElementIdNamespace>(
       element_id.id_ %
-      static_cast<unsigned>(CompositorSubElementId::kNumSubElementTypes));
+      static_cast<uint64_t>(
+          CompositorElementIdNamespace::kMaxRepresentableNamespaceId));
 }
 
 }  // namespace blink