Changeset 57687 in webkit

Timestamp:

Apr 15, 2010 4:58:42 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-04-15 Nicolas Weber <​thakis@chromium.org>

Reviewed by Dimitri Glazkov.

Fix drag image thumbnails for indexed images.
​https://bugs.webkit.org/show_bug.cgi?id=37621

• platform/chromium/DragImageChromiumMac.cpp: (WebCore::scaleDragImage): Always use RGB color space. (WebCore::dissolveDragImageToFraction): Always use RGB color space.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/chromium/DragImageChromiumMac.cpp (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-15  Nicolas Weber  <thakis@chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Fix drag image thumbnails for indexed images.
+        https://bugs.webkit.org/show_bug.cgi?id=37621
+
+        * platform/chromium/DragImageChromiumMac.cpp:
+        (WebCore::scaleDragImage): Always use RGB color space.
+        (WebCore::dissolveDragImageToFraction): Always use RGB color space.
+
 2010-04-15  Adam Roben  <aroben@apple.com>
 

trunk/WebCore/platform/chromium/DragImageChromiumMac.cpp

@@ -34 +34 @@
 #include "Image.h"
 #include "NotImplemented.h"
+#include <wtf/RetainPtr.h>
 
 #include <CoreGraphics/CGBitmapContext.h>
@@ -58 +59 @@
     size_t width = roundf(CGImageGetWidth(image) * scale.width());
     size_t height = roundf(CGImageGetHeight(image) * scale.height());
-    CGContextRef context = CGBitmapContextCreate(0, width, height, 8, width * 4, CGImageGetColorSpace(image), kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host);
+
+    RetainPtr<CGColorSpaceRef> deviceRGB(WTF::AdoptCF, CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB));
+    CGContextRef context = CGBitmapContextCreate(0, width, height, 8, width * 4, deviceRGB.get(), kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host);
+
     if (!context)
         return 0;
@@ -75 +79 @@
     size_t width = CGImageGetWidth(image);
     size_t height = CGImageGetHeight(image);
-    CGContextRef context = CGBitmapContextCreate(0, width, height, 8, width * 4, CGImageGetColorSpace(image), kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host);
+
+    RetainPtr<CGColorSpaceRef> deviceRGB(WTF::AdoptCF, CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB));
+    CGContextRef context = CGBitmapContextCreate(0, width, height, 8, width * 4, deviceRGB.get(), kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host);
+
     if (!context)
         return 0;