Revert of Use element id's for animations

third_party/WebKit/Source/web/tests/CompositorWorkerTest.cpp

Index: third_party/WebKit/Source/web/tests/CompositorWorkerTest.cpp
diff --git a/third_party/WebKit/Source/web/tests/CompositorWorkerTest.cpp b/third_party/WebKit/Source/web/tests/CompositorWorkerTest.cpp
index d3a9e1f0f3ec955cb1d6fac52e7c8633dbd72842..c405ad1cce1f641d4f02b4f2cbd1bd39df321816 100644
--- a/third_party/WebKit/Source/web/tests/CompositorWorkerTest.cpp
+++ b/third_party/WebKit/Source/web/tests/CompositorWorkerTest.cpp
@@ -140,19 +140,19 @@
     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)
@@ -174,16 +174,14 @@
     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)
@@ -208,9 +206,11 @@
     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)
@@ -227,7 +227,8 @@
         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;
@@ -244,7 +245,8 @@
         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);
@@ -271,7 +273,8 @@
     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);