CC Animation: Use ElementId to attach CC animation players.

third_party/WebKit/Source/web/tests/CompositorWorkerTest.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/frame/FrameView.h"
 #include "core/layout/api/LayoutViewItem.h"
 #include "core/layout/compositing/CompositedLayerMapping.h"
 #include "core/layout/compositing/PaintLayerCompositor.h"
 #include "core/page/Page.h"
 #include "platform/graphics/CompositorMutableProperties.h"
@@ skipping 159 matching lines @@
     WebLayer* tallLayer = webLayerFromElement(tallElement);
     EXPECT_TRUE(!tallLayer);
 
     Element* proxiedElement = document->getElementById("proxied");
     WebLayer* proxiedLayer = webLayerFromElement(proxiedElement);
     EXPECT_TRUE(!proxiedLayer);
 
     Element* scrollElement = document->getElementById("proxied-scroller");
     WebLayer* scrollLayer = scrollingWebLayerFromElement(scrollElement);
     EXPECT_FALSE(!!scrollLayer->compositorMutableProperties());
-    EXPECT_EQ(0, scrollLayer->elementId());
 
     WebLayer* rootScrollLayer = getRootScrollLayer();
     EXPECT_FALSE(!!rootScrollLayer->compositorMutableProperties());
-    EXPECT_EQ(0, rootScrollLayer->elementId());
 }
 
 TEST_F(CompositorWorkerTest, disconnectedProxies)
 {
     // This case is identical to compositor-proxy-basic, but the proxies are
     // disconnected (the result should be the same as compositor-proxy-plumbing-no-proxies).
     registerMockedHttpURLLoad("compositor-proxy-basic-disconnected.html");
     navigateTo(m_baseURL + "compositor-proxy-basic-disconnected.html");
 
     forceFullCompositingUpdate();
 
     Document* document = frame()->document();
 
     Element* tallElement = document->getElementById("tall");
     WebLayer* tallLayer = webLayerFromElement(tallElement);
     EXPECT_TRUE(!tallLayer);
 
     Element* proxiedElement = document->getElementById("proxied");
     WebLayer* proxiedLayer = webLayerFromElement(proxiedElement);
     EXPECT_TRUE(!proxiedLayer);
 
     Element* scrollElement = document->getElementById("proxied-scroller");
     WebLayer* scrollLayer = scrollingWebLayerFromElement(scrollElement);
     EXPECT_FALSE(!!scrollLayer->compositorMutableProperties());
-    EXPECT_EQ(0, scrollLayer->elementId());
 
     WebLayer* rootScrollLayer = getRootScrollLayer();
     EXPECT_FALSE(!!rootScrollLayer->compositorMutableProperties());
-    EXPECT_EQ(0, rootScrollLayer->elementId());
 }
 
 TEST_F(CompositorWorkerTest, applyingMutationsMultipleElements)
 {
     registerMockedHttpURLLoad("compositor-proxy-basic.html");
     navigateTo(m_baseURL + "compositor-proxy-basic.html");
 
     Document* document = frame()->document();
 
     {
@@ skipping 74 matching lines @@
     {
         const String& transformValue =  document->domWindow()->getComputedStyle(proxiedElement, String())->getPropertyValueInternal(CSSPropertyTransform);
         EXPECT_EQ("matrix3d(11, 12, 13, 14, 21, 22, 23, 24, 31, 32, 33, 34, 41, 42, 43, 44)", transformValue);
 
         const String& opacityValue = document->domWindow()->getComputedStyle(proxiedElement, String())->getPropertyValueInternal(CSSPropertyOpacity);
         EXPECT_EQ("0.8", opacityValue);
     }
 }
 
 } // namespace blink