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 528b271dcd5fc93ceee3a4f9d350201273be610b..b40367d53c2d561d5836cb99277a1fde42133f7d 100644 |
--- a/third_party/WebKit/Source/platform/graphics/paint/GeometryMapperTest.cpp |
+++ b/third_party/WebKit/Source/platform/graphics/paint/GeometryMapperTest.cpp |
@@ -196,9 +196,10 @@ 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())); |
+ EXPECT_RECT_EQ( |
+ input, |
+ geometryMapper->ancestorToLocalRect( |
+ output, rootPropertyTreeState().transform(), localState.transform())); |
} |
TEST_F(GeometryMapperTest, RotationAndScaleTransform) { |
@@ -296,9 +297,10 @@ TEST_F(GeometryMapperTest, NestedTransformsScaleAndTranslation) { |
rootPropertyTreeState(), hasRadius); |
// Check the cached matrix for the intermediate transform. |
- EXPECT_EQ(scaleTransform, getTransformCache(rootPropertyTreeState()) |
+ EXPECT_EQ(scaleTransform, |
+ getTransformCache(rootPropertyTreeState()) |
- .get(transform1.get())); |
+ .get(transform1.get())); |
} |
TEST_F(GeometryMapperTest, NestedTransformsIntermediateDestination) { |
@@ -347,8 +349,7 @@ TEST_F(GeometryMapperTest, SimpleClip) { |
->matrix(), // Transform matrix to ancestor space |
FloatClipRect(clip->clipRect().rect()), // Clip rect in |
// ancestor space |
- localState, |
- rootPropertyTreeState(), hasRadius); |
+ localState, rootPropertyTreeState(), hasRadius); |
} |
TEST_F(GeometryMapperTest, RoundedClip) { |
@@ -374,8 +375,7 @@ TEST_F(GeometryMapperTest, RoundedClip) { |
TransformPaintPropertyNode::root() |
->matrix(), // Transform matrix to ancestor space |
expectedClip, // Clip rect in ancestor space |
- localState, |
- rootPropertyTreeState(), hasRadius); |
+ localState, rootPropertyTreeState(), hasRadius); |
} |
TEST_F(GeometryMapperTest, TwoClips) { |
@@ -409,8 +409,7 @@ TEST_F(GeometryMapperTest, TwoClips) { |
TransformPaintPropertyNode::root() |
->matrix(), // Transform matrix to ancestor space |
clipRect, // Clip rect in ancestor space |
- localState, |
- ancestorState, hasRadius); |
+ localState, ancestorState, hasRadius); |
ancestorState.setClip(clip1.get()); |
FloatRect output2(10, 10, 50, 50); |
@@ -424,8 +423,7 @@ TEST_F(GeometryMapperTest, TwoClips) { |
TransformPaintPropertyNode::root() |
->matrix(), // Transform matrix to ancestor space |
clipRect, // Clip rect in ancestor space |
- localState, |
- ancestorState, hasRadius); |
+ localState, ancestorState, hasRadius); |
} |
TEST_F(GeometryMapperTest, TwoClipsTransformAbove) { |
@@ -462,8 +460,7 @@ TEST_F(GeometryMapperTest, TwoClipsTransformAbove) { |
TransformPaintPropertyNode::root() |
->matrix(), // Transform matrix to ancestor space |
expectedClip, // Clip rect in ancestor space |
- localState, |
- ancestorState, hasRadius); |
+ localState, ancestorState, hasRadius); |
expectedClip.setRect(clip1->clipRect().rect()); |
localState.setClip(clip1.get()); |
@@ -474,8 +471,7 @@ TEST_F(GeometryMapperTest, TwoClipsTransformAbove) { |
TransformPaintPropertyNode::root() |
->matrix(), // Transform matrix to ancestor space |
expectedClip, // Clip rect in ancestor space |
- localState, |
- ancestorState, hasRadius); |
+ localState, ancestorState, hasRadius); |
} |
TEST_F(GeometryMapperTest, ClipBeforeTransform) { |
@@ -506,8 +502,7 @@ TEST_F(GeometryMapperTest, ClipBeforeTransform) { |
rotateTransform, // Transform matrix to ancestor space |
FloatClipRect(rotateTransform.mapRect( |
clip->clipRect().rect())), // Clip rect in ancestor space |
- localState, |
- rootPropertyTreeState(), hasRadius); |
+ localState, rootPropertyTreeState(), hasRadius); |
} |
TEST_F(GeometryMapperTest, ClipAfterTransform) { |