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

[jamesr at google.com]

The following commit has been merged in the debian/experimental branch:
commit 5bedec7f9a918e6e65868eca8e966c8e21a5bf0e
Author: jamesr at google.com <jamesr at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 6 20:21:54 2010 +0000

    2010-10-05  James Robinson  <jamesr at chromium.org>
    
            Reviewed by Kenneth Russell.
    
            [chromium] DRT assertion w/accel 2D canvas in PlatformContextSkia
            https://bugs.webkit.org/show_bug.cgi?id=47242
    
            Call PlatformContextSkia::prepareForSoftwareDraw before doing putImageData
            since that call mutates the software backing store.
    
            Test: fast/canvas/canvas-putImageData.html
    
            * platform/graphics/skia/ImageBufferSkia.cpp:
            (WebCore::ImageBuffer::putUnmultipliedImageData):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69227 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e184070..887df56 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-10-05  James Robinson  <jamesr at chromium.org>
+
+        Reviewed by Kenneth Russell.
+
+        [chromium] DRT assertion w/accel 2D canvas in PlatformContextSkia
+        https://bugs.webkit.org/show_bug.cgi?id=47242
+
+        Call PlatformContextSkia::prepareForSoftwareDraw before doing putImageData
+        since that call mutates the software backing store.
+
+        Test: fast/canvas/canvas-putImageData.html
+
+        * platform/graphics/skia/ImageBufferSkia.cpp:
+        (WebCore::ImageBuffer::putUnmultipliedImageData):
+
 2010-10-06  Alexey Proskuryakov  <ap at apple.com>
 
         Reviewed by Brady Eidson.
diff --git a/WebCore/platform/graphics/skia/ImageBufferSkia.cpp b/WebCore/platform/graphics/skia/ImageBufferSkia.cpp
index 2be7dc5..e816f85 100644
--- a/WebCore/platform/graphics/skia/ImageBufferSkia.cpp
+++ b/WebCore/platform/graphics/skia/ImageBufferSkia.cpp
@@ -290,6 +290,7 @@ void putImageData(ImageData*& source, const IntRect& sourceRect, const IntPoint&
 
 void ImageBuffer::putUnmultipliedImageData(ImageData* source, const IntRect& sourceRect, const IntPoint& destPoint)
 {
+    context()->platformContext()->prepareForSoftwareDraw();
     putImageData<Unmultiplied>(source, sourceRect, destPoint, *context()->platformContext()->bitmap(), m_size);
 }
 

-- 
WebKit Debian packaging