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

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

 // Copyright 2015 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 "core/paint/PaintPropertyTreeBuilder.h"
 
 #include <memory>
 #include "core/dom/DOMNodeIds.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
@@ skipping 58 matching lines @@
   }
   frame_view.SetContentClip(ClipPaintPropertyNode::Create(
       std::move(parent), std::move(local_transform_space), clip_rect));
   return true;
 }
 
 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
 // (which can affect descendants), false if an existing one was updated.
 static bool UpdateScrollTranslation(
     FrameView& frame_view,
     PassRefPtr<const TransformPaintPropertyNode> parent,
     const TransformationMatrix& matrix,
     const FloatPoint3D& origin,
     PassRefPtr<const ScrollPaintPropertyNode> scroll_parent,
@@ skipping 1181 matching lines @@
                            context.force_subtree_update);
 
     context.force_subtree_update |= object.SubtreeNeedsPaintPropertyUpdate();
   }
 
   if (object.CanContainAbsolutePositionObjects())
     context.container_for_absolute_position = &object;
 }
 
 }  // namespace blink