[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[zmo at google.com]

The following commit has been merged in the webkit-1.3 branch:
commit 3f5f45059e3e04f28eec4a04d68e01a6f3365c0e
Author: zmo at google.com <zmo at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Feb 1 22:29:33 2011 +0000

    2011-02-01  Zhenyao Mo  <zmo at google.com>
    
            Reviewed by Darin Adler.
    
            Fix the incorrect usage of RetainPtr cases in GraphicsContext3DCG.cpp
            https://bugs.webkit.org/show_bug.cgi?id=53531
    
            With this fix, running WebGL conformance tests should no longer crash randomly.
    
            * platform/graphics/cg/GraphicsContext3DCG.cpp:
            (WebCore::GraphicsContext3D::getImageData):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77305 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 46fe9fe..37a5a25 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2011-02-01  Zhenyao Mo  <zmo at google.com>
+
+        Reviewed by Darin Adler.
+
+        Fix the incorrect usage of RetainPtr cases in GraphicsContext3DCG.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=53531
+
+        With this fix, running WebGL conformance tests should no longer crash randomly.
+
+        * platform/graphics/cg/GraphicsContext3DCG.cpp:
+        (WebCore::GraphicsContext3D::getImageData):
+
 2011-02-01  Dimitri Glazkov  <dglazkov at chromium.org>
 
         One more Chromium build fix after r77286.
diff --git a/Source/WebCore/platform/graphics/cg/GraphicsContext3DCG.cpp b/Source/WebCore/platform/graphics/cg/GraphicsContext3DCG.cpp
index 52f262f..187d296 100644
--- a/Source/WebCore/platform/graphics/cg/GraphicsContext3DCG.cpp
+++ b/Source/WebCore/platform/graphics/cg/GraphicsContext3DCG.cpp
@@ -105,7 +105,7 @@ bool GraphicsContext3D::getImageData(Image* image,
         decoder.setData(image->data(), true);
         if (!decoder.frameCount())
             return false;
-        decodedImage = decoder.createFrameAtIndex(0);
+        decodedImage.adoptCF(decoder.createFrameAtIndex(0));
         cgImage = decodedImage.get();
     } else
         cgImage = image->nativeImageForCurrentFrame();
@@ -121,11 +121,10 @@ bool GraphicsContext3D::getImageData(Image* image,
     // so, re-render it into an RGB color space. The image re-packing
     // code requires color data, not color table indices, for the
     // image data.
-    RetainPtr<CGColorSpaceRef> colorSpace(AdoptCF, CGImageGetColorSpace(cgImage));
-    CGColorSpaceModel model = CGColorSpaceGetModel(colorSpace.get());
-    RetainPtr<CGContextRef> bitmapContext;
+    CGColorSpaceRef colorSpace = CGImageGetColorSpace(cgImage);
+    CGColorSpaceModel model = CGColorSpaceGetModel(colorSpace);
     if (model == kCGColorSpaceModelIndexed) {
-        RetainPtr<CGColorSpaceRef> baseColorSpace(CGColorSpaceGetBaseColorSpace(colorSpace.get()));
+        RetainPtr<CGContextRef> bitmapContext;
         // FIXME: we should probably manually convert the image by indexing into
         // the color table, which would allow us to avoid premultiplying the
         // alpha channel. Creation of a bitmap context with an alpha channel

-- 
WebKit Debian packaging