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

[commit-queue at webkit.org]

The following commit has been merged in the webkit-1.3 branch:
commit 7a1a1452cb9c436d717103b74a6449016802c220
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 26 02:13:46 2011 +0000

    2011-01-25  Mike Reed  <reed at google.com>
    
            Reviewed by James Robinson.
    
            DrawingBufer::reset() today checks if the new size is the same as its
            m_size, and if so, returns immediately. This does not match the
            semantics of <canvas>, which wants to clear its contents anytime the
            size is specified.
            https://bugs.webkit.org/show_bug.cgi?id=53149
    
            Test: Covered by existing <canvas> tests using gpu.
    
            * platform/graphics/chromium/DrawingBufferChromium.cpp:
            (WebCore::DrawingBuffer::DrawingBuffer):
            * platform/graphics/gpu/DrawingBuffer.cpp:
            (WebCore::DrawingBuffer::reset):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76658 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index a73534e..ea06e28 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2011-01-25  Mike Reed  <reed at google.com>
+
+        Reviewed by James Robinson.
+
+        DrawingBufer::reset() today checks if the new size is the same as its
+        m_size, and if so, returns immediately. This does not match the
+        semantics of <canvas>, which wants to clear its contents anytime the
+        size is specified.
+        https://bugs.webkit.org/show_bug.cgi?id=53149
+
+        Test: Covered by existing <canvas> tests using gpu.
+
+        * platform/graphics/chromium/DrawingBufferChromium.cpp:
+        (WebCore::DrawingBuffer::DrawingBuffer):
+        * platform/graphics/gpu/DrawingBuffer.cpp:
+        (WebCore::DrawingBuffer::reset):
+
 2011-01-25  Cris Neckar  <cdn at chromium.org>
 
         Reviewed by Adam Barth.
diff --git a/Source/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp b/Source/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp
index 2d4ca41..9d9ef5c 100644
--- a/Source/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp
+++ b/Source/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp
@@ -72,7 +72,7 @@ DrawingBuffer::DrawingBuffer(GraphicsContext3D* context,
                              bool multisampleExtensionSupported,
                              bool packedDepthStencilExtensionSupported)
     : m_context(context)
-    , m_size(-1, -1)
+    , m_size(size)
     , m_multisampleExtensionSupported(multisampleExtensionSupported)
     , m_packedDepthStencilExtensionSupported(packedDepthStencilExtensionSupported)
     , m_fbo(0)
diff --git a/Source/WebCore/platform/graphics/gpu/DrawingBuffer.cpp b/Source/WebCore/platform/graphics/gpu/DrawingBuffer.cpp
index 374a534..fd905c9 100644
--- a/Source/WebCore/platform/graphics/gpu/DrawingBuffer.cpp
+++ b/Source/WebCore/platform/graphics/gpu/DrawingBuffer.cpp
@@ -145,8 +145,6 @@ void DrawingBuffer::resizeDepthStencil(int sampleCount)
 
 void DrawingBuffer::reset(const IntSize& newSize)
 {
-    if (m_size == newSize)
-        return;
     m_size = newSize;
 
     if (!m_context)

-- 
WebKit Debian packaging