Changeset 120789 in webkit

Timestamp:

Jun 19, 2012 7:15:00 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Add monitor profile support for Win
​https://bugs.webkit.org/show_bug.cgi?id=88565

Patch by Tony Payne <​tpayne@chromium.org> on 2012-06-19
Reviewed by Eric Seidel.

Source/Platform:

• chromium/public/Platform.h:

(Platform):
(WebKit::Platform::screenColorProfile):

Source/WebCore:

Tests: fast/images/jpeg-with-color-profile.html
fast/images/png-with-color-profile.html. Also covered by numerous
layout tests.

• WebCore.gyp/WebCore.gyp:
• platform/PlatformScreen.h:

(WebCore):

• platform/blackberry/PlatformScreenBlackBerry.cpp:

(WebCore::screenColorProfile):
(WebCore):

• platform/chromium/PlatformScreenChromium.cpp:

(WebCore::screenColorProfile):
(WebCore):

• platform/efl/PlatformScreenEfl.cpp:

(WebCore::screenColorProfile):
(WebCore):

• platform/gtk/PlatformScreenGtk.cpp:

(WebCore::screenColorProfile):
(WebCore):

• platform/image-decoders/ImageDecoder.h:

(ImageFrame):
(ImageDecoder):
(WebCore::ImageDecoder::qcmsOutputDeviceProfile):

• platform/image-decoders/jpeg/JPEGImageDecoder.cpp:

(turboSwizzled):
(colorSpaceHasAlpha):

Location:

trunk/Source

Files:

• Platform/ChangeLog (modified) (1 diff)
• Platform/chromium/public/Platform.h (modified) (2 diffs)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/PlatformScreen.h (modified) (2 diffs)
• WebCore/platform/blackberry/PlatformScreenBlackBerry.cpp (modified) (1 diff)
• WebCore/platform/chromium/PlatformScreenChromium.cpp (modified) (2 diffs)
• WebCore/platform/efl/PlatformScreenEfl.cpp (modified) (1 diff)
• WebCore/platform/gtk/PlatformScreenGtk.cpp (modified) (1 diff)
• WebCore/platform/image-decoders/ImageDecoder.h (modified) (4 diffs)
• WebCore/platform/mac/PlatformScreenMac.mm (modified) (1 diff)
• WebCore/platform/qt/PlatformScreenQt.cpp (modified) (1 diff)
• WebCore/platform/win/PlatformScreenWin.cpp (modified) (1 diff)

trunk/Source/Platform/ChangeLog

@@ +1 @@
+2012-06-19  Tony Payne  <tpayne@chromium.org>
+
+        Add monitor profile support for Win
+        https://bugs.webkit.org/show_bug.cgi?id=88565
+
+        Reviewed by Eric Seidel.
+
+        * chromium/public/Platform.h:
+        (Platform):
+        (WebKit::Platform::screenColorProfile):
+
 2012-06-14  James Robinson  <jamesr@chromium.org>
 

trunk/Source/Platform/chromium/public/Platform.h

@@ -39 +39 @@
 #include "WebLocalizedString.h"
 #include "WebString.h"
+#include "WebVector.h"
 
 namespace WebKit {
@@ -238 +239 @@
     // sandbox isn't active).
     virtual bool sandboxEnabled() { return false; }
+
+
+    // Screen -------------------------------------------------------------
+
+    // Supplies the system monitor color profile ("monitor") or a named ICC profile.
+    virtual void screenColorProfile(const WebString& type, WebVector<char>* profile) { }
 
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-06-19  Tony Payne  <tpayne@chromium.org>
+
+        Add monitor profile support for Win
+        https://bugs.webkit.org/show_bug.cgi?id=88565
+
+        Reviewed by Eric Seidel.
+
+        Tests: fast/images/jpeg-with-color-profile.html
+        fast/images/png-with-color-profile.html. Also covered by numerous
+        layout tests.
+
+        * WebCore.gyp/WebCore.gyp:
+        * platform/PlatformScreen.h:
+        (WebCore):
+        * platform/blackberry/PlatformScreenBlackBerry.cpp:
+        (WebCore::screenColorProfile):
+        (WebCore):
+        * platform/chromium/PlatformScreenChromium.cpp:
+        (WebCore::screenColorProfile):
+        (WebCore):
+        * platform/efl/PlatformScreenEfl.cpp:
+        (WebCore::screenColorProfile):
+        (WebCore):
+        * platform/gtk/PlatformScreenGtk.cpp:
+        (WebCore::screenColorProfile):
+        (WebCore):
+        * platform/image-decoders/ImageDecoder.h:
+        (ImageFrame):
+        (ImageDecoder):
+        (WebCore::ImageDecoder::qcmsOutputDeviceProfile):
+        * platform/image-decoders/jpeg/JPEGImageDecoder.cpp:
+        (turboSwizzled):
+        (colorSpaceHasAlpha):
+
 2012-06-19  Erik Arvidsson  <arv@chromium.org>
 

trunk/Source/WebCore/platform/PlatformScreen.h

@@ -38 +38 @@
 typedef uint32_t PlatformDisplayID;
 
+typedef WTF::Vector<char> ColorProfile;
+
 namespace WebCore {
 
@@ -51 +53 @@
     FloatRect screenRect(Widget*);
     FloatRect screenAvailableRect(Widget*);
+    // type can be "monitor" or the name of a profile such as "sRGB" or "Adobe RGB".
+    void screenColorProfile(Widget*, const String& type, ColorProfile&);
 
 #if PLATFORM(MAC)

trunk/Source/WebCore/platform/blackberry/PlatformScreenBlackBerry.cpp

@@ -65 +65 @@
 }
 
+void screenColorProfile(Widget*, const String&, ColorProfile&)
+{
+    notImplemented();
+}
+
 } // namespace WebCore

trunk/Source/WebCore/platform/chromium/PlatformScreenChromium.cpp

@@ -34 +34 @@
 #include "IntRect.h"
 #include "PlatformSupport.h"
+
+#include <public/Platform.h>
 
 namespace WebCore {
@@ -72 +74 @@
 }
 
+void screenColorProfile(Widget*, const String& type, ColorProfile& toProfile)
+{
+    // FIXME: Add support for multiple monitors.
+    WebKit::WebVector<char> profile;
+    WebKit::Platform::current()->screenColorProfile(WebKit::WebString(type), &profile);
+    toProfile.append(profile.data(), profile.size());
+}
+
 } // namespace WebCore

trunk/Source/WebCore/platform/efl/PlatformScreenEfl.cpp

@@ -93 +93 @@
 }
 
+void screenColorProfile(Widget*, const String&, ColorProfile&)
+{
+    notImplemented();
 }
+
+}

trunk/Source/WebCore/platform/gtk/PlatformScreenGtk.cpp

@@ -138 +138 @@
 }
 
+void screenColorProfile(Widget*, const String&, ColorProfile&)
+{
+    notImplemented();
+}
+
 } // namespace WebCore

trunk/Source/WebCore/platform/image-decoders/ImageDecoder.h

@@ -32 +32 @@
 #include "IntRect.h"
 #include "ImageSource.h"
+#include "PlatformScreen.h"
 #include "PlatformString.h"
 #include "SharedBuffer.h"
@@ -45 +46 @@
 #if USE(QCMSLIB)
 #include "qcms.h"
-#include <wtf/MainThread.h>
 #if OS(DARWIN)
 #include "GraphicsContextCG.h"
@@ -54 +54 @@
 
 namespace WebCore {
-
-    typedef Vector<char> ColorProfile;
 
     // ImageFrame represents the decoded image data.  This buffer is what all
@@ -314 +312 @@
                     const unsigned char* systemProfile = CFDataGetBytePtr(iccProfile);
                     outputDeviceProfile = qcms_profile_from_memory(systemProfile, length);
-                    if (outputDeviceProfile && qcms_profile_is_bogus(outputDeviceProfile)) {
-                        qcms_profile_release(outputDeviceProfile);
-                        outputDeviceProfile = 0;
-                    }
+                }
+#else
+                // FIXME: add support for multiple monitors.
+                ColorProfile profile;
+                screenColorProfile(0, "monitor", profile);
+                if (!profile.isEmpty())
+                    outputDeviceProfile = qcms_profile_from_memory(profile.data(), profile.size());
+#endif
+                if (outputDeviceProfile && qcms_profile_is_bogus(outputDeviceProfile)) {
+                    qcms_profile_release(outputDeviceProfile);
+                    outputDeviceProfile = 0;
                 }
                 if (!outputDeviceProfile)
                     outputDeviceProfile = qcms_profile_sRGB();
-#else
-                // FIXME: sRGB profiles don't add much value. Use the user's monitor profile.
-                outputDeviceProfile = qcms_profile_sRGB();
-#endif
-                // FIXME: Check that the profile is valid. Fallback to sRGB if not?
                 if (outputDeviceProfile)
                     qcms_profile_precache_output_transform(outputDeviceProfile);

trunk/Source/WebCore/platform/mac/PlatformScreenMac.mm

@@ -77 +77 @@
 }
 
+void screenColorProfile(Widget*, const String&, ColorProfile&)
+{
+    notImplemented();
+}
+
 NSScreen *screenForWindow(NSWindow *window)
 {

trunk/Source/WebCore/platform/qt/PlatformScreenQt.cpp

@@ -144 +144 @@
 }
 
+void screenColorProfile(Widget*, const String&, ColorProfile&)
+{
+    notImplemented();
+}
+
 } // namespace WebCore

trunk/Source/WebCore/platform/win/PlatformScreenWin.cpp

@@ -119 +119 @@
 }
 
+void screenColorProfile(Widget*, const String&, ColorProfile&)
+{
+    notImplemented();
+}
+
 } // namespace WebCore