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

third_party/WebKit/Source/web/LinkHighlightImpl.cpp

 /*
  * Copyright (C) 2012 Google 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
@@ skipping 80 matching lines @@
   clip_layer_ = compositor_support->CreateLayer();
   clip_layer_->SetTransformOrigin(WebFloatPoint3D());
   clip_layer_->AddChild(content_layer_->Layer());
 
   compositor_player_ = CompositorAnimationPlayer::Create();
   DCHECK(compositor_player_);
   compositor_player_->SetAnimationDelegate(this);
   if (owning_web_view_->LinkHighlightsTimeline())
     owning_web_view_->LinkHighlightsTimeline()->PlayerAttached(*this);
 
-  CompositorElementId element_id = CreateCompositorElementId(
-      DOMNodeIds::IdForNode(node), CompositorSubElementId::kLinkHighlight);
+  CompositorElementId element_id = CompositorElementIdFromDOMNodeId(
+      DOMNodeIds::IdForNode(node),
+      CompositorElementIdNamespace::kLinkHighlight);
   compositor_player_->AttachElement(element_id);
   content_layer_->Layer()->SetDrawsContent(true);
   content_layer_->Layer()->SetOpacity(1);
   content_layer_->Layer()->SetElementId(element_id);
   geometry_needs_update_ = true;
 }
 
 LinkHighlightImpl::~LinkHighlightImpl() {
   if (compositor_player_->IsElementAttached())
     compositor_player_->DetachElement();
@@ skipping 290 matching lines @@
 
 WebLayer* LinkHighlightImpl::Layer() {
   return ClipLayer();
 }
 
 CompositorAnimationPlayer* LinkHighlightImpl::CompositorPlayer() const {
   return compositor_player_.get();
 }
 
 }  // namespace blink