[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 02dae9f0b2e75d48eb145ccc11d6969bb2ff6d50
Author: kbr at google.com <kbr at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 28 19:04:34 2010 +0000

    2010-10-28  Benoit Jacob  <bjacob at mozilla.com>
    
            Reviewed by Kenneth Russell.
    
            Ensure that WebGL stencil buffers are correctly initialized
            https://bugs.webkit.org/show_bug.cgi?id=48351
    
            * html/canvas/WebGLFramebuffer.cpp:
            (WebCore::WebGLFramebuffer::initializeRenderbuffers):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70793 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9f6fd98..16326a5 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-28  Benoit Jacob  <bjacob at mozilla.com>
+
+        Reviewed by Kenneth Russell.
+
+        Ensure that WebGL stencil buffers are correctly initialized
+        https://bugs.webkit.org/show_bug.cgi?id=48351
+
+        * html/canvas/WebGLFramebuffer.cpp:
+        (WebCore::WebGLFramebuffer::initializeRenderbuffers):
+
 2010-10-28  Chris Fleizach  <cfleizach at apple.com>
 
         Reviewed by Adele Peterson.
diff --git a/WebCore/html/canvas/WebGLFramebuffer.cpp b/WebCore/html/canvas/WebGLFramebuffer.cpp
index a709341..0fdcb99 100644
--- a/WebCore/html/canvas/WebGLFramebuffer.cpp
+++ b/WebCore/html/canvas/WebGLFramebuffer.cpp
@@ -177,7 +177,8 @@ void WebGLFramebuffer::initializeRenderbuffers()
 
     float colorClearValue[] = {0, 0, 0, 0}, depthClearValue = 0;
     int stencilClearValue = 0;
-    unsigned char colorMask[] = {1, 1, 1, 1}, depthMask = 1, stencilMask = 1;
+    unsigned char colorMask[] = {1, 1, 1, 1}, depthMask = 1;
+    unsigned int stencilMask = 0xffffffff;
     bool isScissorEnabled = false;
     bool isDitherEnabled = false;
     if (initColor) {
@@ -194,9 +195,9 @@ void WebGLFramebuffer::initializeRenderbuffers()
     }
     if (initStencil) {
         g3d->getIntegerv(GraphicsContext3D::STENCIL_CLEAR_VALUE, &stencilClearValue);
-        g3d->getBooleanv(GraphicsContext3D::STENCIL_WRITEMASK, &stencilMask);
+        g3d->getIntegerv(GraphicsContext3D::STENCIL_WRITEMASK, reinterpret_cast<int*>(&stencilMask));
         g3d->clearStencil(0);
-        g3d->stencilMask(true);
+        g3d->stencilMask(0xffffffff);
     }
     isScissorEnabled = g3d->isEnabled(GraphicsContext3D::SCISSOR_TEST);
     g3d->disable(GraphicsContext3D::SCISSOR_TEST);

-- 
WebKit Debian packaging