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

[vangelis at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 7670299f9f2f6149f3af8e293c0766ff2fe025d9
Author: vangelis at chromium.org <vangelis at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Aug 28 00:57:00 2010 +0000

    2010-08-26  Vangelis Kokkevis  <vangelis at chromium.org>
    
            Reviewed by Darin Fisher.
    
            [chromium] Working around compile issue in LayerRendererChromium.cpp
            when DEBUG_GL_CALLS=1
            https://bugs.webkit.org/show_bug.cgi?id=44739
    
            No new functionality, no new tests.
    
            * platform/graphics/chromium/LayerRendererChromium.cpp:
            (WebCore::LayerRendererChromium::drawLayerIntoStencilBuffer):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66287 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1f74fd2..9e296f2 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-08-26  Vangelis Kokkevis  <vangelis at chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        [chromium] Working around compile issue in LayerRendererChromium.cpp
+        when DEBUG_GL_CALLS=1
+        https://bugs.webkit.org/show_bug.cgi?id=44739
+
+        No new functionality, no new tests.
+
+        * platform/graphics/chromium/LayerRendererChromium.cpp:
+        (WebCore::LayerRendererChromium::drawLayerIntoStencilBuffer):
+
 2010-08-27  Patrick Gansterer  <paroga at paroga.com>
 
         Reviewed by Adam Roben.
diff --git a/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp b/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp
index e87d63e..50338d2 100644
--- a/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp
+++ b/WebCore/platform/graphics/chromium/LayerRendererChromium.cpp
@@ -438,10 +438,8 @@ void LayerRendererChromium::drawLayerIntoStencilBuffer(LayerChromium* layer, boo
     // by one for every pixel under the current layer.
     GLC(glStencilMask(0xff));
     GLC(glStencilFunc(GL_ALWAYS, 1, 0xff));
-    if (decrement)
-        GLC(glStencilOp(GL_DECR, GL_DECR, GL_DECR));
-    else
-        GLC(glStencilOp(GL_INCR, GL_INCR, GL_INCR));
+    GLenum stencilOp = (decrement ? GL_DECR : GL_INCR);
+    GLC(glStencilOp(stencilOp, stencilOp, stencilOp));
 
     GLC(glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE));
 

-- 
WebKit Debian packaging