[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

zmo at google.com zmo at google.com
Fri Jan 21 15:07:52 UTC 2011


The following commit has been merged in the debian/experimental branch:
commit 9918d14d8d6284fc2245a3253832a5550571a8d6
Author: zmo at google.com <zmo at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 7 17:51:36 2011 +0000

    2011-01-07  Takashi Toyoshima  <toyoshim at google.com>
    
            Reviewed by Kenneth Russell.
    
            cleanupAfterGraphicsCall() is never called in
            WebGLRenderingContext::checkFramebufferStatus()
            https://bugs.webkit.org/show_bug.cgi?id=51668
    
            No new tests. This is a trivial bug.
    
            * html/canvas/WebGLRenderingContext.cpp:
            (WebCore::WebGLRenderingContext::checkFramebufferStatus):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75251 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e9db153..bc2e248 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2011-01-07  Takashi Toyoshima  <toyoshim at google.com>
+
+        Reviewed by Kenneth Russell.
+
+        cleanupAfterGraphicsCall() is never called in
+        WebGLRenderingContext::checkFramebufferStatus()
+        https://bugs.webkit.org/show_bug.cgi?id=51668
+
+        No new tests. This is a trivial bug.
+
+        * html/canvas/WebGLRenderingContext.cpp:
+        (WebCore::WebGLRenderingContext::checkFramebufferStatus):
+
 2011-01-07  Mario Sanchez Prada  <msanchez at igalia.com>
 
         Reviewed by Chris Fleizach.
diff --git a/WebCore/html/canvas/WebGLRenderingContext.cpp b/WebCore/html/canvas/WebGLRenderingContext.cpp
index 94f326d..cc92fd0 100644
--- a/WebCore/html/canvas/WebGLRenderingContext.cpp
+++ b/WebCore/html/canvas/WebGLRenderingContext.cpp
@@ -598,8 +598,9 @@ unsigned long WebGLRenderingContext::checkFramebufferStatus(unsigned long target
         return GraphicsContext3D::FRAMEBUFFER_COMPLETE;
     if (m_framebufferBinding->isIncomplete(true))
         return GraphicsContext3D::FRAMEBUFFER_UNSUPPORTED;
-    return m_context->checkFramebufferStatus(target);
+    unsigned long result = m_context->checkFramebufferStatus(target);
     cleanupAfterGraphicsCall(false);
+    return result;
 }
 
 void WebGLRenderingContext::clear(unsigned long mask)

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list