Revert of Use element id's for animations

third_party/WebKit/Source/platform/graphics/CompositorMutableStateProvider.cpp

Index: third_party/WebKit/Source/platform/graphics/CompositorMutableStateProvider.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/CompositorMutableStateProvider.cpp b/third_party/WebKit/Source/platform/graphics/CompositorMutableStateProvider.cpp
index aee37a177d6597fb7d2f5eac92838ed8194df9a2..cb2d9b1158971a96cff76f152a1fb4f90688a073 100644
--- a/third_party/WebKit/Source/platform/graphics/CompositorMutableStateProvider.cpp
+++ b/third_party/WebKit/Source/platform/graphics/CompositorMutableStateProvider.cpp
@@ -6,8 +6,6 @@
 
 #include "cc/layers/layer_impl.h"
 #include "cc/trees/layer_tree_impl.h"
-#include "platform/graphics/CompositorElementId.h"
-#include "platform/graphics/CompositorMutableProperties.h"
 #include "platform/graphics/CompositorMutableState.h"
 #include "platform/graphics/CompositorMutation.h"
 #include "wtf/PassOwnPtr.h"
@@ -25,10 +23,9 @@
 PassOwnPtr<CompositorMutableState>
 CompositorMutableStateProvider::getMutableStateFor(uint64_t element_id)
 {
-    cc::LayerImpl* mainLayer = m_state->LayerByElementId(createCompositorElementId(element_id, CompositorSubElementId::Primary));
-    cc::LayerImpl* scrollLayer = m_state->LayerByElementId(createCompositorElementId(element_id, CompositorSubElementId::Scroll));
+    cc::LayerTreeImpl::ElementLayers layers = m_state->GetMutableLayers(element_id);
 
-    if (!mainLayer && !scrollLayer)
+    if (!layers.main && !layers.scroll)
         return nullptr;
 
     // Ensure that we have an entry in the map for |element_id| but do as few
@@ -40,7 +37,7 @@
     if (result.isNewEntry)
         result.storedValue->value = adoptPtr(new CompositorMutation);
 
-    return adoptPtr(new CompositorMutableState(result.storedValue->value.get(), mainLayer, scrollLayer));
+    return adoptPtr(new CompositorMutableState(result.storedValue->value.get(), layers.main, layers.scroll));
 }
 
 } // namespace blink