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

[aroben at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 1479488caa3fd748ec61e8d0ddb5cc3e4ce9979b
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 27 13:15:49 2010 +0000

    Only decompress pixel buffers when needed (and fix a crash in the process)
    
    Fixes <http://webkit.org/b/48417> Crash when running
    compositing/video/video-background-color.html on Windows
    
    Reviewed by Anders Carlsson.
    
    * platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp:
    (WebCore::MediaPlayerPrivateQuickTimeVisualContext::paint): Only
    decompress the pixel buffer when it has an incompatible format. This
    also has the benefit of only decompressing the buffer when a
    QTDecompressionSession has been created! (I assume this was just a typo
    from when this code was added in r70252.)
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70641 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index de62f32..f65de74 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2010-10-27  Adam Roben  <aroben at apple.com>
+
+        Only decompress pixel buffers when needed (and fix a crash in the
+        process)
+
+        Fixes <http://webkit.org/b/48417> Crash when running
+        compositing/video/video-background-color.html on Windows
+
+        Reviewed by Anders Carlsson.
+
+        * platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp:
+        (WebCore::MediaPlayerPrivateQuickTimeVisualContext::paint): Only
+        decompress the pixel buffer when it has an incompatible format. This
+        also has the benefit of only decompressing the buffer when a
+        QTDecompressionSession has been created! (I assume this was just a typo
+        from when this code was added in r70252.)
+
 2010-10-27  Mario Sanchez Prada  <msanchez at igalia.com>
 
         Reviewed by Martin Robinson.
diff --git a/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp b/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp
index 92263b6..5544229 100644
--- a/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp
+++ b/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContext.cpp
@@ -743,9 +743,8 @@ void MediaPlayerPrivateQuickTimeVisualContext::paint(GraphicsContext* p, const I
                 // recreated with the new parameters.
                 if (!m_decompressionSession || !m_decompressionSession->canDecompress(buffer))
                     m_decompressionSession = QTDecompressionSession::create(buffer.pixelFormatType(), buffer.width(), buffer.height());
+                buffer = m_decompressionSession->decompress(buffer);
             }
-
-            buffer = m_decompressionSession->decompress(buffer);
         }
 #endif
         CGImageRef image = CreateCGImageFromPixelBuffer(buffer);

-- 
WebKit Debian packaging