Changeset 73173 in webkit

Timestamp:

Dec 2, 2010 11:42:52 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2010-12-02 Noel Gordon <​noel.gordon@gmail.com>

Reviewed by David Levin.

[chromium] Add canvas.toDataURL("image/jpeg", quality) support
​https://bugs.webkit.org/show_bug.cgi?id=49365

Chromium window/linux layout try results now match the default test result, so
remove this platform-specific test exception file.

• platform/chromium-win/fast/canvas/canvas-toDataURL-case-insensitive-mimetype-expected.txt: Removed.

2010-12-02 Noel Gordon <​noel.gordon@gmail.com>

Reviewed by David Levin.

[chromium] Add canvas.toDataURL("image/jpeg", quality) support
​https://bugs.webkit.org/show_bug.cgi?id=49365

Adds a libjpeg-based image encoder for Skia bitmaps. Default encoding quality
is 92 to match Mozilla, also Safari, though the actual value used by Safari is
undocumented, and it appears to pre-blur images prior to compression.

The preMultipliedBGRAtoRGB() routine restores the un-premultiplied RGB colors
where there is non-zero alpha. Again, this matches Firefox and Safari, but no
browser conforms to the HTML5 canvas standard here, I believe, considering the
result of canvas/philip/tests/toDataURL.jpeg.alpha.html; that test ignores the
alpha channel when extracting an "image/jpeg".toDataURL(). The correct answer
needs more investigation, bug ​http://webkit.org/b/40147.

Canvas toDataURL is covered by existing tests canvas/philip/tests/toDataURL.*,
and fast/canvas/*toDataURL* tests.

• WebCore.gypi:
• bindings/v8/custom/V8HTMLCanvasElementCustom.cpp: (WebCore::V8HTMLCanvasElement::toDataURLCallback): don't set encoding quality here, just pass the toDataURL parameters through to the canvas layer.
• platform/chromium/MIMETypeRegistryChromium.cpp: (WebCore::MIMETypeRegistry::isSupportedImageMIMETypeForEncoding): implement the supported mimeTypes for encoding in-place.
• platform/graphics/skia/ImageBufferSkia.cpp: (WebCore::ImageBuffer::toDataURL): add jpeg encoding and quality support.
• platform/image-encoders/skia/JPEGImageEncoder.cpp: Added. (WebCore::prepareOutput): (WebCore::writeOutput): (WebCore::finishOutput): (WebCore::handleError): (WebCore::preMultipliedBGRAtoRGB): FIXME: bug 40147. (WebCore::JPEGImageEncoder::encode):
• platform/image-encoders/skia/JPEGImageEncoder.h: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/chromium-win/fast/canvas/canvas-toDataURL-case-insensitive-mimetype-expected.txt (deleted)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.gypi (modified) (1 diff)
• WebCore/bindings/v8/custom/V8HTMLCanvasElementCustom.cpp (modified) (1 diff)
• WebCore/platform/chromium/MIMETypeRegistryChromium.cpp (modified) (1 diff)
• WebCore/platform/graphics/skia/ImageBufferSkia.cpp (modified) (2 diffs)
• WebCore/platform/image-encoders/skia/JPEGImageEncoder.cpp (added)
• WebCore/platform/image-encoders/skia/JPEGImageEncoder.h (added)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-12-02  Noel Gordon  <noel.gordon@gmail.com>
+
+        Reviewed by David Levin.
+
+        [chromium] Add canvas.toDataURL("image/jpeg", quality) support
+        https://bugs.webkit.org/show_bug.cgi?id=49365
+
+        Chromium window/linux layout try results now match the default test result, so
+        remove this platform-specific test exception file.
+
+        * platform/chromium-win/fast/canvas/canvas-toDataURL-case-insensitive-mimetype-expected.txt: Removed.
+
 2010-12-02  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-12-02  Noel Gordon  <noel.gordon@gmail.com>
+
+        Reviewed by David Levin.
+
+        [chromium] Add canvas.toDataURL("image/jpeg", quality) support
+        https://bugs.webkit.org/show_bug.cgi?id=49365
+
+        Adds a libjpeg-based image encoder for Skia bitmaps.  Default encoding quality
+        is 92 to match Mozilla, also Safari, though the actual value used by Safari is
+        undocumented, and it appears to pre-blur images prior to compression.
+
+        The preMultipliedBGRAtoRGB() routine restores the un-premultiplied RGB colors
+        where there is non-zero alpha.  Again, this matches Firefox and Safari, but no
+        browser conforms to the HTML5 canvas standard here, I believe, considering the
+        result of canvas/philip/tests/toDataURL.jpeg.alpha.html; that test ignores the
+        alpha channel when extracting an "image/jpeg".toDataURL().  The correct answer
+        needs more investigation, bug http://webkit.org/b/40147.
+
+        Canvas toDataURL is covered by existing tests canvas/philip/tests/toDataURL.*,
+        and fast/canvas/*toDataURL* tests.
+
+        * WebCore.gypi:
+        * bindings/v8/custom/V8HTMLCanvasElementCustom.cpp:
+        (WebCore::V8HTMLCanvasElement::toDataURLCallback): don't set encoding quality
+        here, just pass the toDataURL parameters through to the canvas layer.
+        * platform/chromium/MIMETypeRegistryChromium.cpp:
+        (WebCore::MIMETypeRegistry::isSupportedImageMIMETypeForEncoding): implement
+        the supported mimeTypes for encoding in-place.
+        * platform/graphics/skia/ImageBufferSkia.cpp:
+        (WebCore::ImageBuffer::toDataURL): add jpeg encoding and quality support.
+        * platform/image-encoders/skia/JPEGImageEncoder.cpp: Added.
+        (WebCore::prepareOutput):
+        (WebCore::writeOutput):
+        (WebCore::finishOutput):
+        (WebCore::handleError):
+        (WebCore::preMultipliedBGRAtoRGB): FIXME: bug 40147.
+        (WebCore::JPEGImageEncoder::encode):
+        * platform/image-encoders/skia/JPEGImageEncoder.h: Added.
+
 2010-12-02  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/WebCore/WebCore.gypi

@@ -2938 +2938 @@
             'platform/image-decoders/zlib/zlib.h',
             'platform/image-decoders/zlib/zutil.h',
+            'platform/image-encoders/skia/JPEGImageEncoder.cpp',
+            'platform/image-encoders/skia/JPEGImageEncoder.h',
             'platform/image-encoders/skia/PNGImageEncoder.cpp',
             'platform/image-encoders/skia/PNGImageEncoder.h',

trunk/WebCore/bindings/v8/custom/V8HTMLCanvasElementCustom.cpp

@@ -95 +95 @@
 v8::Handle<v8::Value> V8HTMLCanvasElement::toDataURLCallback(const v8::Arguments& args)
 {
-    double quality = 1.0;
-    if (args.Length() > 1) {
-        if (args[1]->IsNumber())
-            quality = args[1]->NumberValue();
-        if (!(0.0 <= quality && quality <= 1.0))
-            quality = 1.0;
-    }
     v8::Handle<v8::Object> holder = args.Holder();
     HTMLCanvasElement* canvas = V8HTMLCanvasElement::toNative(holder);
+    ExceptionCode ec = 0;
+
     String type = toWebCoreString(args[0]);
-    ExceptionCode ec = 0;
-    String result = canvas->toDataURL(type, &quality, ec);
+    double quality;
+    double* qualityPtr = 0;
+    if (args.Length() > 1 && args[1]->IsNumber()) {
+        quality = args[1]->NumberValue();
+        qualityPtr = &quality;
+    }
+
+    String result = canvas->toDataURL(type, qualityPtr, ec);
     V8Proxy::setDOMException(ec);
     return v8StringOrUndefined(result);

trunk/WebCore/platform/chromium/MIMETypeRegistryChromium.cpp

@@ -92 +92 @@
 bool MIMETypeRegistry::isSupportedImageMIMETypeForEncoding(const String& mimeType)
 {
-    // FIXME: Fill this out. See: http://trac.webkit.org/changeset/30888
-    return isSupportedImageMIMEType(mimeType);
+    return mimeType == "image/jpeg" || mimeType == "image/png";
 }
 

trunk/WebCore/platform/graphics/skia/ImageBufferSkia.cpp

@@ -41 +41 @@
 #include "GraphicsContext.h"
 #include "ImageData.h"
+#include "JPEGImageEncoder.h"
+#include "MIMETypeRegistry.h"
 #include "PNGImageEncoder.h"
 #include "PlatformContextSkia.h"
@@ -319 +321 @@
 }
 
-String ImageBuffer::toDataURL(const String&, const double*) const
-{
-    // Encode the image into a vector.
-    Vector<unsigned char> pngEncodedData;
-    PNGImageEncoder::encode(*context()->platformContext()->bitmap(), &pngEncodedData);
-
-    // Convert it into base64.
-    Vector<char> base64EncodedData;
-    base64Encode(*reinterpret_cast<Vector<char>*>(&pngEncodedData), base64EncodedData);
-    // Append with a \0 so that it's a valid string.
-    base64EncodedData.append('\0');
-
-    // And the resulting string.
-    return makeString("data:image/png;base64,", base64EncodedData.data());
+String ImageBuffer::toDataURL(const String& mimeType, const double* quality) const
+{
+    ASSERT(MIMETypeRegistry::isSupportedImageMIMETypeForEncoding(mimeType));
+
+    Vector<unsigned char> encodedImage;
+    if (mimeType == "image/jpeg") {
+        int compressionQuality = JPEGImageEncoder::DefaultCompressionQuality;
+        if (quality && *quality >= 0.0 && *quality <= 1.0)
+            compressionQuality = static_cast<int>(*quality * 100 + 0.5);
+        if (!JPEGImageEncoder::encode(*context()->platformContext()->bitmap(), compressionQuality, &encodedImage))
+            return "data:,";
+    } else {
+        if (!PNGImageEncoder::encode(*context()->platformContext()->bitmap(), &encodedImage))
+            return "data:,";
+        ASSERT(mimeType == "image/png");
+    }
+
+    Vector<char> base64Data;
+    base64Encode(*reinterpret_cast<Vector<char>*>(&encodedImage), base64Data);
+    base64Data.append('\0');
+
+    return makeString("data:", mimeType, ";base64,", base64Data.data());
 }