Plumb color space to DecodingImageGenerator and ImageFrameGenerator

third_party/WebKit/Source/platform/image-decoders/ImageFrame.cpp

Index: third_party/WebKit/Source/platform/image-decoders/ImageFrame.cpp
diff --git a/third_party/WebKit/Source/platform/image-decoders/ImageFrame.cpp b/third_party/WebKit/Source/platform/image-decoders/ImageFrame.cpp
index 9d0791f64778280dbc797795ed0a02a0bf8a3686..3f549418ce852fb93220a7c3c9847fd3a440ac57 100644
--- a/third_party/WebKit/Source/platform/image-decoders/ImageFrame.cpp
+++ b/third_party/WebKit/Source/platform/image-decoders/ImageFrame.cpp
@@ -108,13 +108,14 @@ bool ImageFrame::setSizeAndColorSpace(int newWidth,
                                       sk_sp<SkColorSpace> colorSpace) {
   // setSizeAndColorProfile() should only be called once, it leaks memory
   // otherwise.
-  ASSERT(!width() && !height());
+  DCHECK(!width() && !height());
 
+  // The image must specify a color space.
   if (RuntimeEnabledFeatures::colorCorrectRenderingEnabled()) {
-    if (!colorSpace)
-      colorSpace = SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named);
+    DCHECK(colorSpace);
+    m_colorSpace = colorSpace;

[Justin Novosad, 2016/10/31 14:55:13]

std::move

[ccameron, 2016/10/31 18:10:18]

Done.

I also added a comment clarifying the plan to always require that |colorSpace|
be non-null.

   } else {
-    colorSpace = nullptr;
+    DCHECK(!colorSpace);
   }
 
   m_bitmap.setInfo(SkImageInfo::MakeN32(