Move screenColorProfile from Platform to ImageDecoder

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 25 matching lines @@
 #include "public/platform/Platform.h"
 #include "wtf/Assertions.h"
 #include "wtf/RefPtr.h"
 #include "wtf/Vector.h"
 #include "wtf/text/WTFString.h"
 
 #if USE(QCMSLIB)
 #include "qcms.h"
 #endif
 
+typedef Vector<char> ColorProfile;

[Mike West, 2014/09/15 07:12:16]

It looks this type is only used in the OutputDeviceProfile class, is that the
case? If so, you might consider scoping the typedef to that class.

[Noel Gordon, 2014/09/15 07:27:17]

Yeah, it's needed in (JPEG|PNG|WEBP)ImageDecoder files also.

+
 namespace blink {
 
 // ImagePlanes can be used to decode color components into provided buffers instead of using an ImageFrame.
 class PLATFORM_EXPORT ImagePlanes {
 public:
     ImagePlanes();
     ImagePlanes(void* planes[3], size_t rowBytes[3]);
 
     void* plane(int);
     size_t rowBytes(int) const;
@@ skipping 133 matching lines @@
         ASSERT_UNUSED(profileLength, profileLength >= iccColorProfileHeaderLength);
 
         return !memcmp(&profileData[12], "mntr", 4) || !memcmp(&profileData[12], "scnr", 4);
     }
 
     class OutputDeviceProfile {
     public:
         OutputDeviceProfile()
             : m_outputDeviceProfile(0)
         {
-            // FIXME: Add optional ICCv4 support.
-            // FIXME: add support for multiple monitors.
-            ColorProfile profile;
-            screenColorProfile(profile);
+            ColorProfile profile = screenColorProfile();
             if (!profile.isEmpty())
                 m_outputDeviceProfile = qcms_profile_from_memory(profile.data(), profile.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.

[Mike West, 2014/09/15 07:12:16]

Nit: Is there a bug filed for this FIXME? It'd be nice to link to it if there is
one.

[Noel Gordon, 2014/09/15 07:27:17]

https://crbug.com/353818 and I know the bug well.  I might link to it in a
future CL, or I might just remove this code once it's fixed.

+            WebVector<char> profile;
+            Platform::current()->screenColorProfile(&profile);
+
+            ColorProfile colorProfile;
+            colorProfile.append(profile.data(), profile.size());

[jochen (gone - plz use gerrit), 2014/09/15 12:46:02]

Why not just use the WebVector<>? You now copy the data twice.

[Noel Gordon, 2014/09/15 12:55:53]

The data was copied twice before this change (refer to PlatformScreen.cpp),
unless I'm misunderstadning you.

+            return colorProfile;
+        }
+
         qcms_profile* m_outputDeviceProfile;
     };
 
     static qcms_profile* qcmsOutputDeviceProfile()
     {
         AtomicallyInitializedStatic(OutputDeviceProfile*, outputDeviceProfile = new OutputDeviceProfile());
 
         return outputDeviceProfile->profile();
     }
 #endif
@@ skipping 82 matching lines @@
 
     IntSize m_size;
     bool m_sizeAvailable;
     bool m_isAllDataReceived;
     bool m_failed;
 };
 
 } // namespace blink
 
 #endif