Changeset 129032 in webkit

Timestamp:

Sep 19, 2012, 12:17:47 PM (13 years ago)

Author:

hclam@chromium.org

Message:

[chromium] WebImage should use ImageDecoder directly
​https://bugs.webkit.org/show_bug.cgi?id=96135

Reviewed by Adam Barth.

This patch is for preparation of deferred image decoding.
ImageSource will be used as a portal to access deferred image decoder
by BitmapImage, it should not be accessible through WebKit APIs.

WebImage now calls ImageDecoder directly which is the actual
implementation of an image decoder.

Tests: WebImageTest.PNGImage

WebImageTest.ICOImage
WebImageTest.BadImage

• WebKit.gypi:
• src/WebImageSkia.cpp:

(WebKit::WebImage::fromData):
(WebKit::WebImage::framesFromData):

• tests/WebImageTest.cpp: Added.

(WebKit):
(WebKit::readFile):
(WebKit::TEST):

• tests/data/black-and-white.ico: Added.
• tests/data/white-1x1.png: Added.

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• WebKit.gypi (modified) (1 diff)
• src/WebImageSkia.cpp (modified) (5 diffs)
• tests/WebImageTest.cpp (added)
• tests/data/black-and-white.ico (added)
• tests/data/white-1x1.png (added)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-09-19  Alpha Lam  <hclam@chromium.org>
+
+        [chromium] WebImage should use ImageDecoder directly
+        https://bugs.webkit.org/show_bug.cgi?id=96135
+
+        Reviewed by Adam Barth.
+
+        This patch is for preparation of deferred image decoding.
+        ImageSource will be used as a portal to access deferred image decoder
+        by BitmapImage, it should not be accessible through WebKit APIs.
+
+        WebImage now calls ImageDecoder directly which is the actual
+        implementation of an image decoder.
+
+        Tests: WebImageTest.PNGImage
+               WebImageTest.ICOImage
+               WebImageTest.BadImage
+
+        * WebKit.gypi:
+        * src/WebImageSkia.cpp:
+        (WebKit::WebImage::fromData):
+        (WebKit::WebImage::framesFromData):
+        * tests/WebImageTest.cpp: Added.
+        (WebKit):
+        (WebKit::readFile):
+        (WebKit::TEST):
+        * tests/data/black-and-white.ico: Added.
+        * tests/data/white-1x1.png: Added.
+
 2012-09-19  Oli Lan  <olilan@chromium.org>
 

trunk/Source/WebKit/chromium/WebKit.gypi

@@ -104 +104 @@
             'tests/WebFrameTest.cpp',
             'tests/WebInputEventConversionTest.cpp',
+            'tests/WebImageTest.cpp',
             'tests/WebMediaPlayerClientImplTest.cpp',
             'tests/WebPageNewSerializerTest.cpp',

trunk/Source/WebKit/chromium/src/WebImageSkia.cpp

@@ -32 +32 @@
 
 #include "Image.h"
-#include "ImageSource.h"
+#include "ImageDecoder.h"
 #include "NativeImageSkia.h"
 #include "SharedBuffer.h"
@@ -52 +52 @@
 WebImage WebImage::fromData(const WebData& data, const WebSize& desiredSize)
 {
-    ImageSource source;
-    source.setData(PassRefPtr<SharedBuffer>(data).get(), true);
-    if (!source.isSizeAvailable())
+    RefPtr<SharedBuffer> buffer = PassRefPtr<SharedBuffer>(data);
+    OwnPtr<ImageDecoder> decoder(adoptPtr(ImageDecoder::create(*buffer.get(), ImageSource::AlphaPremultiplied, ImageSource::GammaAndColorProfileApplied)));
+    if (!decoder)
+        return WebImage();
+
+    decoder->setData(buffer.get(), true);
+    if (!decoder->isSizeAvailable())
         return WebImage();
 
@@ -60 +64 @@
     // Pick the frame closest to |desiredSize|'s area without being smaller,
     // which has the highest bit depth.
-    const size_t frameCount = source.frameCount();
+    const size_t frameCount = decoder->frameCount();
     size_t index = 0;  // Default to first frame if none are large enough.
     int frameAreaAtIndex = 0;
     for (size_t i = 0; i < frameCount; ++i) {
-        const IntSize frameSize = source.frameSizeAtIndex(i);
+        const IntSize frameSize = decoder->frameSizeAtIndex(i);
         if (WebSize(frameSize) == desiredSize) {
             index = i;
@@ -80 +84 @@
     }
 
-    OwnPtr<NativeImageSkia> frame = adoptPtr(source.createFrameAtIndex(index));
+    ImageFrame* frame = decoder->frameBufferAtIndex(index);
     if (!frame)
         return WebImage();
 
-    return WebImage(frame->bitmap());
+    OwnPtr<NativeImageSkia> image = adoptPtr(frame->asNewNativeImage());
+    if (!image)
+        return WebImage();
+
+    return WebImage(image->bitmap());
 }
 
@@ -92 +100 @@
     const size_t maxFrameCount = 8;
 
-    ImageSource source;
-    source.setData(PassRefPtr<SharedBuffer>(data).get(), true);
-    if (!source.isSizeAvailable())
+    RefPtr<SharedBuffer> buffer = PassRefPtr<SharedBuffer>(data);
+    OwnPtr<ImageDecoder> decoder(adoptPtr(ImageDecoder::create(*buffer.get(), ImageSource::AlphaPremultiplied, ImageSource::GammaAndColorProfileApplied)));
+    if (!decoder)
+        return WebVector<WebImage>();
+
+    decoder->setData(buffer.get(), true);
+    if (!decoder->isSizeAvailable())
         return WebVector<WebImage>();
 
     // Frames are arranged by decreasing size, then decreasing bit depth.
     // Keep the first frame at every size, has the highest bit depth.
-    const size_t frameCount = source.frameCount();
+    const size_t frameCount = decoder->frameCount();
     IntSize lastSize;
 
     Vector<WebImage> frames;
     for (size_t i = 0; i < std::min(frameCount, maxFrameCount); ++i) {
-        const IntSize frameSize = source.frameSizeAtIndex(i);
+        const IntSize frameSize = decoder->frameSizeAtIndex(i);
         if (frameSize == lastSize)
             continue;
         lastSize = frameSize;
 
-        OwnPtr<NativeImageSkia> frame = adoptPtr(source.createFrameAtIndex(i));
-        if (frame)
-            frames.append(WebImage(frame->bitmap()));
+        ImageFrame* frame = decoder->frameBufferAtIndex(i);
+        if (!frame)
+            continue;
+
+        OwnPtr<NativeImageSkia> image = adoptPtr(frame->asNewNativeImage());
+        if (image.get())
+            frames.append(WebImage(image->bitmap()));
     }