Chromium Code Reviews| 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 fdaa4b3c18d1683b8077f62a7d714680af2ac868..e6e949b4ef2645c21d032036e28c8d60660e4a71 100644 |
| --- a/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DTest.cpp |
| +++ b/third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DTest.cpp |
| @@ -119,7 +119,9 @@ class CanvasRenderingContext2DTest : public ::testing::Test { |
| return canvasElement().buffer()->getGPUMemoryUsage(); |
| } |
| - void createContext(OpacityMode, String colorSpace = String()); |
| + void createContext(OpacityMode, |
| + String colorSpace = String(), |
| + bool useF16 = false); |
|
Justin Novosad
2017/02/23 18:48:13
Better to use an enum than a bool for this. Makes
zakerinasab
2017/02/23 20:22:33
Done.
|
| ScriptState* getScriptState() { |
| return ScriptState::forMainWorld(m_canvasElement->frame()); |
| } |
| @@ -175,12 +177,18 @@ CanvasRenderingContext2DTest::CanvasRenderingContext2DTest() |
| m_alphaBitmap(IntSize(10, 10), TransparentBitmap) {} |
| void CanvasRenderingContext2DTest::createContext(OpacityMode opacityMode, |
| - String colorSpace) { |
| + String colorSpace, |
| + bool useF16) { |
| String canvasType("2d"); |
| CanvasContextCreationAttributes attributes; |
| attributes.setAlpha(opacityMode == NonOpaque); |
| - if (!colorSpace.isEmpty()) |
| + if (!colorSpace.isEmpty()) { |
| attributes.setColorSpace(colorSpace); |
| + if (useF16) { |
| + attributes.setPixelFormat("float16"); |
| + attributes.setLinearPixelMath(true); |
| + } |
| + } |
| m_canvasElement->getCanvasRenderingContext(canvasType, attributes); |
| } |
| @@ -1225,7 +1233,7 @@ TEST_F(CanvasRenderingContext2DTest, |
| ColorBehavior::globalTargetColorSpace(); |
| ColorBehavior::setGlobalTargetColorSpaceForTesting(AdobeRGBColorSpace()); |
| - createContext(NonOpaque, "linear-rgb"); |
| + createContext(NonOpaque, "srgb", true); |
| ColorBehavior behavior = context2d()->drawImageColorBehavior(); |
| EXPECT_TRUE(behavior.isTransformToTargetColorSpace()); |
| EXPECT_TRUE(gfx::ColorSpace::CreateSCRGBLinear() == |