[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
zimmermann at webkit.org
zimmermann at webkit.org
Wed Dec 22 14:54:34 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 5bc06862e3b8bc001fa79c40b0b524445af3cee6
Author: zimmermann at webkit.org <zimmermann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sun Oct 24 16:12:44 2010 +0000
2010-10-24 Nikolas Zimmermann <nzimmermann at rim.com>
Reviewed by Dimitri Glazkov.
Convert SVGAngle to the new SVGPropertyTearOff concept, reimplement it properly
https://bugs.webkit.org/show_bug.cgi?id=48179
Fix WebGL tests. Accept 'boolean' as valid numeric type in StrictTypeChecking mode.
* bindings/scripts/CodeGeneratorJS.pm:
* bindings/scripts/CodeGeneratorV8.pm:
2010-10-24 Nikolas Zimmermann <nzimmermann at rim.com>
Reviewed by Dimitri Glazkov.
Convert SVGAngle to the new SVGPropertyTearOff concept, reimplement it properly
https://bugs.webkit.org/show_bug.cgi?id=48179
It turns out the CodeGenerator changes are right, and the webgl tests have a problem, since StrictTypeChecking was enabled for numeric types.
When calling gl.bindAttribLocation() be sure to pass the second argument as integer, not as string.
Fixes all failing webgl tests on the snow leopard bot.
* fast/canvas/webgl/context-attributes-alpha-depth-stencil-antialias.html:
* fast/canvas/webgl/resources/webgl-test-utils.js:
(WebGLTestUtils):
* fast/canvas/webgl/resources/webgl-test.js:
(createProgram):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70414 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index ab210f8..41c764f 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,20 @@
+2010-10-24 Nikolas Zimmermann <nzimmermann at rim.com>
+
+ Reviewed by Dimitri Glazkov.
+
+ Convert SVGAngle to the new SVGPropertyTearOff concept, reimplement it properly
+ https://bugs.webkit.org/show_bug.cgi?id=48179
+
+ It turns out the CodeGenerator changes are right, and the webgl tests have a problem, since StrictTypeChecking was enabled for numeric types.
+ When calling gl.bindAttribLocation() be sure to pass the second argument as integer, not as string.
+ Fixes all failing webgl tests on the snow leopard bot.
+
+ * fast/canvas/webgl/context-attributes-alpha-depth-stencil-antialias.html:
+ * fast/canvas/webgl/resources/webgl-test-utils.js:
+ (WebGLTestUtils):
+ * fast/canvas/webgl/resources/webgl-test.js:
+ (createProgram):
+
2010-10-23 Nikolas Zimmermann <nzimmermann at rim.com>
Reviewed by Dirk Schulze.
diff --git a/LayoutTests/fast/canvas/webgl/context-attributes-alpha-depth-stencil-antialias.html b/LayoutTests/fast/canvas/webgl/context-attributes-alpha-depth-stencil-antialias.html
index 4d0bdb8..cf8b181 100644
--- a/LayoutTests/fast/canvas/webgl/context-attributes-alpha-depth-stencil-antialias.html
+++ b/LayoutTests/fast/canvas/webgl/context-attributes-alpha-depth-stencil-antialias.html
@@ -79,7 +79,7 @@ function getWebGL(canvasName, contextAttribs, clearColor, clearDepth, clearStenc
// Bind attributes
var attribs = [ "pos", "colorIn" ];
for (var i in attribs)
- gl.bindAttribLocation(gl.program, i, attribs[i]);
+ gl.bindAttribLocation(gl.program, parseInt(i), attribs[i]);
// Link the program
gl.linkProgram(gl.program);
diff --git a/LayoutTests/fast/canvas/webgl/resources/webgl-test-utils.js b/LayoutTests/fast/canvas/webgl/resources/webgl-test-utils.js
index cc1d9e3..09e4be0 100644
--- a/LayoutTests/fast/canvas/webgl/resources/webgl-test-utils.js
+++ b/LayoutTests/fast/canvas/webgl/resources/webgl-test-utils.js
@@ -568,7 +568,7 @@ var setupWebGLWithShaders = function(
// Bind attributes
for (var i in attribs) {
- gl.bindAttribLocation (program, i, attribs[i]);
+ gl.bindAttribLocation (program, parseInt(i), attribs[i]);
}
linkProgram(gl, program);
diff --git a/LayoutTests/fast/canvas/webgl/resources/webgl-test.js b/LayoutTests/fast/canvas/webgl/resources/webgl-test.js
index dcabbdd..b263a4d 100644
--- a/LayoutTests/fast/canvas/webgl/resources/webgl-test.js
+++ b/LayoutTests/fast/canvas/webgl/resources/webgl-test.js
@@ -187,7 +187,7 @@ function createProgram(gl, vshaders, fshaders, attribs)
if (attribs) {
for (var i in attribs) {
- gl.bindAttribLocation (prog, i, attribs[i]);
+ gl.bindAttribLocation (prog, parseInt(i), attribs[i]);
}
}
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6b14a83..63cb671 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,17 @@
2010-10-24 Nikolas Zimmermann <nzimmermann at rim.com>
+ Reviewed by Dimitri Glazkov.
+
+ Convert SVGAngle to the new SVGPropertyTearOff concept, reimplement it properly
+ https://bugs.webkit.org/show_bug.cgi?id=48179
+
+ Fix WebGL tests. Accept 'boolean' as valid numeric type in StrictTypeChecking mode.
+
+ * bindings/scripts/CodeGeneratorJS.pm:
+ * bindings/scripts/CodeGeneratorV8.pm:
+
+2010-10-24 Nikolas Zimmermann <nzimmermann at rim.com>
+
Reviewed by Dirk Schulze.
Convert SVGAngle to the new SVGPropertyTearOff concept, reimplement it properly
diff --git a/WebCore/bindings/scripts/CodeGeneratorJS.pm b/WebCore/bindings/scripts/CodeGeneratorJS.pm
index 671a529..6b7735a 100644
--- a/WebCore/bindings/scripts/CodeGeneratorJS.pm
+++ b/WebCore/bindings/scripts/CodeGeneratorJS.pm
@@ -1822,7 +1822,7 @@ sub GenerateImplementation
push(@implContent, " return;\n");
push(@implContent, " };\n");
} elsif ($codeGenerator->IsNumericType($argType)) {
- push(@implContent, " if (!value.isUndefinedOrNull() && !value.isNumber()) {\n");
+ push(@implContent, " if (!value.isUndefinedOrNull() && !value.isNumber() && !value.isBoolean()) {\n");
push(@implContent, " throwVMTypeError(exec);\n");
push(@implContent, " return;\n");
push(@implContent, " };\n");
@@ -2085,7 +2085,7 @@ sub GenerateImplementation
push(@implContent, " if (exec->argumentCount() > $argsIndex && !${argValue}.isUndefinedOrNull() && !${argValue}.isString() && !${argValue}.isObject())\n");
push(@implContent, " return throwVMTypeError(exec);\n");
} elsif ($codeGenerator->IsNumericType($argType)) {
- push(@implContent, " if (exec->argumentCount() > $argsIndex && !${argValue}.isUndefinedOrNull() && !${argValue}.isNumber())\n");
+ push(@implContent, " if (exec->argumentCount() > $argsIndex && !${argValue}.isUndefinedOrNull() && !${argValue}.isNumber() && !${argValue}.isBoolean())\n");
push(@implContent, " return throwVMTypeError(exec);\n");
}
}
diff --git a/WebCore/bindings/scripts/CodeGeneratorV8.pm b/WebCore/bindings/scripts/CodeGeneratorV8.pm
index fca77a2..46d9cfa 100644
--- a/WebCore/bindings/scripts/CodeGeneratorV8.pm
+++ b/WebCore/bindings/scripts/CodeGeneratorV8.pm
@@ -953,7 +953,7 @@ sub GenerateNormalAttrSetter
push(@implContentDecls, " return;\n");
push(@implContentDecls, " }\n");
} elsif ($codeGenerator->IsNumericType($argType)) {
- push(@implContentDecls, " if (!isUndefinedOrNull(value) && !value->IsNumber()) {\n");
+ push(@implContentDecls, " if (!isUndefinedOrNull(value) && !value->IsNumber() && !value->IsBoolean()) {\n");
push(@implContentDecls, " V8Proxy::throwTypeError();\n");
push(@implContentDecls, " return;\n");
push(@implContentDecls, " }\n");
@@ -1417,7 +1417,7 @@ END
push(@implContentDecls, " return notHandledByInterceptor();\n");
push(@implContentDecls, " }\n");
} elsif ($codeGenerator->IsNumericType($argType)) {
- push(@implContentDecls, " if (args.Length() > $paramIndex && !isUndefinedOrNull($argValue) && !${argValue}->IsNumber()) {\n");
+ push(@implContentDecls, " if (args.Length() > $paramIndex && !isUndefinedOrNull($argValue) && !${argValue}->IsNumber() && !${argValue}->IsBoolean()) {\n");
push(@implContentDecls, " V8Proxy::throwTypeError();\n");
push(@implContentDecls, " return notHandledByInterceptor();\n");
push(@implContentDecls, " }\n");
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list