Index: third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DTest.cpp |
diff --git a/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DTest.cpp b/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DTest.cpp |
index 2f1c1f43d1177ef4b0785019800da4d870c3113e..446bed3e3be26711774ec46a4b49d646eb421b06 100644 |
--- a/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DTest.cpp |
+++ b/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DTest.cpp |
@@ -518,8 +518,8 @@ TEST_F(CanvasRenderingContext2DTest, detectOverdrawWithCompositeOperations) { |
TEST_F(CanvasRenderingContext2DTest, NoLayerPromotionByDefault) { |
CreateContext(kNonOpaque); |
- std::unique_ptr<RecordingImageBufferSurface> surface = |
- WTF::MakeUnique<RecordingImageBufferSurface>(IntSize(10, 10), kNonOpaque); |
+ auto surface = WTF::MakeUnique<RecordingImageBufferSurface>( |
+ IntSize(10, 10), RecordingImageBufferSurface::kAllowFallback, kNonOpaque); |
auto* surface_ptr = surface.get(); |
CanvasElement().CreateImageBufferUsingSurfaceForTesting(std::move(surface)); |
@@ -529,8 +529,8 @@ TEST_F(CanvasRenderingContext2DTest, NoLayerPromotionByDefault) { |
TEST_F(CanvasRenderingContext2DTest, NoLayerPromotionUnderOverdrawLimit) { |
CreateContext(kNonOpaque); |
- std::unique_ptr<RecordingImageBufferSurface> surface = |
- WTF::MakeUnique<RecordingImageBufferSurface>(IntSize(10, 10), kNonOpaque); |
+ auto surface = WTF::MakeUnique<RecordingImageBufferSurface>( |
+ IntSize(10, 10), RecordingImageBufferSurface::kAllowFallback, kNonOpaque); |
auto* surface_ptr = surface.get(); |
CanvasElement().CreateImageBufferUsingSurfaceForTesting(std::move(surface)); |
@@ -547,8 +547,8 @@ TEST_F(CanvasRenderingContext2DTest, NoLayerPromotionUnderOverdrawLimit) { |
TEST_F(CanvasRenderingContext2DTest, LayerPromotionOverOverdrawLimit) { |
CreateContext(kNonOpaque); |
- std::unique_ptr<RecordingImageBufferSurface> surface = |
- WTF::MakeUnique<RecordingImageBufferSurface>(IntSize(10, 10), kNonOpaque); |
+ auto surface = WTF::MakeUnique<RecordingImageBufferSurface>( |
+ IntSize(10, 10), RecordingImageBufferSurface::kAllowFallback, kNonOpaque); |
auto* surface_ptr = surface.get(); |
CanvasElement().CreateImageBufferUsingSurfaceForTesting(std::move(surface)); |
@@ -565,8 +565,8 @@ TEST_F(CanvasRenderingContext2DTest, LayerPromotionOverOverdrawLimit) { |
TEST_F(CanvasRenderingContext2DTest, NoLayerPromotionUnderImageSizeRatioLimit) { |
CreateContext(kNonOpaque); |
- std::unique_ptr<RecordingImageBufferSurface> surface = |
- WTF::MakeUnique<RecordingImageBufferSurface>(IntSize(10, 10), kNonOpaque); |
+ auto surface = WTF::MakeUnique<RecordingImageBufferSurface>( |
+ IntSize(10, 10), RecordingImageBufferSurface::kAllowFallback, kNonOpaque); |
auto* surface_ptr = surface.get(); |
CanvasElement().CreateImageBufferUsingSurfaceForTesting(std::move(surface)); |
@@ -599,8 +599,8 @@ TEST_F(CanvasRenderingContext2DTest, NoLayerPromotionUnderImageSizeRatioLimit) { |
TEST_F(CanvasRenderingContext2DTest, LayerPromotionOverImageSizeRatioLimit) { |
CreateContext(kNonOpaque); |
- std::unique_ptr<RecordingImageBufferSurface> surface = |
- WTF::MakeUnique<RecordingImageBufferSurface>(IntSize(10, 10), kNonOpaque); |
+ auto surface = WTF::MakeUnique<RecordingImageBufferSurface>( |
+ IntSize(10, 10), RecordingImageBufferSurface::kAllowFallback, kNonOpaque); |
auto* surface_ptr = surface.get(); |
CanvasElement().CreateImageBufferUsingSurfaceForTesting(std::move(surface)); |
@@ -635,8 +635,8 @@ TEST_F(CanvasRenderingContext2DTest, LayerPromotionOverImageSizeRatioLimit) { |
TEST_F(CanvasRenderingContext2DTest, |
NoLayerPromotionUnderExpensivePathPointCount) { |
CreateContext(kNonOpaque); |
- std::unique_ptr<RecordingImageBufferSurface> surface = |
- WTF::MakeUnique<RecordingImageBufferSurface>(IntSize(10, 10), kNonOpaque); |
+ auto surface = WTF::MakeUnique<RecordingImageBufferSurface>( |
+ IntSize(10, 10), RecordingImageBufferSurface::kAllowFallback, kNonOpaque); |
auto* surface_ptr = surface.get(); |
CanvasElement().CreateImageBufferUsingSurfaceForTesting(std::move(surface)); |
@@ -659,8 +659,8 @@ TEST_F(CanvasRenderingContext2DTest, |
TEST_F(CanvasRenderingContext2DTest, |
LayerPromotionOverExpensivePathPointCount) { |
CreateContext(kNonOpaque); |
- std::unique_ptr<RecordingImageBufferSurface> surface = |
- WTF::MakeUnique<RecordingImageBufferSurface>(IntSize(10, 10), kNonOpaque); |
+ auto surface = WTF::MakeUnique<RecordingImageBufferSurface>( |
+ IntSize(10, 10), RecordingImageBufferSurface::kAllowFallback, kNonOpaque); |
auto* surface_ptr = surface.get(); |
CanvasElement().CreateImageBufferUsingSurfaceForTesting(std::move(surface)); |
@@ -682,8 +682,8 @@ TEST_F(CanvasRenderingContext2DTest, |
TEST_F(CanvasRenderingContext2DTest, LayerPromotionWhenPathIsConcave) { |
CreateContext(kNonOpaque); |
- std::unique_ptr<RecordingImageBufferSurface> surface = |
- WTF::MakeUnique<RecordingImageBufferSurface>(IntSize(10, 10), kNonOpaque); |
+ auto surface = WTF::MakeUnique<RecordingImageBufferSurface>( |
+ IntSize(10, 10), RecordingImageBufferSurface::kAllowFallback, kNonOpaque); |
auto* surface_ptr = surface.get(); |
CanvasElement().CreateImageBufferUsingSurfaceForTesting(std::move(surface)); |
@@ -704,8 +704,8 @@ TEST_F(CanvasRenderingContext2DTest, LayerPromotionWhenPathIsConcave) { |
TEST_F(CanvasRenderingContext2DTest, NoLayerPromotionWithRectangleClip) { |
CreateContext(kNonOpaque); |
- std::unique_ptr<RecordingImageBufferSurface> surface = |
- WTF::MakeUnique<RecordingImageBufferSurface>(IntSize(10, 10), kNonOpaque); |
+ auto surface = WTF::MakeUnique<RecordingImageBufferSurface>( |
+ IntSize(10, 10), RecordingImageBufferSurface::kAllowFallback, kNonOpaque); |
auto* surface_ptr = surface.get(); |
CanvasElement().CreateImageBufferUsingSurfaceForTesting(std::move(surface)); |
@@ -720,8 +720,8 @@ TEST_F(CanvasRenderingContext2DTest, NoLayerPromotionWithRectangleClip) { |
TEST_F(CanvasRenderingContext2DTest, LayerPromotionWithComplexClip) { |
CreateContext(kNonOpaque); |
- std::unique_ptr<RecordingImageBufferSurface> surface = |
- WTF::MakeUnique<RecordingImageBufferSurface>(IntSize(10, 10), kNonOpaque); |
+ auto surface = WTF::MakeUnique<RecordingImageBufferSurface>( |
+ IntSize(10, 10), RecordingImageBufferSurface::kAllowFallback, kNonOpaque); |
auto* surface_ptr = surface.get(); |
CanvasElement().CreateImageBufferUsingSurfaceForTesting(std::move(surface)); |
@@ -743,8 +743,8 @@ TEST_F(CanvasRenderingContext2DTest, LayerPromotionWithComplexClip) { |
TEST_F(CanvasRenderingContext2DTest, LayerPromotionWithBlurredShadow) { |
CreateContext(kNonOpaque); |
- std::unique_ptr<RecordingImageBufferSurface> surface = |
- WTF::MakeUnique<RecordingImageBufferSurface>(IntSize(10, 10), kNonOpaque); |
+ auto surface = WTF::MakeUnique<RecordingImageBufferSurface>( |
+ IntSize(10, 10), RecordingImageBufferSurface::kAllowFallback, kNonOpaque); |
auto* surface_ptr = surface.get(); |
CanvasElement().CreateImageBufferUsingSurfaceForTesting(std::move(surface)); |
@@ -762,8 +762,8 @@ TEST_F(CanvasRenderingContext2DTest, LayerPromotionWithBlurredShadow) { |
TEST_F(CanvasRenderingContext2DTest, NoLayerPromotionWithSharpShadow) { |
CreateContext(kNonOpaque); |
- std::unique_ptr<RecordingImageBufferSurface> surface = |
- WTF::MakeUnique<RecordingImageBufferSurface>(IntSize(10, 10), kNonOpaque); |
+ auto surface = WTF::MakeUnique<RecordingImageBufferSurface>( |
+ IntSize(10, 10), RecordingImageBufferSurface::kAllowFallback, kNonOpaque); |
auto* surface_ptr = surface.get(); |
CanvasElement().CreateImageBufferUsingSurfaceForTesting(std::move(surface)); |
@@ -777,8 +777,8 @@ TEST_F(CanvasRenderingContext2DTest, NoLayerPromotionWithSharpShadow) { |
TEST_F(CanvasRenderingContext2DTest, NoFallbackWithSmallState) { |
CreateContext(kNonOpaque); |
- std::unique_ptr<RecordingImageBufferSurface> surface = |
- WTF::MakeUnique<RecordingImageBufferSurface>(IntSize(10, 10), kNonOpaque); |
+ auto surface = WTF::MakeUnique<RecordingImageBufferSurface>( |
+ IntSize(10, 10), RecordingImageBufferSurface::kAllowFallback, kNonOpaque); |
auto* surface_ptr = surface.get(); |
CanvasElement().CreateImageBufferUsingSurfaceForTesting(std::move(surface)); |
@@ -797,8 +797,8 @@ TEST_F(CanvasRenderingContext2DTest, NoFallbackWithSmallState) { |
TEST_F(CanvasRenderingContext2DTest, FallbackWithLargeState) { |
CreateContext(kNonOpaque); |
- std::unique_ptr<RecordingImageBufferSurface> surface = |
- WTF::MakeUnique<RecordingImageBufferSurface>(IntSize(10, 10), kNonOpaque); |
+ auto surface = WTF::MakeUnique<RecordingImageBufferSurface>( |
+ IntSize(10, 10), RecordingImageBufferSurface::kAllowFallback, kNonOpaque); |
auto* surface_ptr = surface.get(); |
CanvasElement().CreateImageBufferUsingSurfaceForTesting(std::move(surface)); |
@@ -821,8 +821,8 @@ TEST_F(CanvasRenderingContext2DTest, OpaqueDisplayListFallsBackForText) { |
// does not support pixel geometry settings. |
// See: crbug.com/583809 |
CreateContext(kOpaque); |
- auto surface = |
- WTF::MakeUnique<RecordingImageBufferSurface>(IntSize(10, 10), kOpaque); |
+ auto surface = WTF::MakeUnique<RecordingImageBufferSurface>( |
+ IntSize(10, 10), RecordingImageBufferSurface::kAllowFallback, kOpaque); |
auto* surface_ptr = surface.get(); |
CanvasElement().CreateImageBufferUsingSurfaceForTesting(std::move(surface)); |
@@ -834,8 +834,8 @@ TEST_F(CanvasRenderingContext2DTest, OpaqueDisplayListFallsBackForText) { |
TEST_F(CanvasRenderingContext2DTest, |
NonOpaqueDisplayListDoesNotFallBackForText) { |
CreateContext(kNonOpaque); |
- std::unique_ptr<RecordingImageBufferSurface> surface = |
- WTF::MakeUnique<RecordingImageBufferSurface>(IntSize(10, 10), kNonOpaque); |
+ auto surface = WTF::MakeUnique<RecordingImageBufferSurface>( |
+ IntSize(10, 10), RecordingImageBufferSurface::kAllowFallback, kNonOpaque); |
auto* surface_ptr = surface.get(); |
CanvasElement().CreateImageBufferUsingSurfaceForTesting(std::move(surface)); |