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

third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilder.cpp

Index: third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilder.cpp
diff --git a/third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilder.cpp b/third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilder.cpp
index 206782a6454c44ec37bdf59615489fea93970959..94a5400cd3cea74932071a5b23dfade3ed293e01 100644
--- a/third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilder.cpp
+++ b/third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilder.cpp
@@ -76,8 +76,9 @@ static CompositorElementId CreateDomNodeBasedCompositorElementId(
     const LayoutObject& object) {
   // TODO(wkorman): Centralize this implementation with similar across
   // animation, scrolling and compositing logic.
-  return CreateCompositorElementId(DOMNodeIds::IdForNode(object.GetNode()),
-                                   CompositorSubElementId::kPrimary);
+  return CompositorElementIdFromDOMNodeId(
+      DOMNodeIds::IdForNode(object.GetNode()),
+      CompositorElementIdNamespace::kPrimary);
 }
 
 // True if a new property was created or a main thread scrolling reason changed