Remove paintOffsetTranslation for fixed-position elements.

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 122 matching lines @@
 
   FrameView* frameView = document().view();
   frameView->updateAllLifecyclePhases();
 
   // target1 is a fixed-position element inside an absolute-position scrolling
   // element.  It should be attached under the viewport to skip scrolling and
   // offset of the parent.
   Element* target1 = document().getElementById("target1");
   const ObjectPaintProperties* target1Properties =
       target1->layoutObject()->paintProperties();
-  EXPECT_EQ(TransformationMatrix().translate(200, 150),
-            target1Properties->paintOffsetTranslation()->matrix());
-  EXPECT_EQ(framePreTranslation(),
-            target1Properties->paintOffsetTranslation()->parent());
-  EXPECT_EQ(target1Properties->paintOffsetTranslation(),
-            target1Properties->overflowClip()->localTransformSpace());
-  EXPECT_EQ(FloatRoundedRect(0, 0, 100, 100),
+  EXPECT_EQ(FloatRoundedRect(200, 150, 100, 100),
             target1Properties->overflowClip()->clipRect());
   // Likewise, it inherits clip from the viewport, skipping overflow clip of the
   // scroller.
   EXPECT_EQ(frameContentClip(), target1Properties->overflowClip()->parent());
-  // target1 should not have it's own scroll node and instead should inherit
+  // target1 should not have its own scroll node and instead should inherit
   // positionedScroll's.
   const ObjectPaintProperties* positionedScrollProperties =
       positionedScroll->layoutObject()->paintProperties();
   EXPECT_TRUE(positionedScrollProperties->scroll()->parent()->isRoot());
   EXPECT_EQ(TransformationMatrix().translate(0, -3),
             positionedScrollProperties->scroll()
                 ->scrollOffsetTranslation()
                 ->matrix());
   EXPECT_EQ(nullptr, target1Properties->scroll());
-
   CHECK_EXACT_VISUAL_RECT(LayoutRect(200, 150, 100, 100),
                           target1->layoutObject(), frameView->layoutView());
 
   // target2 is a fixed-position element inside a transformed scrolling element.
   // It should be attached under the scrolled box of the transformed element.
   Element* target2 = document().getElementById("target2");
   const ObjectPaintProperties* target2Properties =
       target2->layoutObject()->paintProperties();
   Element* scroller = document().getElementById("transformedScroll");
   const ObjectPaintProperties* scrollerProperties =
       scroller->layoutObject()->paintProperties();
-  EXPECT_EQ(TransformationMatrix().translate(200, 150),
-            target2Properties->paintOffsetTranslation()->matrix());
-  EXPECT_EQ(scrollerProperties->scrollTranslation(),
-            target2Properties->paintOffsetTranslation()->parent());
-  EXPECT_EQ(target2Properties->paintOffsetTranslation(),
-            target2Properties->overflowClip()->localTransformSpace());
-  EXPECT_EQ(FloatRoundedRect(0, 0, 100, 100),
+  EXPECT_EQ(FloatRoundedRect(200, 150, 100, 100),
             target2Properties->overflowClip()->clipRect());
   EXPECT_EQ(scrollerProperties->overflowClip(),
             target2Properties->overflowClip()->parent());
   // target2 should not have it's own scroll node and instead should inherit
   // transformedScroll's.
   const ObjectPaintProperties* transformedScrollProperties =
       transformedScroll->layoutObject()->paintProperties();
   EXPECT_TRUE(transformedScrollProperties->scroll()->parent()->isRoot());
   EXPECT_EQ(TransformationMatrix().translate(0, -5),
             transformedScrollProperties->scroll()
@@ skipping 849 matching lines @@
   const ObjectPaintProperties* containerProperties =
       container.paintProperties();
   EXPECT_EQ(TransformationMatrix().translate(20, 30),
             containerProperties->transform()->matrix());
   EXPECT_EQ(svgProperties->transform(),
             containerProperties->transform()->parent());
 
   Element* fixed = document().getElementById("fixed");
   const ObjectPaintProperties* fixedProperties =
       fixed->layoutObject()->paintProperties();
-  EXPECT_EQ(TransformationMatrix().translate(200, 150),
-            fixedProperties->paintOffsetTranslation()->matrix());
   // Ensure the fixed position element is rooted at the nearest transform
   // container.
   EXPECT_EQ(containerProperties->transform(),
-            fixedProperties->paintOffsetTranslation()->parent());
+            fixedProperties->localBorderBoxProperties()
+                ->propertyTreeState.transform());
 }
 
 TEST_P(PaintPropertyTreeBuilderTest, ControlClip) {
   setBodyInnerHTML(
       "<style>"
       "  body {"
       "    margin: 0;"
       "  }"
       "  input {"
       "    border-width: 5px;"
@@ skipping 372 matching lines @@
                     // TODO(crbug.com/599939): mapToVisualRectInAncestorSpace()
                     // doesn't apply css clip on the object itself.
                     LayoutUnit::max());
 
   LayoutObject* fixed = document().getElementById("fixed")->layoutObject();
   const ObjectPaintProperties* fixedProperties = fixed->paintProperties();
   EXPECT_EQ(
       clipProperties->cssClip(),
       fixedProperties->localBorderBoxProperties()->propertyTreeState.clip());
   EXPECT_EQ(framePreTranslation(), fixedProperties->localBorderBoxProperties()
-                                       ->propertyTreeState.transform()
-                                       ->parent());
-  EXPECT_EQ(TransformationMatrix().translate(654, 321),
-            fixedProperties->localBorderBoxProperties()
-                ->propertyTreeState.transform()
-                ->matrix());
-  EXPECT_EQ(LayoutPoint(),
+                                       ->propertyTreeState.transform());
+  EXPECT_EQ(LayoutPoint(654, 321),
             fixedProperties->localBorderBoxProperties()->paintOffset);
   CHECK_VISUAL_RECT(LayoutRect(), fixed, document().view()->layoutView(),
                     // TODO(crbug.com/599939): CSS clip of fixed-position
                     // descendants is broken in
                     // mapToVisualRectInAncestorSpace().
                     LayoutUnit::max());
 }
 
 TEST_P(PaintPropertyTreeBuilderTest, CSSClipAbsPositionDescendant) {
   // This test verifies that clip tree hierarchy being generated correctly for
@@ skipping 115 matching lines @@
   EXPECT_EQ(FloatRoundedRect(FloatRect(absoluteClipRect)),
             clipProperties->cssClipFixedPosition()->clipRect());
   CHECK_EXACT_VISUAL_RECT(LayoutRect(), clip, document().view()->layoutView());
 
   LayoutObject* fixed = document().getElementById("fixed")->layoutObject();
   const ObjectPaintProperties* fixedProperties = fixed->paintProperties();
   EXPECT_EQ(
       clipProperties->cssClipFixedPosition(),
       fixedProperties->localBorderBoxProperties()->propertyTreeState.clip());
   EXPECT_EQ(framePreTranslation(), fixedProperties->localBorderBoxProperties()
-                                       ->propertyTreeState.transform()
-                                       ->parent());
-  EXPECT_EQ(TransformationMatrix().translate(654, 321),
-            fixedProperties->localBorderBoxProperties()
-                ->propertyTreeState.transform()
-                ->matrix());
-  EXPECT_EQ(LayoutPoint(),
+                                       ->propertyTreeState.transform());
+  EXPECT_EQ(LayoutPoint(654, 321),
             fixedProperties->localBorderBoxProperties()->paintOffset);
   CHECK_VISUAL_RECT(LayoutRect(), fixed, document().view()->layoutView(),
                     // TODO(crbug.com/599939): CSS clip of fixed-position
                     // descendants is broken in geometry mapping.
                     LayoutUnit::max());
 }
 
 TEST_P(PaintPropertyTreeBuilderTest, ColumnSpannerUnderRelativePositioned) {
   setBodyInnerHTML(
       "<style>"
@@ skipping 1462 matching lines @@
   EXPECT_TRUE(filterProperties->effect()->parent()->isRoot());
   EXPECT_EQ(frameScrollTranslation(),
             filterProperties->effect()->localTransformSpace());
   EXPECT_EQ(clipProperties->overflowClip(),
             filterProperties->effect()->outputClip());
 
   const ObjectPaintProperties* childProperties =
       getLayoutObjectByElementId("child")->paintProperties();
   const PropertyTreeState& childPaintState =
       childProperties->localBorderBoxProperties()->propertyTreeState;
-  EXPECT_EQ(framePreTranslation(),
-            childProperties->paintOffsetTranslation()->parent());
-  EXPECT_EQ(childProperties->paintOffsetTranslation(),
-            childPaintState.transform());
+
   // This will change once we added clip expansion node.
   EXPECT_EQ(filterProperties->effect()->outputClip(), childPaintState.clip());
   EXPECT_EQ(filterProperties->effect(), childPaintState.effect());
 }
 
 TEST_P(PaintPropertyTreeBuilderTest, TransformOriginWithAndWithoutTransform) {
   setBodyInnerHTML(
       "<style>"
       "  body { margin: 0 }"
       "  div {"
@@ skipping 82 matching lines @@
   toElement(ancestor->node())
       ->setAttribute(HTMLNames::styleAttr, "position: static");
   document().view()->updateAllLifecyclePhases();
   EXPECT_NE(ancestor->paintProperties()->overflowClip(),
             descendant->paintProperties()
                 ->localBorderBoxProperties()
                 ->propertyTreeState.clip());
 }
 
 }  // namespace blink