Fix the linear-rgb canvas color space so that it renders

third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridgeTest.cpp

Index: third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridgeTest.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridgeTest.cpp b/third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridgeTest.cpp
index 4b2c16dfd4655b694633b5d875491db8b803c517..d3a1fcab542cac1818ec500326758058346fcb71 100644
--- a/third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridgeTest.cpp
+++ b/third_party/WebKit/Source/platform/graphics/Canvas2DLayerBridgeTest.cpp
@@ -98,8 +98,9 @@ class Canvas2DLayerBridgeTest : public Test {
       std::unique_ptr<FakeWebGraphicsContext3DProvider> provider,
       const IntSize& size,
       Canvas2DLayerBridge::AccelerationMode accelerationMode) {
-    RefPtr<Canvas2DLayerBridge> bridge = adoptRef(new Canvas2DLayerBridge(
-        std::move(provider), size, 0, NonOpaque, accelerationMode, nullptr));
+    RefPtr<Canvas2DLayerBridge> bridge = adoptRef(
+        new Canvas2DLayerBridge(std::move(provider), size, 0, NonOpaque,
+                                accelerationMode, nullptr, kN32_SkColorType));
     bridge->dontUseIdleSchedulingForTesting();
     return bridge.release();
   }
@@ -112,7 +113,7 @@ class Canvas2DLayerBridgeTest : public Test {
 
     Canvas2DLayerBridgePtr bridge(adoptRef(new Canvas2DLayerBridge(
         std::move(contextProvider), IntSize(300, 150), 0, NonOpaque,
-        Canvas2DLayerBridge::DisableAcceleration, nullptr)));
+        Canvas2DLayerBridge::DisableAcceleration, nullptr, kN32_SkColorType)));
 
     const GrGLTextureInfo* textureInfo = skia::GrBackendObjectToGrGLTextureInfo(
         bridge->newImageSnapshot(PreferAcceleration, SnapshotReasonUnitTests)
@@ -129,7 +130,7 @@ class Canvas2DLayerBridgeTest : public Test {
     gl.setIsContextLost(true);
     Canvas2DLayerBridgePtr bridge(adoptRef(new Canvas2DLayerBridge(
         std::move(contextProvider), IntSize(300, 150), 0, NonOpaque,
-        Canvas2DLayerBridge::EnableAcceleration, nullptr)));
+        Canvas2DLayerBridge::EnableAcceleration, nullptr, kN32_SkColorType)));
     EXPECT_TRUE(bridge->checkSurfaceValid());
     EXPECT_FALSE(bridge->isAccelerated());
   }
@@ -142,7 +143,7 @@ class Canvas2DLayerBridgeTest : public Test {
           wrapUnique(new FakeWebGraphicsContext3DProvider(&gl));
       Canvas2DLayerBridgePtr bridge(adoptRef(new Canvas2DLayerBridge(
           std::move(contextProvider), IntSize(300, 150), 0, NonOpaque,
-          Canvas2DLayerBridge::EnableAcceleration, nullptr)));
+          Canvas2DLayerBridge::EnableAcceleration, nullptr, kN32_SkColorType)));
       EXPECT_TRUE(bridge->checkSurfaceValid());
       EXPECT_TRUE(bridge->isAccelerated());
       sk_sp<SkImage> snapshot =
@@ -159,7 +160,7 @@ class Canvas2DLayerBridgeTest : public Test {
       GrContext* gr = contextProvider->grContext();
       Canvas2DLayerBridgePtr bridge(adoptRef(new Canvas2DLayerBridge(
           std::move(contextProvider), IntSize(300, 150), 0, NonOpaque,
-          Canvas2DLayerBridge::EnableAcceleration, nullptr)));
+          Canvas2DLayerBridge::EnableAcceleration, nullptr, kN32_SkColorType)));
       EXPECT_TRUE(bridge->checkSurfaceValid());
       EXPECT_TRUE(bridge->isAccelerated());  // We don't yet know that
                                              // allocation will fail.
@@ -180,7 +181,8 @@ class Canvas2DLayerBridgeTest : public Test {
 
     Canvas2DLayerBridgePtr bridge(adoptRef(new Canvas2DLayerBridge(
         std::move(contextProvider), IntSize(300, 150), 0, NonOpaque,
-        Canvas2DLayerBridge::ForceAccelerationForTesting, nullptr)));
+        Canvas2DLayerBridge::ForceAccelerationForTesting, nullptr,
+        kN32_SkColorType)));
     EXPECT_TRUE(bridge->checkSurfaceValid());
     SkPaint paint;
     uint32_t genID = bridge->getOrCreateSurface()->generationID();
@@ -205,7 +207,8 @@ class Canvas2DLayerBridgeTest : public Test {
         wrapUnique(new FakeWebGraphicsContext3DProvider(&gl));
     Canvas2DLayerBridgePtr bridge(adoptRef(new Canvas2DLayerBridge(
         std::move(contextProvider), IntSize(300, 150), 0, NonOpaque,
-        Canvas2DLayerBridge::ForceAccelerationForTesting, nullptr)));
+        Canvas2DLayerBridge::ForceAccelerationForTesting, nullptr,
+        kN32_SkColorType)));
 
     // TODO(junov): The PrepareTextureMailbox() method will fail a DCHECK if we
     // don't do this before calling it the first time when the context is lost.
@@ -230,7 +233,8 @@ class Canvas2DLayerBridgeTest : public Test {
           wrapUnique(new FakeWebGraphicsContext3DProvider(&gl));
       Canvas2DLayerBridgePtr bridge(adoptRef(new Canvas2DLayerBridge(
           std::move(contextProvider), IntSize(300, 150), 0, NonOpaque,
-          Canvas2DLayerBridge::ForceAccelerationForTesting, nullptr)));
+          Canvas2DLayerBridge::ForceAccelerationForTesting, nullptr,
+          kN32_SkColorType)));
 
       cc::TextureMailbox textureMailbox;
       std::unique_ptr<cc::SingleReleaseCallback> releaseCallback;
@@ -253,7 +257,8 @@ class Canvas2DLayerBridgeTest : public Test {
       {
         Canvas2DLayerBridgePtr bridge(adoptRef(new Canvas2DLayerBridge(
             std::move(contextProvider), IntSize(300, 150), 0, NonOpaque,
-            Canvas2DLayerBridge::ForceAccelerationForTesting, nullptr)));
+            Canvas2DLayerBridge::ForceAccelerationForTesting, nullptr,
+            kN32_SkColorType)));
         bridge->PrepareTextureMailbox(&textureMailbox, &releaseCallback);
         // |bridge| goes out of scope and would normally be destroyed, but
         // object is kept alive by self references.
@@ -275,7 +280,7 @@ class Canvas2DLayerBridgeTest : public Test {
           wrapUnique(new FakeWebGraphicsContext3DProvider(&gl));
       Canvas2DLayerBridgePtr bridge(adoptRef(new Canvas2DLayerBridge(
           std::move(contextProvider), IntSize(300, 300), 0, NonOpaque,
-          Canvas2DLayerBridge::EnableAcceleration, nullptr)));
+          Canvas2DLayerBridge::EnableAcceleration, nullptr, kN32_SkColorType)));
       SkPaint paint;
       bridge->canvas()->drawRect(SkRect::MakeXYWH(0, 0, 1, 1), paint);
       sk_sp<SkImage> image =
@@ -290,7 +295,7 @@ class Canvas2DLayerBridgeTest : public Test {
           wrapUnique(new FakeWebGraphicsContext3DProvider(&gl));
       Canvas2DLayerBridgePtr bridge(adoptRef(new Canvas2DLayerBridge(
           std::move(contextProvider), IntSize(300, 300), 0, NonOpaque,
-          Canvas2DLayerBridge::EnableAcceleration, nullptr)));
+          Canvas2DLayerBridge::EnableAcceleration, nullptr, kN32_SkColorType)));
       SkPaint paint;
       bridge->canvas()->drawRect(SkRect::MakeXYWH(0, 0, 1, 1), paint);
       sk_sp<SkImage> image = bridge->newImageSnapshot(PreferNoAcceleration,