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

[zmo at google.com]

The following commit has been merged in the debian/experimental branch:
commit 49126c38b1c5fd71118463d6db6d5f5f818ad977
Author: zmo at google.com <zmo at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 4 00:49:21 2010 +0000

    2010-11-03  Zhenyao Mo  <zmo at google.com>
    
            Reviewed by Kenneth Russell.
    
            depthRange should generate INVALID_OPERATION if zNear is greater than zFar
            https://bugs.webkit.org/show_bug.cgi?id=48676
    
            * html/canvas/WebGLRenderingContext.cpp:
            (WebCore::WebGLRenderingContext::depthRange):
    2010-11-03  Zhenyao Mo  <zmo at google.com>
    
            Reviewed by Kenneth Russell.
    
            depthRange should generate INVALID_OPERATION if zNear is greater than zFar
            https://bugs.webkit.org/show_bug.cgi?id=48676
    
            * fast/canvas/webgl/webgl-specific-expected.txt:
            * fast/canvas/webgl/webgl-specific.html:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71291 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 8b404e8..9e33a55 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-03  Zhenyao Mo  <zmo at google.com>
+
+        Reviewed by Kenneth Russell.
+
+        depthRange should generate INVALID_OPERATION if zNear is greater than zFar
+        https://bugs.webkit.org/show_bug.cgi?id=48676
+
+        * fast/canvas/webgl/webgl-specific-expected.txt:
+        * fast/canvas/webgl/webgl-specific.html:
+
 2010-11-03  Dumitru Daniliuc  <dumi at chromium.org>
 
         Unreviewed, updating Chromium expectations.
diff --git a/LayoutTests/fast/canvas/webgl/webgl-specific-expected.txt b/LayoutTests/fast/canvas/webgl/webgl-specific-expected.txt
index 192bc50..b5ce20b 100644
--- a/LayoutTests/fast/canvas/webgl/webgl-specific-expected.txt
+++ b/LayoutTests/fast/canvas/webgl/webgl-specific-expected.txt
@@ -18,6 +18,7 @@ PASS getError was expected value: INVALID_OPERATION : constant color and constan
 PASS getError was expected value: INVALID_OPERATION : constant color and constant alpha cannot be used together as source and destination factors in the blend function
 PASS getError was expected value: INVALID_OPERATION : constant color and constant alpha cannot be used together as source and destination factors in the blend function
 PASS getError was expected value: INVALID_OPERATION : constant color and constant alpha cannot be used together as source and destination factors in the blend function
+PASS getError was expected value: INVALID_OPERATION : depthRange should generate INVALID_OPERATION if zNear is greater than zFar
 PASS getError was expected value: NO_ERROR : stencilMask should generate no error
 PASS getError was expected value: INVALID_OPERATION : a different mask value for front and back facing is illegal
 PASS getError was expected value: INVALID_OPERATION : a different mask value for front and back facing is illegal
diff --git a/LayoutTests/fast/canvas/webgl/webgl-specific.html b/LayoutTests/fast/canvas/webgl/webgl-specific.html
index b84cafb..a8f55f8 100644
--- a/LayoutTests/fast/canvas/webgl/webgl-specific.html
+++ b/LayoutTests/fast/canvas/webgl/webgl-specific.html
@@ -68,11 +68,9 @@ gl.blendFuncSeparate(gl.ONE_MINUS_CONSTANT_ALPHA, gl.ONE_MINUS_CONSTANT_COLOR, g
 glErrorShouldBe(gl, gl.INVALID_OPERATION,
     "constant color and constant alpha cannot be used together as source and destination factors in the blend function");
 
-/*
 gl.depthRange(20, 10);
 glErrorShouldBe(gl, gl.INVALID_OPERATION,
     "depthRange should generate INVALID_OPERATION if zNear is greater than zFar");
-*/
 
 gl.stencilMask(255);
 glErrorShouldBe(gl, gl.NO_ERROR,
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4f85e64..15009f4 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-03  Zhenyao Mo  <zmo at google.com>
+
+        Reviewed by Kenneth Russell.
+
+        depthRange should generate INVALID_OPERATION if zNear is greater than zFar
+        https://bugs.webkit.org/show_bug.cgi?id=48676
+
+        * html/canvas/WebGLRenderingContext.cpp:
+        (WebCore::WebGLRenderingContext::depthRange):
+
 2010-11-03  Adrienne Walker  <enne at google.com>
 
         Reviewed by Kenneth Russell.
diff --git a/WebCore/html/canvas/WebGLRenderingContext.cpp b/WebCore/html/canvas/WebGLRenderingContext.cpp
index 8417d35..f53f009 100644
--- a/WebCore/html/canvas/WebGLRenderingContext.cpp
+++ b/WebCore/html/canvas/WebGLRenderingContext.cpp
@@ -790,6 +790,10 @@ void WebGLRenderingContext::depthRange(double zNear, double zFar)
 {
     if (isContextLost())
         return;
+    if (zNear > zFar) {
+        m_context->synthesizeGLError(GraphicsContext3D::INVALID_OPERATION);
+        return;
+    }
     m_context->depthRange(zNear, zFar);
     cleanupAfterGraphicsCall(false);
 }

-- 
WebKit Debian packaging