Plumb color space to DecodingImageGenerator and ImageFrameGenerator

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

 /*
  * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
  * Copyright (C) 2008, 2009 Google, Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 90 matching lines @@
   m_bitmap.swap(other->m_bitmap);
   other->m_status = FrameEmpty;
   return true;
 }
 
 bool ImageFrame::setSizeAndColorSpace(int newWidth,
                                       int newHeight,
                                       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(
       newWidth, newHeight,
       m_premultiplyAlpha ? kPremul_SkAlphaType : kUnpremul_SkAlphaType,
       std::move(colorSpace)));
   if (!m_bitmap.tryAllocPixels(m_allocator, 0))
     return false;
 
   zeroFillPixelData();
@@ skipping 42 matching lines @@
   // If the frame is not fully loaded, there will be transparent pixels,
   // so we can't tell skia we're opaque, even for image types that logically
   // always are (e.g. jpeg).
   if (!m_hasAlpha && m_status == FrameComplete)
     return kOpaque_SkAlphaType;
 
   return m_premultiplyAlpha ? kPremul_SkAlphaType : kUnpremul_SkAlphaType;
 }
 
 }  // namespace blink