| Index: third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DUsageTrackingTest.cpp
|
| diff --git a/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DUsageTrackingTest.cpp b/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DUsageTrackingTest.cpp
|
| index f4abf4595bbf646b5a8541e18ff5267820003286..e5064591a99a4f2013bc94f238d1b0450a4e201e 100644
|
| --- a/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DUsageTrackingTest.cpp
|
| +++ b/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DUsageTrackingTest.cpp
|
| @@ -247,8 +247,9 @@ TEST_F(CanvasRenderingContextUsageTrackingTest, FillTracking) {
|
| StringOrCanvasGradientOrCanvasPattern::fromCanvasGradient(gradient));
|
| context2d()->fillRect(10, 10, 100, 20);
|
| EXPECT_EQ(1, context2d()->getUsage().numLinearGradients);
|
| - EXPECT_NEAR(100 * 20, context2d()->getUsage().boundingBoxAreaFillType
|
| - [BaseRenderingContext2D::LinearGradientFillType],
|
| + EXPECT_NEAR(100 * 20,
|
| + context2d()->getUsage().boundingBoxAreaFillType
|
| + [BaseRenderingContext2D::LinearGradientFillType],
|
| 1.0);
|
|
|
| NonThrowableExceptionState exceptionState;
|
| @@ -259,8 +260,9 @@ TEST_F(CanvasRenderingContextUsageTrackingTest, FillTracking) {
|
| context2d()->fillRect(10, 10, 100, 20);
|
| EXPECT_EQ(1, context2d()->getUsage().numLinearGradients);
|
| EXPECT_EQ(1, context2d()->getUsage().numRadialGradients);
|
| - EXPECT_NEAR(100 * 20, context2d()->getUsage().boundingBoxAreaFillType
|
| - [BaseRenderingContext2D::RadialGradientFillType],
|
| + EXPECT_NEAR(100 * 20,
|
| + context2d()->getUsage().boundingBoxAreaFillType
|
| + [BaseRenderingContext2D::RadialGradientFillType],
|
| 1.0);
|
|
|
| // create pattern
|
| @@ -292,12 +294,14 @@ TEST_F(CanvasRenderingContextUsageTrackingTest, FillTracking) {
|
| 0,
|
| context2d()->getUsage().numDrawCalls[BaseRenderingContext2D::StrokeText]);
|
| EXPECT_EQ(0, context2d()->getUsage().numPutImageDataCalls);
|
| - EXPECT_EQ(0, context2d()
|
| - ->getUsage()
|
| - .numDrawCalls[BaseRenderingContext2D::DrawVectorImage]);
|
| - EXPECT_EQ(0, context2d()
|
| - ->getUsage()
|
| - .numDrawCalls[BaseRenderingContext2D::DrawBitmapImage]);
|
| + EXPECT_EQ(0,
|
| + context2d()
|
| + ->getUsage()
|
| + .numDrawCalls[BaseRenderingContext2D::DrawVectorImage]);
|
| + EXPECT_EQ(0,
|
| + context2d()
|
| + ->getUsage()
|
| + .numDrawCalls[BaseRenderingContext2D::DrawBitmapImage]);
|
| EXPECT_EQ(0, context2d()->getUsage().numGetImageDataCalls);
|
| }
|
|
|
| @@ -362,8 +366,9 @@ TEST_F(CanvasRenderingContextUsageTrackingTest, StrokeTracking) {
|
| StringOrCanvasGradientOrCanvasPattern::fromCanvasGradient(gradient));
|
| context2d()->strokeRect(10, 10, 100, 100);
|
| EXPECT_EQ(1, context2d()->getUsage().numLinearGradients);
|
| - EXPECT_NEAR(100 * 100, context2d()->getUsage().boundingBoxAreaFillType
|
| - [BaseRenderingContext2D::LinearGradientFillType],
|
| + EXPECT_NEAR(100 * 100,
|
| + context2d()->getUsage().boundingBoxAreaFillType
|
| + [BaseRenderingContext2D::LinearGradientFillType],
|
| 1.0);
|
|
|
| // create pattern
|
| @@ -395,12 +400,14 @@ TEST_F(CanvasRenderingContextUsageTrackingTest, StrokeTracking) {
|
| 0,
|
| context2d()->getUsage().numDrawCalls[BaseRenderingContext2D::FillText]);
|
| EXPECT_EQ(0, context2d()->getUsage().numPutImageDataCalls);
|
| - EXPECT_EQ(0, context2d()
|
| - ->getUsage()
|
| - .numDrawCalls[BaseRenderingContext2D::DrawVectorImage]);
|
| - EXPECT_EQ(0, context2d()
|
| - ->getUsage()
|
| - .numDrawCalls[BaseRenderingContext2D::DrawBitmapImage]);
|
| + EXPECT_EQ(0,
|
| + context2d()
|
| + ->getUsage()
|
| + .numDrawCalls[BaseRenderingContext2D::DrawVectorImage]);
|
| + EXPECT_EQ(0,
|
| + context2d()
|
| + ->getUsage()
|
| + .numDrawCalls[BaseRenderingContext2D::DrawBitmapImage]);
|
| EXPECT_EQ(0, context2d()->getUsage().numGetImageDataCalls);
|
| }
|
|
|
| @@ -436,8 +443,9 @@ TEST_F(CanvasRenderingContextUsageTrackingTest, ImageTracking) {
|
| ->getUsage()
|
| .boundingBoxAreaDrawCalls[BaseRenderingContext2D::DrawVectorImage],
|
| 0.1);
|
| - EXPECT_NEAR(0.0, context2d()->getUsage().boundingBoxPerimeterDrawCalls
|
| - [BaseRenderingContext2D::DrawVectorImage],
|
| + EXPECT_NEAR(0.0,
|
| + context2d()->getUsage().boundingBoxPerimeterDrawCalls
|
| + [BaseRenderingContext2D::DrawVectorImage],
|
| 0.1);
|
|
|
| context2d()->setFilter("blur(5px)");
|
|
|