Changeset 134816 in webkit

Timestamp:

Nov 15, 2012 12:35:40 PM (11 years ago)

Author:

hclam@chromium.org

Message:

[chromium] WebGL texImage2D fails with deferred image decoding
​https://bugs.webkit.org/show_bug.cgi?id=102310

Reviewed by Kenneth Russell.

Source/WebCore:

Skia's implementation of GraphicsContext3D::getImageData() uses ImageSource
to decode an image. When deferred image decoding is enabled this class
generates an ImageFrame marked as incomplete, which WebGL rejects. This results
in failing of texImage2D.

This change uses ImageDecoder directly instead of ImageSource. This skips
the code path of deferred image decoding. This behavior is correct because
GraphicsContext3D wants to decode the image differently with alpha not
premultiplied and color profile applied optionally.

Added a test to prove this change fixed the bug.

Test: fast/images/webgl-teximage2d.html

• platform/graphics/skia/GraphicsContext3DSkia.cpp:

(WebCore::GraphicsContext3D::getImageData):

LayoutTests:

Added a test to exercise texImage2D with an Image object.

• fast/images/webgl-teximage2d-expected.txt: Added.
• fast/images/webgl-teximage2d.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/images/webgl-teximage2d-expected.txt (added)
• LayoutTests/fast/images/webgl-teximage2d.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/skia/GraphicsContext3DSkia.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-11-15  Alpha Lam  <hclam@chromium.org>
+
+        [chromium] WebGL texImage2D fails with deferred image decoding
+        https://bugs.webkit.org/show_bug.cgi?id=102310
+
+        Reviewed by Kenneth Russell.
+
+        Added a test to exercise texImage2D with an Image object.
+
+        * fast/images/webgl-teximage2d-expected.txt: Added.
+        * fast/images/webgl-teximage2d.html: Added.
+
 2012-11-15  Stephen Chenney  <schenney@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-11-15  Alpha Lam  <hclam@chromium.org>
+
+        [chromium] WebGL texImage2D fails with deferred image decoding
+        https://bugs.webkit.org/show_bug.cgi?id=102310
+
+        Reviewed by Kenneth Russell.
+
+        Skia's implementation of GraphicsContext3D::getImageData() uses ImageSource
+        to decode an image. When deferred image decoding is enabled this class
+        generates an ImageFrame marked as incomplete, which WebGL rejects. This results
+        in failing of texImage2D.
+
+        This change uses ImageDecoder directly instead of ImageSource. This skips
+        the code path of deferred image decoding. This behavior is correct because
+        GraphicsContext3D wants to decode the image differently with alpha not
+        premultiplied and color profile applied optionally.
+
+        Added a test to prove this change fixed the bug.
+
+        Test: fast/images/webgl-teximage2d.html
+
+        * platform/graphics/skia/GraphicsContext3DSkia.cpp:
+        (WebCore::GraphicsContext3D::getImageData):
+
 2012-11-15  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/platform/graphics/skia/GraphicsContext3DSkia.cpp

@@ -33 +33 @@
 #include "BitmapImage.h"
 #include "Image.h"
-#include "ImageSource.h"
+#include "ImageDecoder.h"
 #include "NativeImageSkia.h"
 #include "SkColorPriv.h"
@@ -57 +57 @@
     bool hasAlpha = skiaImage ? !skiaImage->bitmap().isOpaque() : true;
     if ((!skiaImage || ignoreGammaAndColorProfile || (hasAlpha && !premultiplyAlpha)) && image->data()) {
-        ImageSource decoder(ImageSource::AlphaNotPremultiplied,
-                            ignoreGammaAndColorProfile ? ImageSource::GammaAndColorProfileIgnored : ImageSource::GammaAndColorProfileApplied);
-        // Attempt to get raw unpremultiplied image data 
-        decoder.setData(image->data(), true);
-        if (!decoder.frameCount() || !decoder.frameIsCompleteAtIndex(0))
+        // Attempt to get raw unpremultiplied image data.
+        OwnPtr<ImageDecoder> decoder(adoptPtr(ImageDecoder::create(
+            *(image->data()), ImageSource::AlphaNotPremultiplied,
+            ignoreGammaAndColorProfile ? ImageSource::GammaAndColorProfileIgnored : ImageSource::GammaAndColorProfileApplied)));
+        if (!decoder)
             return false;
-        hasAlpha = decoder.frameHasAlphaAtIndex(0);
-        pixels = adoptPtr(decoder.createFrameAtIndex(0));
+        decoder->setData(image->data(), true);
+        if (!decoder->frameCount())
+            return false;
+        ImageFrame* frame = decoder->frameBufferAtIndex(0);
+        if (!frame || frame->status() != ImageFrame::FrameComplete)
+            return false;
+        hasAlpha = frame->hasAlpha();
+        pixels = adoptPtr(frame->asNewNativeImage());
         if (!pixels.get() || !pixels->isDataComplete() || !pixels->bitmap().width() || !pixels->bitmap().height())
             return false;