[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
zmo at google.com
zmo at google.com
Wed Dec 22 12:02:04 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 51cb1660ebcef848208cf231e56f167b2f678409
Author: zmo at google.com <zmo at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Aug 12 23:14:19 2010 +0000
2010-08-12 Zhenyao Mo <zmo at google.com>
Reviewed by Dimitri Glazkov.
getParameter(STENCIL_VALUE_MASK) (and others) returns the wrong value
https://bugs.webkit.org/show_bug.cgi?id=31842
* html/canvas/WebGLRenderingContext.cpp:
(WebCore::WebGLRenderingContext::getUnsignedLongParameter): Casting from int to unsigned long correctly.
2010-08-12 Zhenyao Mo <zmo at google.com>
Reviewed by Dimitri Glazkov.
getParameter(STENCIL_VALUE_MASK) (and others) returns the wrong value
https://bugs.webkit.org/show_bug.cgi?id=31842
* fast/canvas/webgl/gl-get-calls-expected.txt: Bring back the commented out STENCIL tests.
* fast/canvas/webgl/gl-get-calls.html: Ditto.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65279 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index ba525cb..d9c52b3 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -2,6 +2,16 @@
Reviewed by Dimitri Glazkov.
+ getParameter(STENCIL_VALUE_MASK) (and others) returns the wrong value
+ https://bugs.webkit.org/show_bug.cgi?id=31842
+
+ * fast/canvas/webgl/gl-get-calls-expected.txt: Bring back the commented out STENCIL tests.
+ * fast/canvas/webgl/gl-get-calls.html: Ditto.
+
+2010-08-12 Zhenyao Mo <zmo at google.com>
+
+ Reviewed by Dimitri Glazkov.
+
regression in generateMipmap
https://bugs.webkit.org/show_bug.cgi?id=43873
diff --git a/LayoutTests/fast/canvas/webgl/gl-get-calls-expected.txt b/LayoutTests/fast/canvas/webgl/gl-get-calls-expected.txt
index f13c1a4..9aee459 100644
--- a/LayoutTests/fast/canvas/webgl/gl-get-calls-expected.txt
+++ b/LayoutTests/fast/canvas/webgl/gl-get-calls-expected.txt
@@ -30,6 +30,7 @@ PASS context.getParameter(context.COLOR_WRITEMASK) is [true, true, true, true]
PASS context.getParameter(context.CULL_FACE) is false
PASS context.getParameter(context.CULL_FACE_MODE) is context.BACK
PASS context.getParameter(context.CURRENT_PROGRAM) is null
+PASS context.getParameter(context.DEPTH_CLEAR_VALUE) is 1
PASS context.getParameter(context.DEPTH_FUNC) is context.LESS
PASS context.getParameter(context.DEPTH_RANGE) is [0, 1]
PASS context.getParameter(context.DEPTH_TEST) is false
@@ -53,6 +54,8 @@ PASS context.getParameter(context.STENCIL_BACK_FUNC) is context.ALWAYS
PASS context.getParameter(context.STENCIL_BACK_PASS_DEPTH_FAIL) is context.KEEP
PASS context.getParameter(context.STENCIL_BACK_PASS_DEPTH_PASS) is context.KEEP
PASS context.getParameter(context.STENCIL_BACK_REF) is 0
+PASS context.getParameter(context.STENCIL_BACK_VALUE_MASK) is 0xFFFFFFFF
+PASS context.getParameter(context.STENCIL_BACK_WRITEMASK) is 0xFFFFFFFF
PASS context.getParameter(context.STENCIL_BITS) >= 0 is true
PASS context.getParameter(context.STENCIL_CLEAR_VALUE) is 0
PASS context.getParameter(context.STENCIL_FAIL) is context.KEEP
@@ -61,6 +64,8 @@ PASS context.getParameter(context.STENCIL_PASS_DEPTH_FAIL) is context.KEEP
PASS context.getParameter(context.STENCIL_PASS_DEPTH_PASS) is context.KEEP
PASS context.getParameter(context.STENCIL_REF) is 0
PASS context.getParameter(context.STENCIL_TEST) is false
+PASS context.getParameter(context.STENCIL_VALUE_MASK) is 0xFFFFFFFF
+PASS context.getParameter(context.STENCIL_WRITEMASK) is 0xFFFFFFFF
PASS context.getParameter(context.TEXTURE_BINDING_2D) is null
PASS context.getParameter(context.TEXTURE_BINDING_CUBE_MAP) is null
PASS context.getParameter(context.UNPACK_ALIGNMENT) is 4
@@ -71,7 +76,6 @@ PASS context.getParameter(context.MAX_FRAGMENT_UNIFORM_VECTORS) >= 16 is true
PASS context.getParameter(context.MAX_VERTEX_UNIFORM_VECTORS) >= 128 is true
PASS context.getParameter(context.MAX_VARYING_VECTORS) >= 8 is true
PASS context.getParameter(context.NUM_COMPRESSED_TEXTURE_FORMATS) is 0
-FAIL context.getParameter(context.SHADER_COMPILER) should be true (of type boolean). Was null (of type object).
PASS successfullyParsed is true
diff --git a/LayoutTests/fast/canvas/webgl/gl-get-calls.html b/LayoutTests/fast/canvas/webgl/gl-get-calls.html
index ebff636..4091a1a 100644
--- a/LayoutTests/fast/canvas/webgl/gl-get-calls.html
+++ b/LayoutTests/fast/canvas/webgl/gl-get-calls.html
@@ -31,7 +31,7 @@ else {
testPassed("context is correct type");
else
testFailed("context is not correct type");
-
+
debug("");
debug("Context contains getError");
if ("getError" in context)
@@ -58,6 +58,7 @@ else {
shouldBe('context.getParameter(context.CULL_FACE)', 'false');
shouldBe('context.getParameter(context.CULL_FACE_MODE)', 'context.BACK');
shouldBe('context.getParameter(context.CURRENT_PROGRAM)', 'null');
+ shouldBe('context.getParameter(context.DEPTH_CLEAR_VALUE)', '1');
shouldBe('context.getParameter(context.DEPTH_FUNC)', 'context.LESS');
shouldBe('context.getParameter(context.DEPTH_RANGE)', '[0, 1]');
shouldBe('context.getParameter(context.DEPTH_TEST)', 'false');
@@ -82,10 +83,8 @@ else {
shouldBe('context.getParameter(context.STENCIL_BACK_PASS_DEPTH_PASS)', 'context.KEEP');
shouldBe('context.getParameter(context.STENCIL_BACK_REF)', '0');
- // FIXME: Current WebKit implementation returns the wrong value (https://bugs.webkit.org/show_bug.cgi?id=31842)
- // Re-enable these tests as soon as that bug has been fixed.
- // shouldBe('context.getParameter(context.STENCIL_BACK_VALUE_MASK)', '0xFFFFFFFF');
- // shouldBe('context.getParameter(context.STENCIL_BACK_WRITEMASK)', '0xFFFFFFFF');
+ shouldBe('context.getParameter(context.STENCIL_BACK_VALUE_MASK)', '0xFFFFFFFF');
+ shouldBe('context.getParameter(context.STENCIL_BACK_WRITEMASK)', '0xFFFFFFFF');
// If EXT_packed_depth_stencil is supported, STENCIL_BITS > 0; otherwise, STENCIL_BITS == 0.
shouldBe('context.getParameter(context.STENCIL_BITS) >= 0', 'true');
@@ -97,10 +96,8 @@ else {
shouldBe('context.getParameter(context.STENCIL_REF)', '0');
shouldBe('context.getParameter(context.STENCIL_TEST)', 'false');
- // FIXME: Current WebKit implementation returns the wrong value (https://bugs.webkit.org/show_bug.cgi?id=31842)
- // Re-enable these tests as soon as that bug has been fixed.
- // shouldBe('context.getParameter(context.STENCIL_VALUE_MASK)', '0xFFFFFFFF');
- // shouldBe('context.getParameter(context.STENCIL_WRITEMASK)', '0xFFFFFFFF');
+ shouldBe('context.getParameter(context.STENCIL_VALUE_MASK)', '0xFFFFFFFF');
+ shouldBe('context.getParameter(context.STENCIL_WRITEMASK)', '0xFFFFFFFF');
shouldBe('context.getParameter(context.TEXTURE_BINDING_2D)', 'null');
shouldBe('context.getParameter(context.TEXTURE_BINDING_CUBE_MAP)', 'null');
@@ -112,7 +109,6 @@ else {
shouldBeTrue('context.getParameter(context.MAX_VERTEX_UNIFORM_VECTORS) >= 128');
shouldBeTrue('context.getParameter(context.MAX_VARYING_VECTORS) >= 8');
shouldBe('context.getParameter(context.NUM_COMPRESSED_TEXTURE_FORMATS)', '0');
- shouldBe('context.getParameter(context.SHADER_COMPILER)', 'true');
}
debug("");
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 01d3647..2e38ac5 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-12 Zhenyao Mo <zmo at google.com>
+
+ Reviewed by Dimitri Glazkov.
+
+ getParameter(STENCIL_VALUE_MASK) (and others) returns the wrong value
+ https://bugs.webkit.org/show_bug.cgi?id=31842
+
+ * html/canvas/WebGLRenderingContext.cpp:
+ (WebCore::WebGLRenderingContext::getUnsignedLongParameter): Casting from int to unsigned long correctly.
+
2010-08-12 Pavel Feldman <pfeldman at chromium.org>
Reviewed by Joseph Pecoraro.
diff --git a/WebCore/html/canvas/WebGLRenderingContext.cpp b/WebCore/html/canvas/WebGLRenderingContext.cpp
index efe9b03..a553b77 100644
--- a/WebCore/html/canvas/WebGLRenderingContext.cpp
+++ b/WebCore/html/canvas/WebGLRenderingContext.cpp
@@ -2951,7 +2951,8 @@ WebGLGetInfo WebGLRenderingContext::getUnsignedLongParameter(unsigned long pname
{
int value;
m_context->getIntegerv(pname, &value);
- return WebGLGetInfo(static_cast<unsigned long>(value));
+ unsigned int uValue = static_cast<unsigned int>(value);
+ return WebGLGetInfo(static_cast<unsigned long>(uValue));
}
WebGLGetInfo WebGLRenderingContext::getWebGLFloatArrayParameter(unsigned long pname)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list