Refactor image decoders to use 'colorSpace' instead of 'colorProfile'

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

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * 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
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 162 matching lines @@
   }
 }
 
 bool DeferredImageDecoder::isSizeAvailable() {
   // m_actualDecoder is 0 only if image decoding is deferred and that means
   // the image header decoded successfully and the size is available.
   return m_actualDecoder ? m_actualDecoder->isSizeAvailable() : true;
 }
 
 bool DeferredImageDecoder::hasColorProfile() const {
-  return m_actualDecoder ? m_actualDecoder->hasColorProfile()
-                         : m_hasColorProfile;
+  return m_actualDecoder ? m_actualDecoder->hasColorSpace() : m_hasColorProfile;

[f(malita), 2016/10/27 15:57:28]

If we're renaming ImageDecoder::hasColorProfile -> hasColorSpace, would it make
sense to also rename DeferredImageDecoder::hasColorProfile?

[msarett, 2016/10/27 16:42:56]

Yeah I think so.  In general, it probably makes sense to push the profile->space
change outside of the decoders (which I was avoiding a little bit).

Patch Set 2 does this.

 }
 
 IntSize DeferredImageDecoder::size() const {
   return m_actualDecoder ? m_actualDecoder->size() : m_size;
 }
 
 IntSize DeferredImageDecoder::frameSizeAtIndex(size_t index) const {
   // FIXME: LocalFrame size is assumed to be uniform. This might not be true for
   // future supported codecs.
   return m_actualDecoder ? m_actualDecoder->frameSizeAtIndex(index) : m_size;
@@ skipping 65 matching lines @@
   if (m_frameGenerator)
     return;
 
   m_size = m_actualDecoder->size();
   m_hasHotSpot = m_actualDecoder->hotSpot(m_hotSpot);
   m_filenameExtension = m_actualDecoder->filenameExtension();
   // JPEG images support YUV decoding; other decoders do not. (WebP could in the
   // future.)
   m_canYUVDecode = RuntimeEnabledFeatures::decodeToYUVEnabled() &&
                    (m_filenameExtension == "jpg");
-  m_hasColorProfile = m_actualDecoder->hasColorProfile();
+  m_hasColorProfile = m_actualDecoder->hasColorSpace();
 
   const bool isSingleFrame =
       m_actualDecoder->repetitionCount() == cAnimationNone ||
       (m_allDataReceived && m_actualDecoder->frameCount() == 1u);
   const SkISize decodedSize =
       SkISize::Make(m_actualDecoder->decodedSize().width(),
                     m_actualDecoder->decodedSize().height());
   m_frameGenerator = ImageFrameGenerator::create(decodedSize, !isSingleFrame);
 }
 
@@ skipping 84 matching lines @@
 
 namespace WTF {
 template <>
 struct VectorTraits<blink::DeferredFrameData>
     : public SimpleClassVectorTraits<blink::DeferredFrameData> {
   STATIC_ONLY(VectorTraits);
   static const bool canInitializeWithMemset =
       false;  // Not all DeferredFrameData members initialize to 0.
 };
 }