third_party/WebKit/Source/platform/graphics/paint/GeometryMapperTest.cpp - Issue 2745563004: Reduce copying of local data structures in GeometryMapper and PaintLayerClipper.

Unified Diff: third_party/WebKit/Source/platform/graphics/paint/GeometryMapperTest.cpp

Issue 2745563004: Reduce copying of local data structures in GeometryMapper and PaintLayerClipper. (Closed)

Patch Set: none Created 3 years, 9 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

« third_party/WebKit/Source/platform/graphics/paint/GeometryMapper.cpp ('K') | « third_party/WebKit/Source/platform/graphics/paint/GeometryMapper.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/graphics/paint/GeometryMapperTest.cpp

diff --git a/third_party/WebKit/Source/platform/graphics/paint/GeometryMapperTest.cpp b/third_party/WebKit/Source/platform/graphics/paint/GeometryMapperTest.cpp

index c1375c5bf31c7296d1a499fee25528e506d0153d..fc8c4a22864ee411a4e9e783cc4827ffd5ede05f 100644

--- a/third_party/WebKit/Source/platform/graphics/paint/GeometryMapperTest.cpp

+++ b/third_party/WebKit/Source/platform/graphics/paint/GeometryMapperTest.cpp

@@ -75,13 +75,13 @@ class GeometryMapperTest : public ::testing::Test,

.rect();

}

- FloatRect localToAncestorRectInternal(

- const FloatRect& rect,

+ void localToAncestorRectInternal(

const TransformPaintPropertyNode* localTransformNode,

const TransformPaintPropertyNode* ancestorTransformNode,

+ FloatRect& rect,

bool& success) {

- return geometryMapper->localToAncestorRectInternal(

- rect, localTransformNode, ancestorTransformNode, success);

+ geometryMapper->localToAncestorRectInternal(

+ localTransformNode, ancestorTransformNode, rect, success);

}

private:

@@ -135,14 +135,16 @@ const static float kTestEpsilon = 1e-6;

inputRect, localPropertyTreeState, ancestorPropertyTreeState); \

EXPECT_EQ(hasRadius, clipRect.hasRadius()); \

EXPECT_RECT_EQ(expectedVisualRect, clipRect.rect()); \

- EXPECT_RECT_EQ(expectedTransformedRect, \

- geometryMapper->localToAncestorRect( \

- inputRect, localPropertyTreeState.transform(), \

- ancestorPropertyTreeState.transform())); \

- EXPECT_RECT_EQ(expectedTransformedRect, \

- geometryMapper->sourceToDestinationRect( \

- inputRect, localPropertyTreeState.transform(), \

- ancestorPropertyTreeState.transform())); \

+ FloatRect testMappedRect = inputRect; \

+ geometryMapper->localToAncestorRect(localPropertyTreeState.transform(), \

+ ancestorPropertyTreeState.transform(), \

+ testMappedRect); \

+ EXPECT_RECT_EQ(expectedTransformedRect, testMappedRect); \

+ testMappedRect = inputRect; \

+ geometryMapper->sourceToDestinationRect( \

+ localPropertyTreeState.transform(), \

+ ancestorPropertyTreeState.transform(), testMappedRect); \

+ EXPECT_RECT_EQ(expectedTransformedRect, testMappedRect); \

if (ancestorPropertyTreeState.transform() != \

localPropertyTreeState.transform()) { \

const TransformationMatrix* transformForTesting = \

@@ -201,9 +203,9 @@ TEST_F(GeometryMapperTest, TranslationTransform) {

CHECK_MAPPINGS(input, output, output, transform->matrix(), FloatClipRect(),

localState, rootPropertyTreeState(), hasRadius);

- EXPECT_RECT_EQ(input, geometryMapper->ancestorToLocalRect(

- output, rootPropertyTreeState().transform(),

- localState.transform()));

+ geometryMapper->ancestorToLocalRect(rootPropertyTreeState().transform(),

+ localState.transform(), output);

+ EXPECT_RECT_EQ(input, output);

}

TEST_F(GeometryMapperTest, RotationAndScaleTransform) {

@@ -635,8 +637,9 @@ TEST_F(GeometryMapperTest, SiblingTransforms) {

EXPECT_FALSE(success);

EXPECT_RECT_EQ(input, result);

- result = localToAncestorRectInternal(input, transform1.get(),

- transform2.get(), success);

+ result = input;

+ localToAncestorRectInternal(transform1.get(), transform2.get(), result,

+ success);

// Fails, because the transform2state is not an ancestor of transform1State.

EXPECT_FALSE(success);

EXPECT_RECT_EQ(input, result);

@@ -647,8 +650,9 @@ TEST_F(GeometryMapperTest, SiblingTransforms) {

EXPECT_FALSE(success);

EXPECT_RECT_EQ(input, result);

- result = localToAncestorRectInternal(input, transform2.get(),

- transform1.get(), success);

+ result = input;

+ localToAncestorRectInternal(transform2.get(), transform1.get(), result,

+ success);

// Fails, because the transform1state is not an ancestor of transform2State.

EXPECT_FALSE(success);

EXPECT_RECT_EQ(input, result);

@@ -661,8 +665,9 @@ TEST_F(GeometryMapperTest, SiblingTransforms) {

.rect();

EXPECT_RECT_EQ(expected, result);

- result = geometryMapper->sourceToDestinationRect(input, transform1.get(),

- transform2.get());

+ result = input;

+ geometryMapper->sourceToDestinationRect(transform1.get(), transform2.get(),

+ result);

EXPECT_RECT_EQ(expected, result);

}

@@ -707,8 +712,9 @@ TEST_F(GeometryMapperTest, SiblingTransformsWithClip) {

EXPECT_FALSE(success);

// sourceToDestinationRect applies transforms only.

- result = geometryMapper->sourceToDestinationRect(input, transform1.get(),

- transform2.get());

+ result = input;

+ geometryMapper->sourceToDestinationRect(transform1.get(), transform2.get(),

+ result);

EXPECT_RECT_EQ(expected, result);

// Test map from transform2AndClipState to transform1State.

@@ -726,8 +732,9 @@ TEST_F(GeometryMapperTest, SiblingTransformsWithClip) {

EXPECT_RECT_EQ(expectedClipped, result);

// sourceToDestinationRect applies transforms only.

- result = geometryMapper->sourceToDestinationRect(input, transform2.get(),

- transform1.get());

+ result = input;

+ geometryMapper->sourceToDestinationRect(transform2.get(), transform1.get(),

+ result);

EXPECT_RECT_EQ(expectedUnclipped, result);

}