Changeset 116196 in webkit

Timestamp:

May 4, 2012 5:49:42 PM (12 years ago)

Author:

noel.gordon@gmail.com

Message:

[CG] Minor refactor of ImageBuffer::CGImageToDataURL and its callers
​https://bugs.webkit.org/show_bug.cgi?id=85280

Reviewed by Kenneth Russell.

This patch means to simplify the diff of an upcoming patch. Refactoring
here in preparation for that patch.

No new tests. No behavioral change. Covered by canvas 2d and 3d tests:

canvas/philip/tests/*toDataURL*.html
fast/canvas/webgl/premultiplyalpha-test.html

• platform/graphics/cg/ImageBufferCG.cpp:

(WebCore::CGImageToDataURL): Move the invalid image (!image) test here.
The comments are about JPEG images; say that. Rename out to base64Data.
(WebCore::ImageBuffer::toDataURL): Remove the !image test.
(WebCore::ImageDataToDataURL): Move and define variables where used and
make the code flow read similarly to toDataURL. Remove the !image test.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/cg/ImageBufferCG.cpp (modified) (6 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-04  Noel Gordon  <noel.gordon@gmail.com>
+
+        [CG] Minor refactor of ImageBuffer::CGImageToDataURL and its callers
+        https://bugs.webkit.org/show_bug.cgi?id=85280
+
+        Reviewed by Kenneth Russell.
+
+        This patch means to simplify the diff of an upcoming patch. Refactoring
+        here in preparation for that patch.
+
+        No new tests. No behavioral change. Covered by canvas 2d and 3d tests:
+          canvas/philip/tests/*toDataURL*.html
+          fast/canvas/webgl/premultiplyalpha-test.html
+
+        * platform/graphics/cg/ImageBufferCG.cpp:
+        (WebCore::CGImageToDataURL): Move the invalid image (!image) test here.
+        The comments are about JPEG images; say that. Rename out to base64Data.
+        (WebCore::ImageBuffer::toDataURL): Remove the !image test.
+        (WebCore::ImageDataToDataURL): Move and define variables where used and
+        make the code flow read similarly to toDataURL. Remove the !image test.
+
 2012-05-04  Shawn Singh  <shawnsingh@chromium.org>
 

trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp

@@ -402 +402 @@
 static String CGImageToDataURL(CGImageRef image, const String& mimeType, const double* quality)
 {
+    if (!image)
+        return "data:,";
+
     RetainPtr<CFMutableDataRef> data(AdoptCF, CFDataCreateMutable(kCFAllocatorDefault, 0));
     if (!data)
@@ -415 +418 @@
     RetainPtr<CFDictionaryRef> imageProperties = 0;
     if (CFEqual(uti.get(), jpegUTI()) && quality && *quality >= 0.0 && *quality <= 1.0) {
-        // Apply the compression quality to the image destination.
+        // Apply the compression quality to the JPEG image destination.
         RetainPtr<CFNumberRef> compressionQuality(AdoptCF, CFNumberCreate(kCFAllocatorDefault, kCFNumberDoubleType, quality));
         const void* key = kCGImageDestinationLossyCompressionQuality;
@@ -422 +425 @@
     }
 
-    // Setting kCGImageDestinationBackgroundColor to black in imageProperties would allow saving some math in the
-    // calling functions, but it doesn't seem to work.
+    // Setting kCGImageDestinationBackgroundColor to black for JPEG images in imageProperties would save some math
+    // in the calling functions, but it doesn't seem to work.
 
     CGImageDestinationAddImage(destination.get(), image, imageProperties.get());
     CGImageDestinationFinalize(destination.get());
 
-    Vector<char> out;
-    base64Encode(reinterpret_cast<const char*>(CFDataGetBytePtr(data.get())), CFDataGetLength(data.get()), out);
-
-    return "data:" + mimeType + ";base64," + out;
+    Vector<char> base64Data;
+    base64Encode(reinterpret_cast<const char*>(CFDataGetBytePtr(data.get())), CFDataGetLength(data.get()), base64Data);
+
+    return "data:" + mimeType + ";base64," + base64Data;
 }
 
@@ -468 +471 @@
     }
 
-    if (!image)
-        return "data:,";
-
     return CGImageToDataURL(image.get(), mimeType, quality);
 }
@@ -477 +477 @@
 {
     ASSERT(MIMETypeRegistry::isSupportedImageMIMETypeForEncoding(mimeType));
-        
-    RetainPtr<CGImageRef> image;
-    RetainPtr<CGDataProviderRef> dataProvider;
-
-    unsigned char* data = source.data()->data();
+
     RetainPtr<CFStringRef> uti = utiFromMIMEType(mimeType);
     ASSERT(uti);
+
+    unsigned char* data = source.data()->data();
     Vector<uint8_t> dataVector;
+
     if (CFEqual(uti.get(), jpegUTI())) {
         // JPEGs don't have an alpha channel, so we have to manually composite on top of black.
@@ -507 +506 @@
         data = out;
     }
-    
-    dataProvider.adoptCF(CGDataProviderCreateWithData(0, data,
-                                                      4 * source.width() * source.height(), 0));
-    
+
+    RetainPtr<CGDataProviderRef> dataProvider;
+    dataProvider.adoptCF(CGDataProviderCreateWithData(0, data, 4 * source.width() * source.height(), 0));
     if (!dataProvider)
         return "data:,";
 
+    RetainPtr<CGImageRef> image;
     image.adoptCF(CGImageCreate(source.width(), source.height(), 8, 32, 4 * source.width(),
                                 deviceRGBColorSpaceRef(), kCGBitmapByteOrderDefault | kCGImageAlphaLast,
                                 dataProvider.get(), 0, false, kCGRenderingIntentDefault));
-                                
-        
-    if (!image)
-        return "data:,";
 
     return CGImageToDataURL(image.get(), mimeType, quality);
 }
+
 } // namespace WebCore