Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(28)

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2329463004: ABANDONED CL: Changes needed to make things compile after running rewrite_to_chrome_style tool. (Closed)
Patch Set: Rebasing the fixes... Created 3 years, 10 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/platform/graphics/paint/GeometryMapper.cpp ('k') | third_party/WebKit/Source/platform/graphics/paint/Transform3DDisplayItem.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 0630a5fdf88cab9b58cb304a12b4e6d913e1efc0..4926d3217986b1cf34ec4841329dbbee34634d77 100644
--- a/third_party/WebKit/Source/platform/graphics/paint/GeometryMapperTest.cpp
+++ b/third_party/WebKit/Source/platform/graphics/paint/GeometryMapperTest.cpp
@@ -110,19 +110,19 @@ const static float kTestEpsilon = 1e-6;
#define CHECK_MAPPINGS(inputRect, expectedVisualRect, expectedTransformedRect, \
expectedTransformToAncestor, \
expectedClipInAncestorSpace, localPropertyTreeState, \
- ancestorPropertyTreeState, hasRadius) \
+ ancestorPropertyTreeState) \
do { \
FloatClipRect clipRect = geometryMapper->localToAncestorVisualRect( \
inputRect, localPropertyTreeState, ancestorPropertyTreeState); \
- EXPECT_EQ(hasRadius, clipRect.hasRadius()); \
+ EXPECT_EQ(has_radius, clipRect.HasRadius()); \
EXPECT_RECT_EQ(expectedVisualRect, clipRect.rect()); \
clipRect = geometryMapper->localToAncestorClipRect( \
localPropertyTreeState, ancestorPropertyTreeState); \
- EXPECT_EQ(hasRadius, clipRect.hasRadius()); \
+ EXPECT_EQ(has_radius, clipRect.HasRadius()); \
EXPECT_RECT_EQ(expectedClipInAncestorSpace, clipRect.rect()); \
clipRect = geometryMapper->sourceToDestinationVisualRect( \
inputRect, localPropertyTreeState, ancestorPropertyTreeState); \
- EXPECT_EQ(hasRadius, clipRect.hasRadius()); \
+ EXPECT_EQ(has_radius, clipRect.HasRadius()); \
EXPECT_RECT_EQ(expectedVisualRect, clipRect.rect()); \
EXPECT_RECT_EQ(expectedTransformedRect, \
geometryMapper->localToAncestorRect( \
@@ -153,7 +153,7 @@ TEST_F(GeometryMapperTest, Root) {
CHECK_MAPPINGS(input, input, input,
TransformPaintPropertyNode::root()->matrix(),
ClipPaintPropertyNode::root()->clipRect().rect(),
- rootPropertyTreeState(), rootPropertyTreeState(), hasRadius);
+ rootPropertyTreeState(), rootPropertyTreeState());
}
TEST_F(GeometryMapperTest, IdentityTransform) {
@@ -169,7 +169,7 @@ TEST_F(GeometryMapperTest, IdentityTransform) {
bool hasRadius = false;
CHECK_MAPPINGS(input, input, input, transform->matrix(),
ClipPaintPropertyNode::root()->clipRect().rect(), localState,
- rootPropertyTreeState(), hasRadius);
+ rootPropertyTreeState());
}
TEST_F(GeometryMapperTest, TranslationTransform) {
@@ -187,7 +187,7 @@ TEST_F(GeometryMapperTest, TranslationTransform) {
bool hasRadius = false;
CHECK_MAPPINGS(input, output, output, transform->matrix(),
ClipPaintPropertyNode::root()->clipRect().rect(), localState,
- rootPropertyTreeState(), hasRadius);
+ rootPropertyTreeState());
EXPECT_RECT_EQ(input, geometryMapper->ancestorToLocalRect(
output, rootPropertyTreeState().transform(),
@@ -211,7 +211,7 @@ TEST_F(GeometryMapperTest, RotationAndScaleTransform) {
bool hasRadius = false;
CHECK_MAPPINGS(input, output, output, transformMatrix,
ClipPaintPropertyNode::root()->clipRect().rect(), localState,
- rootPropertyTreeState(), hasRadius);
+ rootPropertyTreeState());
}
TEST_F(GeometryMapperTest, RotationAndScaleTransformWithTransformOrigin) {
@@ -232,7 +232,7 @@ TEST_F(GeometryMapperTest, RotationAndScaleTransformWithTransformOrigin) {
bool hasRadius = false;
CHECK_MAPPINGS(input, output, output, transformMatrix,
ClipPaintPropertyNode::root()->clipRect().rect(), localState,
- rootPropertyTreeState(), hasRadius);
+ rootPropertyTreeState());
}
TEST_F(GeometryMapperTest, NestedTransforms) {
@@ -258,7 +258,7 @@ TEST_F(GeometryMapperTest, NestedTransforms) {
bool hasRadius = false;
CHECK_MAPPINGS(input, output, output, final,
ClipPaintPropertyNode::root()->clipRect().rect(), localState,
- rootPropertyTreeState(), hasRadius);
+ rootPropertyTreeState());
// Check the cached matrix for the intermediate transform.
EXPECT_EQ(rotateTransform,
@@ -290,7 +290,7 @@ TEST_F(GeometryMapperTest, NestedTransformsScaleAndTranslation) {
bool hasRadius = false;
CHECK_MAPPINGS(input, output, output, final,
ClipPaintPropertyNode::root()->clipRect().rect(), localState,
- rootPropertyTreeState(), hasRadius);
+ rootPropertyTreeState());
// Check the cached matrix for the intermediate transform.
EXPECT_EQ(scaleTransform, getTransformCache(rootPropertyTreeState())
@@ -323,7 +323,7 @@ TEST_F(GeometryMapperTest, NestedTransformsIntermediateDestination) {
bool hasRadius = false;
CHECK_MAPPINGS(input, output, output, scaleTransform,
ClipPaintPropertyNode::root()->clipRect().rect(), localState,
- intermediateState, hasRadius);
+ intermediateState);
}
TEST_F(GeometryMapperTest, SimpleClip) {
@@ -345,7 +345,7 @@ TEST_F(GeometryMapperTest, SimpleClip) {
->matrix(), // Transform matrix to ancestor space
clip->clipRect().rect(), // Clip rect in ancestor space
localState,
- rootPropertyTreeState(), hasRadius);
+ rootPropertyTreeState());
}
TEST_F(GeometryMapperTest, RoundedClip) {
@@ -369,7 +369,7 @@ TEST_F(GeometryMapperTest, RoundedClip) {
->matrix(), // Transform matrix to ancestor space
clip->clipRect().rect(), // Clip rect in ancestor space
localState,
- rootPropertyTreeState(), hasRadius);
+ rootPropertyTreeState());
}
TEST_F(GeometryMapperTest, TwoClips) {
@@ -401,7 +401,7 @@ TEST_F(GeometryMapperTest, TwoClips) {
->matrix(), // Transform matrix to ancestor space
clip1->clipRect().rect(), // Clip rect in ancestor space
localState,
- ancestorState, hasRadius);
+ ancestorState);
ancestorState.setClip(clip1.get());
FloatRect output2(10, 10, 50, 50);
@@ -414,7 +414,7 @@ TEST_F(GeometryMapperTest, TwoClips) {
->matrix(), // Transform matrix to ancestor space
clip2->clipRect().rect(), // Clip rect in ancestor space
localState,
- ancestorState, hasRadius);
+ ancestorState);
}
TEST_F(GeometryMapperTest, ClipBeforeTransform) {
@@ -446,7 +446,7 @@ TEST_F(GeometryMapperTest, ClipBeforeTransform) {
rotateTransform.mapRect(
clip->clipRect().rect()), // Clip rect in ancestor space
localState,
- rootPropertyTreeState(), hasRadius);
+ rootPropertyTreeState());
}
TEST_F(GeometryMapperTest, ClipAfterTransform) {
@@ -476,7 +476,7 @@ TEST_F(GeometryMapperTest, ClipAfterTransform) {
rotateTransform.mapRect(input), // Transformed rect (not clipped)
rotateTransform, // Transform matrix to ancestor space
clip->clipRect().rect(), // Clip rect in ancestor space
- localState, rootPropertyTreeState(), hasRadius);
+ localState, rootPropertyTreeState());
}
TEST_F(GeometryMapperTest, TwoClipsWithTransformBetween) {
@@ -511,7 +511,7 @@ TEST_F(GeometryMapperTest, TwoClipsWithTransformBetween) {
rotateTransform.mapRect(input), // Transformed rect (not clipped)
rotateTransform, // Transform matrix to ancestor space
clip1->clipRect().rect(), // Clip rect in ancestor space
- localState, rootPropertyTreeState(), hasRadius);
+ localState, rootPropertyTreeState());
}
{
@@ -537,7 +537,7 @@ TEST_F(GeometryMapperTest, TwoClipsWithTransformBetween) {
rotateTransform.mapRect(input), // Transformed rect (not clipped)
rotateTransform, // Transform matrix to ancestor space
mappedClip, // Clip rect in ancestor space
- localState, rootPropertyTreeState(), hasRadius);
+ localState, rootPropertyTreeState());
}
}
@@ -749,8 +749,7 @@ TEST_F(GeometryMapperTest, FilterWithClipsAndTransforms) {
CHECK_MAPPINGS(
input, output, FloatRect(0, 0, 300, 300),
transformAboveEffect->matrix() * transformBelowEffect->matrix(),
- FloatRect(30, 30, 270, 270), localState, rootPropertyTreeState(),
- hasRadius);
+ FloatRect(30, 30, 270, 270), localState, rootPropertyTreeState());
}
TEST_F(GeometryMapperTest, ReflectionWithPaintOffset) {
@@ -772,7 +771,7 @@ TEST_F(GeometryMapperTest, ReflectionWithPaintOffset) {
bool hasRadius = false;
CHECK_MAPPINGS(input, output, input, TransformationMatrix(),
ClipPaintPropertyNode::root()->clipRect().rect(), localState,
- rootPropertyTreeState(), hasRadius);
+ rootPropertyTreeState());
}
} // namespace blink
« no previous file with comments | « third_party/WebKit/Source/platform/graphics/paint/GeometryMapper.cpp ('k') | third_party/WebKit/Source/platform/graphics/paint/Transform3DDisplayItem.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698