Image decode color: Push color profile from browser to renderer

third_party/WebKit/Source/platform/image-decoders/ImageDecoder.h

 /*
  * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
  * Copyright (C) Research In Motion Limited 2009-2010. 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
@@ skipping 75 matching lines @@
     ImageDecoder(AlphaOption alphaOption, GammaAndColorProfileOption colorOptions, size_t maxDecodedBytes)
         : m_premultiplyAlpha(alphaOption == AlphaPremultiplied)
         , m_ignoreGammaAndColorProfile(colorOptions == GammaAndColorProfileIgnored)
         , m_maxDecodedBytes(maxDecodedBytes)
         , m_sizeAvailable(false)
         , m_isAllDataReceived(false)
         , m_failed(false) { }
 
     virtual ~ImageDecoder() { }
 
+    static void setOutputDeviceColorProfile(const ColorProfile&);
+
     // Returns a caller-owned decoder of the appropriate type.  Returns 0 if
     // we can't sniff a supported type from the provided data (possibly
     // because there isn't enough data yet).
     // Sets m_maxDecodedBytes to Platform::maxImageDecodedBytes().
     static PassOwnPtr<ImageDecoder> create(const SharedBuffer& data, AlphaOption, GammaAndColorProfileOption);
 
     virtual String filenameExtension() const = 0;
 
     bool isAllDataReceived() const { return m_isAllDataReceived; }
 
@@ skipping 115 matching lines @@
     {
         ASSERT_UNUSED(profileLength, profileLength >= iccColorProfileHeaderLength);
 
         return !memcmp(&profileData[12], "mntr", 4) || !memcmp(&profileData[12], "scnr", 4);
     }
 
     class OutputDeviceProfile final {
         USING_FAST_MALLOC(OutputDeviceProfile);
         WTF_MAKE_NONCOPYABLE(OutputDeviceProfile);
     public:
-        OutputDeviceProfile()
+        OutputDeviceProfile(const ColorProfile* colorProfile)
             : m_outputDeviceProfile(0)
         {
-            ColorProfile profile = screenColorProfile();
-            if (!profile.isEmpty())
-                m_outputDeviceProfile = qcms_profile_from_memory(profile.data(), profile.size());
+            if (colorProfile && !colorProfile->isEmpty())
+                m_outputDeviceProfile = qcms_profile_from_memory(colorProfile->data(), colorProfile->size());
 
             if (m_outputDeviceProfile && qcms_profile_is_bogus(m_outputDeviceProfile)) {
                 qcms_profile_release(m_outputDeviceProfile);
                 m_outputDeviceProfile = 0;
             }
 
             if (!m_outputDeviceProfile)
                 m_outputDeviceProfile = qcms_profile_sRGB();
             if (m_outputDeviceProfile)
                 qcms_profile_precache_output_transform(m_outputDeviceProfile);
         }
 
         qcms_profile* profile() const { return m_outputDeviceProfile; }
 
     private:
-        static ColorProfile screenColorProfile()
-        {
-            // FIXME: Add optional ICCv4 support and support for multiple monitors.
-            WebVector<char> profile;
-            Platform::current()->screenColorProfile(&profile);
-
-            ColorProfile colorProfile;
-            colorProfile.append(profile.data(), profile.size());
-            return colorProfile;
-        }
-
         qcms_profile* m_outputDeviceProfile;
     };
 
-    static qcms_profile* qcmsOutputDeviceProfile()
+    static qcms_profile* qcmsOutputDeviceProfile(const ColorProfile* colorProfile = 0)

[dcheng, 2016/03/15 17:28:08]

= nullptr

[ccameron, 2016/03/15 18:22:05]

Done.

     {
-        DEFINE_THREAD_SAFE_STATIC_LOCAL(OutputDeviceProfile, outputDeviceProfile, new OutputDeviceProfile);
+        DEFINE_THREAD_SAFE_STATIC_LOCAL(OutputDeviceProfile, outputDeviceProfile, new OutputDeviceProfile(colorProfile));
 
         return outputDeviceProfile.profile();
     }
 #endif
 
     // Sets the "decode failure" flag.  For caller convenience (since so
     // many callers want to return false after calling this), returns false
     // to enable easy tailcalling.  Subclasses may override this to also
     // clean up any local data.
     virtual bool setFailed()
@@ skipping 90 matching lines @@
 
     IntSize m_size;
     bool m_sizeAvailable;
     bool m_isAllDataReceived;
     bool m_failed;
 };
 
 } // namespace blink
 
 #endif