third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilderTest.cpp - Issue 2105273004: GeometryMapper: Support computing visual rects in spaces that are not direct ancestors.

Unified Diff: third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilderTest.cpp

Issue 2105273004: GeometryMapper: Support computing visual rects in spaces that are not direct ancestors. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: none Created 4 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilder.cpp ('k') | third_party/WebKit/Source/core/paint/PaintPropertyTreePrinter.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilderTest.cpp

diff --git a/third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilderTest.cpp b/third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilderTest.cpp

index 5cf8907e46bcd45d9a578a19653f6b842f4a3b7d..92b8bfa9016ba4dbf07b7bb1e9eee0a1bc5701fe 100644

--- a/third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilderTest.cpp

+++ b/third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilderTest.cpp

@@ -6,6 +6,7 @@

#include "core/layout/LayoutTreeAsText.h"

#include "core/layout/api/LayoutViewItem.h"

#include "core/paint/ObjectPaintProperties.h"

+#include "platform/graphics/paint/GeometryMapper.h"

#include "platform/graphics/paint/TransformPaintPropertyNode.h"

#include "platform/testing/UnitTestHelpers.h"

#include "platform/text/TextStream.h"

@@ -51,6 +52,23 @@ private:

bool m_originalSlimmingPaintV2Enabled;

};

+#define CHECK_VISUAL_RECT(sourceLayoutObject, ancestorLayoutObject) \

+do { \

+ GeometryMapper geometryMapper; \

+ LayoutRect source(sourceLayoutObject->localOverflowRectForPaintInvalidation()); \

+ source.moveBy(sourceLayoutObject->objectPaintProperties()->localBorderBoxProperties()->paintOffset); \

+ bool success = false; \

+ FloatRect actual = geometryMapper.mapToVisualRectInDestinationSpace( \

+ FloatRect(source), \

+ sourceLayoutObject->objectPaintProperties()->localBorderBoxProperties()->propertyTreeState, \

+ ancestorLayoutObject->objectPaintProperties()->localBorderBoxProperties()->propertyTreeState, success); \

+ EXPECT_TRUE(success); \

+ LayoutRect expected = sourceLayoutObject->localOverflowRectForPaintInvalidation(); \

+ sourceLayoutObject->mapToVisualRectInAncestorSpace(ancestorLayoutObject, expected); \

+ EXPECT_EQ(expected, LayoutRect(actual)); \

+} while (0);

TEST_F(PaintPropertyTreeBuilderTest, FixedPosition)

{

loadTestData("fixed-position.html");

@@ -79,6 +97,8 @@ TEST_F(PaintPropertyTreeBuilderTest, FixedPosition)

EXPECT_EQ(target2Properties->paintOffsetTranslation(), target2Properties->overflowClip()->localTransformSpace());

EXPECT_EQ(FloatRoundedRect(0, 0, 100, 100), target2Properties->overflowClip()->clipRect());

EXPECT_EQ(scrollerProperties->overflowClip(), target2Properties->overflowClip()->parent());

+ CHECK_VISUAL_RECT(target1->layoutObject(), frameView->layoutView());

}

TEST_F(PaintPropertyTreeBuilderTest, PositionAndScroll)

@@ -216,7 +236,7 @@ TEST_F(PaintPropertyTreeBuilderTest, NestedOpacityEffect)

LayoutObject& nodeWithoutOpacity = *document().getElementById("nodeWithoutOpacity")->layoutObject();

ObjectPaintProperties* nodeWithoutOpacityProperties = nodeWithoutOpacity.objectPaintProperties();

- EXPECT_EQ(nullptr, nodeWithoutOpacityProperties);

+ EXPECT_NE(nullptr, nodeWithoutOpacityProperties);

LayoutObject& childWithOpacity = *document().getElementById("childWithOpacity")->layoutObject();

ObjectPaintProperties* childWithOpacityProperties = childWithOpacity.objectPaintProperties();

@@ -225,7 +245,7 @@ TEST_F(PaintPropertyTreeBuilderTest, NestedOpacityEffect)

EXPECT_NE(nullptr, childWithOpacityProperties->effect()->parent());

LayoutObject& grandChildWithoutOpacity = *document().getElementById("grandChildWithoutOpacity")->layoutObject();

- EXPECT_EQ(nullptr, grandChildWithoutOpacity.objectPaintProperties());

+ EXPECT_NE(nullptr, grandChildWithoutOpacity.objectPaintProperties());

LayoutObject& greatGrandChildWithOpacity = *document().getElementById("greatGrandChildWithOpacity")->layoutObject();

ObjectPaintProperties* greatGrandChildWithOpacityProperties = greatGrandChildWithOpacity.objectPaintProperties();

@@ -733,9 +753,9 @@ TEST_F(PaintPropertyTreeBuilderTest, TreeContextClipByNonStackingContext)

LayoutObject& child = *document().getElementById("child")->layoutObject();

ObjectPaintProperties* childProperties = child.objectPaintProperties();

- EXPECT_EQ(scrollerProperties->overflowClip(), childProperties->localBorderBoxProperties()->clip);

- EXPECT_EQ(scrollerProperties->scrollTranslation(), childProperties->localBorderBoxProperties()->transform);

- EXPECT_NE(nullptr, childProperties->localBorderBoxProperties()->effect);

+ EXPECT_EQ(scrollerProperties->overflowClip(), childProperties->localBorderBoxProperties()->propertyTreeState.clip);

+ EXPECT_EQ(scrollerProperties->scrollTranslation(), childProperties->localBorderBoxProperties()->propertyTreeState.transform);

+ EXPECT_NE(nullptr, childProperties->localBorderBoxProperties()->propertyTreeState.effect);

}

TEST_F(PaintPropertyTreeBuilderTest, TreeContextUnclipFromParentStackingContext)

@@ -758,9 +778,9 @@ TEST_F(PaintPropertyTreeBuilderTest, TreeContextUnclipFromParentStackingContext)

LayoutObject& child = *document().getElementById("child")->layoutObject();

ObjectPaintProperties* childProperties = child.objectPaintProperties();

- EXPECT_EQ(frameView->contentClip(), childProperties->localBorderBoxProperties()->clip);

- EXPECT_EQ(frameView->scrollTranslation(), childProperties->localBorderBoxProperties()->transform);

- EXPECT_EQ(scrollerProperties->effect(), childProperties->localBorderBoxProperties()->effect);

+ EXPECT_EQ(frameView->contentClip(), childProperties->localBorderBoxProperties()->propertyTreeState.clip);

+ EXPECT_EQ(frameView->scrollTranslation(), childProperties->localBorderBoxProperties()->propertyTreeState.transform);

+ EXPECT_EQ(scrollerProperties->effect(), childProperties->localBorderBoxProperties()->propertyTreeState.effect);

}

TEST_F(PaintPropertyTreeBuilderTest, TableCellLayoutLocation)

@@ -800,7 +820,7 @@ TEST_F(PaintPropertyTreeBuilderTest, TableCellLayoutLocation)

ObjectPaintProperties* targetProperties = target.objectPaintProperties();

EXPECT_EQ(LayoutPoint(170, 170), targetProperties->localBorderBoxProperties()->paintOffset);

- EXPECT_EQ(frameView->scrollTranslation(), targetProperties->localBorderBoxProperties()->transform);

+ EXPECT_EQ(frameView->scrollTranslation(), targetProperties->localBorderBoxProperties()->propertyTreeState.transform);

}

TEST_F(PaintPropertyTreeBuilderTest, CSSClipFixedPositionDescendant)

@@ -839,9 +859,9 @@ TEST_F(PaintPropertyTreeBuilderTest, CSSClipFixedPositionDescendant)

LayoutObject& fixed = *document().getElementById("fixed")->layoutObject();

ObjectPaintProperties* fixedProperties = fixed.objectPaintProperties();

- EXPECT_EQ(clipProperties->cssClip(), fixedProperties->localBorderBoxProperties()->clip);

- EXPECT_EQ(frameView->preTranslation(), fixedProperties->localBorderBoxProperties()->transform->parent());

- EXPECT_EQ(TransformationMatrix().translate(654, 321), fixedProperties->localBorderBoxProperties()->transform->matrix());

+ EXPECT_EQ(clipProperties->cssClip(), fixedProperties->localBorderBoxProperties()->propertyTreeState.clip);

+ EXPECT_EQ(frameView->preTranslation(), fixedProperties->localBorderBoxProperties()->propertyTreeState.transform->parent());

+ EXPECT_EQ(TransformationMatrix().translate(654, 321), fixedProperties->localBorderBoxProperties()->propertyTreeState.transform->matrix());

EXPECT_EQ(LayoutPoint(), fixedProperties->localBorderBoxProperties()->paintOffset);

}

@@ -898,9 +918,9 @@ TEST_F(PaintPropertyTreeBuilderTest, CSSClipFixedPositionDescendantNonShared)