Revert of Use element id's for animations

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 122 matching lines @@
     Document* document = frame()->document();
 
     Element* tallElement = document->getElementById("tall");
     WebLayer* tallLayer = webLayerFromElement(tallElement);
     EXPECT_TRUE(!tallLayer);
 
     Element* proxiedElement = document->getElementById("proxied-transform");
     WebLayer* proxiedLayer = webLayerFromElement(proxiedElement);
     EXPECT_TRUE(proxiedLayer->compositorMutableProperties() & CompositorMutableProperty::kTransform);
     EXPECT_FALSE(proxiedLayer->compositorMutableProperties() & (CompositorMutableProperty::kScrollLeft | CompositorMutableProperty::kScrollTop | CompositorMutableProperty::kOpacity));
-    EXPECT_TRUE(proxiedLayer->elementId());
+    EXPECT_NE(0UL, proxiedLayer->elementId());
 
     Element* scrollElement = document->getElementById("proxied-scroller");
     WebLayer* scrollLayer = scrollingWebLayerFromElement(scrollElement);
     EXPECT_TRUE(scrollLayer->compositorMutableProperties() & (CompositorMutableProperty::kScrollLeft | CompositorMutableProperty::kScrollTop));
     EXPECT_FALSE(scrollLayer->compositorMutableProperties() & (CompositorMutableProperty::kTransform | CompositorMutableProperty::kOpacity));
-    EXPECT_TRUE(scrollLayer->elementId());
+    EXPECT_NE(0UL, scrollLayer->elementId());
 
     WebLayer* rootScrollLayer = getRootScrollLayer();
     EXPECT_TRUE(rootScrollLayer->compositorMutableProperties() & (CompositorMutableProperty::kScrollLeft | CompositorMutableProperty::kScrollTop));
     EXPECT_FALSE(rootScrollLayer->compositorMutableProperties() & (CompositorMutableProperty::kTransform | CompositorMutableProperty::kOpacity));
 
-    EXPECT_TRUE(rootScrollLayer->elementId());
+    EXPECT_NE(0UL, rootScrollLayer->elementId());
 }
 
 TEST_F(CompositorWorkerTest, noProxies)
 {
     // This case is identical to compositor-proxy-basic, but no proxies have
     // actually been created.
     registerMockedHttpURLLoad("compositor-proxy-plumbing-no-proxies.html");
     navigateTo(m_baseURL + "compositor-proxy-plumbing-no-proxies.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);
 
-    // Note: we presume the existance of mutable properties implies that the the
-    // element has a corresponding compositor proxy. Element ids (which are also
-    // used by animations) do not have this implication, so we do not check for
-    // them here.
     Element* scrollElement = document->getElementById("proxied-scroller");
     WebLayer* scrollLayer = scrollingWebLayerFromElement(scrollElement);
     EXPECT_FALSE(!!scrollLayer->compositorMutableProperties());
+    EXPECT_EQ(0UL, scrollLayer->elementId());
 
     WebLayer* rootScrollLayer = getRootScrollLayer();
     EXPECT_FALSE(!!rootScrollLayer->compositorMutableProperties());
+    EXPECT_EQ(0UL, 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(0UL, scrollLayer->elementId());
 
     WebLayer* rootScrollLayer = getRootScrollLayer();
     EXPECT_FALSE(!!rootScrollLayer->compositorMutableProperties());
+    EXPECT_EQ(0UL, rootScrollLayer->elementId());
 }
 
 TEST_F(CompositorWorkerTest, applyingMutationsMultipleElements)
 {
     registerMockedHttpURLLoad("compositor-proxy-basic.html");
     navigateTo(m_baseURL + "compositor-proxy-basic.html");
 
     Document* document = frame()->document();
 
     {
         forceFullCompositingUpdate();
 
         Element* proxiedElement = document->getElementById("proxied-transform");
         WebLayer* proxiedLayer = webLayerFromElement(proxiedElement);
         EXPECT_TRUE(proxiedLayer->compositorMutableProperties() & CompositorMutableProperty::kTransform);
         EXPECT_FALSE(proxiedLayer->compositorMutableProperties() & (CompositorMutableProperty::kScrollLeft | CompositorMutableProperty::kScrollTop | CompositorMutableProperty::kOpacity));
-        EXPECT_TRUE(proxiedLayer->elementId());
+        uint64_t elementId = proxiedLayer->elementId();
+        EXPECT_NE(0UL, elementId);
 
         TransformationMatrix transformMatrix(11, 12, 13, 14, 21, 22, 23, 24, 31, 32, 33, 34, 41, 42, 43, 44);
         CompositorMutation mutation;
         mutation.setTransform(TransformationMatrix::toSkMatrix44(transformMatrix));
 
         proxiedElement->updateFromCompositorMutation(mutation);
 
         forceFullCompositingUpdate();
         const String& cssValue = 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)", cssValue);
     }
     {
         Element* proxiedElement = document->getElementById("proxied-opacity");
         WebLayer* proxiedLayer = webLayerFromElement(proxiedElement);
         EXPECT_TRUE(proxiedLayer->compositorMutableProperties() & CompositorMutableProperty::kOpacity);
         EXPECT_FALSE(proxiedLayer->compositorMutableProperties() & (CompositorMutableProperty::kScrollLeft | CompositorMutableProperty::kScrollTop | CompositorMutableProperty::kTransform));
-        EXPECT_TRUE(proxiedLayer->elementId());
+        uint64_t elementId = proxiedLayer->elementId();
+        EXPECT_NE(0UL, elementId);
 
         CompositorMutation mutation;
         mutation.setOpacity(0.5);
 
         proxiedElement->updateFromCompositorMutation(mutation);
 
         forceFullCompositingUpdate();
         const String& cssValue = document->domWindow()->getComputedStyle(proxiedElement, String())->getPropertyValueInternal(CSSPropertyOpacity);
         EXPECT_EQ("0.5", cssValue);
     }
 }
 
 TEST_F(CompositorWorkerTest, applyingMutationsMultipleProperties)
 {
     registerMockedHttpURLLoad("compositor-proxy-basic.html");
     navigateTo(m_baseURL + "compositor-proxy-basic.html");
 
     Document* document = frame()->document();
 
     forceFullCompositingUpdate();
 
     Element* proxiedElement = document->getElementById("proxied-transform-and-opacity");
     WebLayer* proxiedLayer = webLayerFromElement(proxiedElement);
     EXPECT_TRUE(proxiedLayer->compositorMutableProperties() & CompositorMutableProperty::kTransform);
     EXPECT_TRUE(proxiedLayer->compositorMutableProperties() & CompositorMutableProperty::kOpacity);
     EXPECT_FALSE(proxiedLayer->compositorMutableProperties() & (CompositorMutableProperty::kScrollLeft | CompositorMutableProperty::kScrollTop));
-    EXPECT_TRUE(proxiedLayer->elementId());
+    uint64_t elementId = proxiedLayer->elementId();
+    EXPECT_NE(0UL, elementId);
 
     TransformationMatrix transformMatrix(11, 12, 13, 14, 21, 22, 23, 24, 31, 32, 33, 34, 41, 42, 43, 44);
     OwnPtr<CompositorMutation> mutation = adoptPtr(new CompositorMutation);
     mutation->setTransform(TransformationMatrix::toSkMatrix44(transformMatrix));
     mutation->setOpacity(0.5);
 
     proxiedElement->updateFromCompositorMutation(*mutation);
     {
         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);
@@ skipping 10 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