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

third_party/WebKit/Source/core/animation/Animation.cpp

 /*
  * Copyright (C) 2013 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 734 matching lines @@
 
   // If the optional element id set has no value we must be in SPv1 mode in
   // which case we trust the compositing logic will create a layer if needed.
   if (composited_element_ids.has_value()) {
     DCHECK(RuntimeEnabledFeatures::slimmingPaintV2Enabled());
     Element* target_element =
         ToKeyframeEffectReadOnly(content_.Get())->Target();
     if (!target_element)
       return false;
 
-    CompositorElementId target_element_id =
-        CreateCompositorElementId(DOMNodeIds::IdForNode(target_element),
-                                  CompositorSubElementId::kPrimary);
+    CompositorElementId target_element_id = CompositorElementIdFromDOMNodeId(
+        DOMNodeIds::IdForNode(target_element),
+        CompositorElementIdNamespace::kPrimary);
     if (!composited_element_ids->Contains(target_element_id))
       return false;
   }
 
   return Playing();
 }
 
 bool Animation::IsCandidateForAnimationOnCompositor(
     const Optional<CompositorElementIdSet>& composited_element_ids) const {
   if (!CanStartAnimationOnCompositor(composited_element_ids))
@@ skipping 433 matching lines @@
   DCHECK(!compositor_player_);
 }
 
 void Animation::CompositorAnimationPlayerHolder::Detach() {
   DCHECK(compositor_player_);
   compositor_player_->SetAnimationDelegate(nullptr);
   animation_ = nullptr;
   compositor_player_.reset();
 }
 }  // namespace blink