[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[kbr at google.com]

The following commit has been merged in the debian/experimental branch:
commit 6317babc16d16b1a0e1676f4120858c2ae684d57
Author: kbr at google.com <kbr at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 11 21:05:31 2010 +0000

    2010-11-11  Kenneth Russell  <kbr at google.com>
    
            Reviewed by James Robinson.
    
            [chromium] Missing adoptPtr in GraphicsContext3DSkia.cpp
            https://bugs.webkit.org/show_bug.cgi?id=49359
    
            * platform/graphics/skia/GraphicsContext3DSkia.cpp:
            (WebCore::GraphicsContext3D::getImageData):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71847 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d8595c3..dd54b96 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-11  Kenneth Russell  <kbr at google.com>
+
+        Reviewed by James Robinson.
+
+        [chromium] Missing adoptPtr in GraphicsContext3DSkia.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=49359
+
+        * platform/graphics/skia/GraphicsContext3DSkia.cpp:
+        (WebCore::GraphicsContext3D::getImageData):
+
 2010-11-11  Dan Bernstein  <mitz at apple.com>
 
         Reviewed by Adam Roben.
diff --git a/WebCore/platform/graphics/skia/GraphicsContext3DSkia.cpp b/WebCore/platform/graphics/skia/GraphicsContext3DSkia.cpp
index d0dafb1..d825dd2 100644
--- a/WebCore/platform/graphics/skia/GraphicsContext3DSkia.cpp
+++ b/WebCore/platform/graphics/skia/GraphicsContext3DSkia.cpp
@@ -33,6 +33,8 @@
 #include "Image.h"
 #include "ImageSource.h"
 #include "NativeImageSkia.h"
+#include <wtf/OwnPtr.h>
+#include <wtf/PassOwnPtr.h>
 
 #include <algorithm>
 
@@ -55,7 +57,7 @@ bool GraphicsContext3D::getImageData(Image* image,
         if (!decoder.frameCount() || !decoder.frameIsCompleteAtIndex(0))
             return false;
         bool hasAlpha = decoder.frameHasAlphaAtIndex(0);
-        pixels = decoder.createFrameAtIndex(0);
+        pixels = adoptPtr(decoder.createFrameAtIndex(0));
         if (!pixels.get() || !pixels->isDataComplete() || !pixels->width() || !pixels->height())
             return false;
         SkBitmap::Config skiaConfig = pixels->config();

-- 
WebKit Debian packaging