Use element id's for animations

third_party/WebKit/Source/core/page/scrolling/ScrollState.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/page/scrolling/ScrollState.h"
 
 #include "core/dom/DOMNodeIds.h"
 #include "core/dom/Element.h"
 #include "core/dom/ExceptionCode.h"
+#include "platform/graphics/CompositorElementId.h"
 #include "wtf/PtrUtil.h"
 #include <memory>
 
 namespace blink {
 
 namespace {
 Element* elementForId(int elementId)
 {
     Node* node = DOMNodeIds::nodeForId(elementId);
     ASSERT(node);
@@ skipping 67 matching lines @@
     if (x)
         m_data->caused_scroll_x = true;
     if (y)
         m_data->caused_scroll_y = true;
     if (x || y)
         m_data->delta_consumed_for_scroll_sequence = true;
 }
 
 Element* ScrollState::currentNativeScrollingElement() const
 {
-    uint64_t elementId = m_data->current_native_scrolling_element();
+    uint64_t elementId = m_data->current_native_scrolling_element().primaryId;
     if (elementId == 0)
         return nullptr;
     return elementForId(elementId);
 }
 
 void ScrollState::setCurrentNativeScrollingElement(Element* element)
 {
-    m_data->set_current_native_scrolling_element(DOMNodeIds::idForNode(element));
+    m_data->set_current_native_scrolling_element(createCompositorElementId(DOMNodeIds::idForNode(element), CompositorSubElementId::Scroll));
 }
 
 void ScrollState::setCurrentNativeScrollingElementById(int elementId)
 {
-    m_data->set_current_native_scrolling_element(elementId);
+    m_data->set_current_native_scrolling_element(createCompositorElementId(elementId, CompositorSubElementId::Scroll));
 }
 
 } // namespace blink