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

third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp

 /*
  * Copyright (C) 2009, 2010, 2011 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 2228 matching lines @@
                                  compositor_mutable_properties;
     scroll_mutable_properties = (CompositorMutableProperty::kScrollLeft |
                                  CompositorMutableProperty::kScrollTop) &
                                 compositor_mutable_properties;
   }
 
   if (animating_style && animating_style->ShouldCompositeForCurrentAnimations())
     element_id = DOMNodeIds::IdForNode(owning_node);
 
   CompositorElementId compositor_element_id;
-  if (element_id)
-    compositor_element_id =
-        CreateCompositorElementId(element_id, CompositorSubElementId::kPrimary);
+  if (element_id) {
+    compositor_element_id = CompositorElementIdFromDOMNodeId(
+        element_id, CompositorElementIdNamespace::kPrimary);
+  }
 
   graphics_layer_->SetElementId(compositor_element_id);
   graphics_layer_->SetCompositorMutableProperties(primary_mutable_properties);
 
   // We always set the elementId for m_scrollingContentsLayer since it can be
   // animated for smooth scrolling, so we don't need to set it conditionally
   // here.
   if (scrolling_contents_layer_.get())
     scrolling_contents_layer_->SetCompositorMutableProperties(
         scroll_mutable_properties);
@@ skipping 103 matching lines @@
       // Outer layer which corresponds with the scroll view.
       scrolling_layer_ =
           CreateGraphicsLayer(kCompositingReasonLayerForScrollingContainer);
       scrolling_layer_->SetDrawsContent(false);
       scrolling_layer_->SetMasksToBounds(true);
 
       // Inner layer which renders the content that scrolls.
       scrolling_contents_layer_ =
           CreateGraphicsLayer(kCompositingReasonLayerForScrollingContents);
 
-      if (Node* owning_node = owning_layer_.GetLayoutObject().GetNode())
+      if (Node* owning_node = owning_layer_.GetLayoutObject().GetNode()) {
         scrolling_contents_layer_->SetElementId(
-            CreateCompositorElementId(DOMNodeIds::IdForNode(owning_node),
-                                      CompositorSubElementId::kScroll));
+            CompositorElementIdFromDOMNodeId(
+                DOMNodeIds::IdForNode(owning_node),
+                CompositorElementIdNamespace::kScroll));
+      }
 
       scrolling_layer_->AddChild(scrolling_contents_layer_.get());
 
       layer_changed = true;
       if (scrolling_coordinator) {
         scrolling_coordinator->ScrollableAreaScrollLayerDidChange(
             owning_layer_.GetScrollableArea());
         scrolling_coordinator->ScrollableAreasDidChange();
       }
     }
@@ skipping 1232 matching lines @@
   } else if (graphics_layer == decoration_outline_layer_.get()) {
     name = "Decoration Layer";
   } else {
     NOTREACHED();
   }
 
   return name;
 }
 
 }  // namespace blink