Store compositor element id in paint properties for animated objects.

third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilderTest.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/paint/PaintPropertyTreeBuilderTest.h"
 
 #include "core/html/HTMLIFrameElement.h"
 #include "core/layout/LayoutTreeAsText.h"
 #include "core/paint/ObjectPaintProperties.h"
 #include "core/paint/PaintPropertyTreePrinter.h"
@@ skipping 39 matching lines @@
   if (RuntimeEnabledFeatures::rootLayerScrollingEnabled())
     return frameView->layoutView()->paintProperties()->scroll();
   return frameView->scroll();
 }
 
 LayoutPoint PaintPropertyTreeBuilderTest::paintOffset(
     const LayoutObject* object) {
   return object->paintProperties()->localBorderBoxProperties()->paintOffset;
 }
 
+const ObjectPaintProperties*
+PaintPropertyTreeBuilderTest::paintPropertiesForElement(const char* name) {
+  return document().getElementById(name)->layoutObject()->paintProperties();
+}
+
 void PaintPropertyTreeBuilderTest::SetUp() {
   Settings::setMockScrollbarsEnabled(true);
 
   RenderingTest::SetUp();
   enableCompositing();
 }
 
 void PaintPropertyTreeBuilderTest::TearDown() {
   RenderingTest::TearDown();
 
@@ skipping 344 matching lines @@
   const ObjectPaintProperties* perspectiveProperties =
       perspective->layoutObject()->paintProperties();
 
   EXPECT_TRUE(perspectiveProperties->transform());
   EXPECT_TRUE(
       perspectiveProperties->transform()->hasDirectCompositingReasons());
 }
 
 TEST_P(PaintPropertyTreeBuilderTest,
        TransformNodeWithActiveAnimationHasDirectCompositingReason) {
-  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>");
-  Element* target = document().getElementById("target");
-  const ObjectPaintProperties* properties =
-      target->layoutObject()->paintProperties();
-  EXPECT_TRUE(properties->transform()->hasDirectCompositingReasons());
+  loadTestData("transform-animation.html");

[Xianzhu, 2016/12/29 20:40:38]

I would prefer inlined html to separate test file because we don't need to open
another file to see what is tested, especially the file is in another directory.

[wkorman, 2016/12/29 20:59:15]

But we already use similar test data fixture in other tests in this class? It
seems a huge benefit redundancy and maintenance wise. I just hadn't seen those
when I wrote the first batch of tests. I used this one file in 4 tests, for
example, and it allowed sharing the example between this test file and the
update tests.

Of course the benefit is debatable, if you feel strongly can switch back, if I
do so should I embed the full html in each test, or use a constant at least?

Ask chrishtr@ how he feels about embedded golden proto data in Maps unit tests,
as it's a similar situation. I am not actually sure which side of that debate he
falls on, would be interested to hear.

+  EXPECT_TRUE(paintPropertiesForElement("target")
+                  ->transform()
+                  ->hasDirectCompositingReasons());
 }
 
-namespace {
-
-const char* kSimpleOpacityExampleHTML =
-    "<style>"
-    "div {"
-    "  width: 100px;"
-    "  height: 100px;"
-    "  background-color: red;"
-    "  animation-name: example;"
-    "  animation-duration: 4s;"
-    "}"
-    "@keyframes example {"
-    "  from { opacity: 0.0;}"
-    "  to { opacity: 1.0;}"
-    "}"
-    "</style>"
-    "<div id='target'></div>";
-
-}  // namespace
-
 TEST_P(PaintPropertyTreeBuilderTest,
        OpacityAnimationDoesNotCreateTransformNode) {
-  setBodyInnerHTML(kSimpleOpacityExampleHTML);
-  Element* target = document().getElementById("target");
-  const ObjectPaintProperties* properties =
-      target->layoutObject()->paintProperties();
-  EXPECT_EQ(nullptr, properties->transform());
+  loadTestData("opacity-animation.html");
+  EXPECT_EQ(nullptr, paintPropertiesForElement("target")->transform());
 }
 
 TEST_P(PaintPropertyTreeBuilderTest,
        EffectNodeWithActiveAnimationHasDirectCompositingReason) {
-  setBodyInnerHTML(kSimpleOpacityExampleHTML);
-  Element* target = document().getElementById("target");
-  const ObjectPaintProperties* properties =
-      target->layoutObject()->paintProperties();
-  EXPECT_TRUE(properties->effect()->hasDirectCompositingReasons());
+  loadTestData("opacity-animation.html");
+  EXPECT_TRUE(paintPropertiesForElement("target")
+                  ->effect()
+                  ->hasDirectCompositingReasons());
 }
 
 TEST_P(PaintPropertyTreeBuilderTest, WillChangeTransform) {
   setBodyInnerHTML(
       "<style> body { margin: 0 } </style>"
       "<div id='transform' style='margin-left: 50px; margin-top: 100px;"
       "    width: 400px; height: 300px;"
       "    will-change: transform'>"
       "</div>");
 
@@ skipping 2699 matching lines @@
 
   toElement(ancestor->node())
       ->setAttribute(HTMLNames::styleAttr, "position: static");
   document().view()->updateAllLifecyclePhases();
   EXPECT_NE(ancestor->paintProperties()->overflowClip(),
             descendant->paintProperties()
                 ->localBorderBoxProperties()
                 ->propertyTreeState.clip());
 }
 
+TEST_P(PaintPropertyTreeBuilderTest,
+       TransformNodeNotAnimatedHasNoCompositorElementId) {
+  setBodyInnerHTML("<div id='target' style='transform: translateX(2em)'></div");
+  const ObjectPaintProperties* properties = paintPropertiesForElement("target");
+  EXPECT_TRUE(properties->transform());
+  EXPECT_EQ(CompositorElementId(),
+            properties->transform()->compositorElementId());
+}
+
+TEST_P(PaintPropertyTreeBuilderTest,
+       EffectNodeNotAnimatedHasNoCompositorElementId) {
+  setBodyInnerHTML("<div id='target' style='opacity: 0.5'></div");
+  const ObjectPaintProperties* properties = paintPropertiesForElement("target");
+  EXPECT_TRUE(properties->effect());
+  EXPECT_EQ(CompositorElementId(), properties->effect()->compositorElementId());
+}
+
+TEST_P(PaintPropertyTreeBuilderTest,
+       TransformNodeAnimatedHasCompositorElementId) {
+  loadTestData("transform-animation.html");
+  const ObjectPaintProperties* properties = paintPropertiesForElement("target");
+  EXPECT_TRUE(properties->transform());
+  EXPECT_NE(CompositorElementId(),
+            properties->transform()->compositorElementId());
+}
+
+TEST_P(PaintPropertyTreeBuilderTest, EffectNodeAnimatedHasCompositorElementId) {
+  loadTestData("opacity-animation.html");
+  const ObjectPaintProperties* properties = paintPropertiesForElement("target");
+  EXPECT_TRUE(properties->effect());
+  EXPECT_NE(CompositorElementId(), properties->effect()->compositorElementId());
+}
+
 }  // namespace blink