Store compositor element id in paint properties for animated objects.

third_party/WebKit/Source/core/paint/PaintPropertyTreeUpdateTests.cpp

 // Copyright 2016 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/html/HTMLIFrameElement.h"
 #include "core/paint/PaintPropertyTreeBuilderTest.h"
 #include "core/paint/PaintPropertyTreePrinter.h"
 
 namespace blink {
 
@@ skipping 427 matching lines @@
   auto* iframeContainer = document().getElementById("iframeContainer");
   iframeContainer->setAttribute(HTMLNames::styleAttr, "visibility: hidden;");
   frameView->updateAllLifecyclePhases();
 
   EXPECT_EQ(nullptr, frameScroll(frameView));
   EXPECT_EQ(nullptr, frameScroll(childFrameView));
 }
 
 TEST_P(PaintPropertyTreeUpdateTest,
        TransformNodeWithAnimationLosesNodeWhenAnimationRemoved) {
-  setBodyInnerHTML(
-      "<style>"
-      "@keyframes test {"
-      "  0% { transform: translate(1em, 1em) } "
-      "  100% { transform: translate(2em, 2em) } "
-      "} "
-      ".animate { "
-      "  animation-name: test; "
-      "  animation-duration: 1s "
-      "}"
-      "</style>"
-      "<div id='target' class='animate'></div>");
+  loadTestData("transform-animation.html");
   Element* target = document().getElementById("target");
   const ObjectPaintProperties* properties =
       target->layoutObject()->paintProperties();
   EXPECT_TRUE(properties->transform()->hasDirectCompositingReasons());
 
   // Removing the animation should remove the transform node.
   target->removeAttribute(HTMLNames::classAttr);
   document().view()->updateAllLifecyclePhases();
   EXPECT_EQ(nullptr, properties->transform());
 }
 
 TEST_P(PaintPropertyTreeUpdateTest,
        EffectNodeWithAnimationLosesNodeWhenAnimationRemoved) {
-  setBodyInnerHTML(
-      "<style>"
-      "div {"
-      "  width: 100px;"
-      "  height: 100px;"
-      "  background-color: red;"
-      "} "
-      ".animate {"
-      "  animation-name: test;"
-      "  animation-duration: 4s;"
-      "}"
-      "@keyframes test {"
-      "  from { opacity: 0.0;}"
-      "  to { opacity: 1.0;}"
-      "}"
-      "</style>"
-      "<div id='target' class='animate'></div>");
+  loadTestData("opacity-animation.html");
   Element* target = document().getElementById("target");
   const ObjectPaintProperties* properties =
       target->layoutObject()->paintProperties();
   EXPECT_TRUE(properties->effect()->hasDirectCompositingReasons());
 
   // Removing the animation should remove the effect node.
   target->removeAttribute(HTMLNames::classAttr);
   document().view()->updateAllLifecyclePhases();
   EXPECT_EQ(nullptr, properties->effect());
 }
 
+TEST_P(PaintPropertyTreeUpdateTest,
+       TransformNodeLosesCompositorElementIdWhenAnimationRemoved) {
+  loadTestData("transform-animation.html");
+
+  Element* target = document().getElementById("target");
+  target->setAttribute(HTMLNames::styleAttr, "transform: translateX(2em)");
+  document().view()->updateAllLifecyclePhases();
+
+  const ObjectPaintProperties* properties =
+      target->layoutObject()->paintProperties();
+  EXPECT_NE(CompositorElementId(),
+            properties->transform()->compositorElementId());
+
+  // Remove the animation but keep the transform on the element.
+  target->removeAttribute(HTMLNames::classAttr);
+  document().view()->updateAllLifecyclePhases();
+  EXPECT_EQ(CompositorElementId(),
+            properties->transform()->compositorElementId());
+}
+
+TEST_P(PaintPropertyTreeUpdateTest,
+       EffectNodeLosesCompositorElementIdWhenAnimationRemoved) {
+  loadTestData("opacity-animation.html");
+
+  Element* target = document().getElementById("target");
+  target->setAttribute(HTMLNames::styleAttr, "opacity: 0.2");
+  document().view()->updateAllLifecyclePhases();
+
+  const ObjectPaintProperties* properties =
+      target->layoutObject()->paintProperties();
+  EXPECT_NE(CompositorElementId(), properties->effect()->compositorElementId());
+
+  target->removeAttribute(HTMLNames::classAttr);
+  document().view()->updateAllLifecyclePhases();
+  EXPECT_EQ(CompositorElementId(), properties->effect()->compositorElementId());
+}
+
 TEST_P(PaintPropertyTreeUpdateTest, PerspectiveOriginUpdatesOnSizeChanges) {
   setBodyInnerHTML(
       "<style>"
       "  body { margin: 0 }"
       "  #perspective {"
       "    position: absolute;"
       "    perspective: 100px;"
       "    width: 100px;"
       "    perspective-origin: 50% 50% 0;"
       "  }"
@@ skipping 34 matching lines @@
   EXPECT_EQ(TransformationMatrix().translate3d(50, 100, 0),
             transformObject->paintProperties()->transform()->matrix());
 
   transform->setAttribute(HTMLNames::styleAttr, "width: 200px; height: 300px;");
   document().view()->updateAllLifecyclePhases();
   EXPECT_EQ(TransformationMatrix().translate3d(100, 150, 0),
             transformObject->paintProperties()->transform()->matrix());
 }
 
 }  // namespace blink