[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
zmo at google.com
zmo at google.com
Wed Dec 22 18:20:56 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 1cfa85c92e492f100fd45d98b843b93c45935806
Author: zmo at google.com <zmo at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Dec 10 01:58:47 2010 +0000
2010-12-09 Zhenyao Mo <zmo at google.com>
Reviewed by Kenneth Russell.
Expose constructor functions for instanceof checks of WebGL objects
https://bugs.webkit.org/show_bug.cgi?id=36512
Test: fast/canvas/webgl/instanceof-test.html
* bindings/generic/RuntimeEnabledFeatures.h:
(WebCore::RuntimeEnabledFeatures::webGLActiveInfoEnabled):
(WebCore::RuntimeEnabledFeatures::webGLBufferEnabled):
(WebCore::RuntimeEnabledFeatures::webGLFramebufferEnabled):
(WebCore::RuntimeEnabledFeatures::webGLProgramEnabled):
(WebCore::RuntimeEnabledFeatures::webGLRenderbufferEnabled):
(WebCore::RuntimeEnabledFeatures::webGLShaderEnabled):
(WebCore::RuntimeEnabledFeatures::webGLTextureEnabled):
(WebCore::RuntimeEnabledFeatures::webGLUniformLocationEnabled):
* html/canvas/WebGLActiveInfo.idl: Remove OmitConstructor.
* html/canvas/WebGLBuffer.idl: Ditto.
* html/canvas/WebGLFramebuffer.idl: Ditto.
* html/canvas/WebGLProgram.idl: Ditto.
* html/canvas/WebGLRenderbuffer.idl: Ditto.
* html/canvas/WebGLShader.idl: Ditto.
* html/canvas/WebGLTexture.idl: Ditto.
* html/canvas/WebGLUniformLocation.idl: Ditto.
* page/DOMWindow.idl: Expose constructors for WebGL objects in DOMWindow.
2010-12-09 Zhenyao Mo <zmo at google.com>
Reviewed by Kenneth Russell.
Expose constructor functions for instanceof checks of WebGL objects
https://bugs.webkit.org/show_bug.cgi?id=36512
* fast/canvas/webgl/instanceof-test-expected.txt: Added.
* fast/canvas/webgl/instanceof-test.html: Added.
* fast/dom/Window/script-tests/window-property-descriptors.js: Register newly added WebGL objects.
* fast/dom/Window/window-properties.html: Ditto.
* fast/dom/script-tests/prototype-inheritance-2.js: Ditto.
(constructorNamesForWindow):
* fast/dom/script-tests/prototype-inheritance.js: Ditto.
* fast/js/script-tests/global-constructors.js: Ditto.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73669 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 55f133a..90712e0 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,19 @@
+2010-12-09 Zhenyao Mo <zmo at google.com>
+
+ Reviewed by Kenneth Russell.
+
+ Expose constructor functions for instanceof checks of WebGL objects
+ https://bugs.webkit.org/show_bug.cgi?id=36512
+
+ * fast/canvas/webgl/instanceof-test-expected.txt: Added.
+ * fast/canvas/webgl/instanceof-test.html: Added.
+ * fast/dom/Window/script-tests/window-property-descriptors.js: Register newly added WebGL objects.
+ * fast/dom/Window/window-properties.html: Ditto.
+ * fast/dom/script-tests/prototype-inheritance-2.js: Ditto.
+ (constructorNamesForWindow):
+ * fast/dom/script-tests/prototype-inheritance.js: Ditto.
+ * fast/js/script-tests/global-constructors.js: Ditto.
+
2010-12-09 James Robinson <jamesr at chromium.org>
Reviewed by Kenneth Russell.
diff --git a/LayoutTests/fast/canvas/webgl/instanceof-test-expected.txt b/LayoutTests/fast/canvas/webgl/instanceof-test-expected.txt
new file mode 100644
index 0000000..dff1867
--- /dev/null
+++ b/LayoutTests/fast/canvas/webgl/instanceof-test-expected.txt
@@ -0,0 +1,28 @@
+ Tests that instanceof works on WebGL objects.
+
+PASS gl instanceof WebGLRenderingContext is true
+PASS gl.createBuffer() instanceof WebGLBuffer is true
+PASS gl.createFramebuffer() instanceof WebGLFramebuffer is true
+PASS gl.createProgram() instanceof WebGLProgram is true
+PASS gl.createRenderbuffer() instanceof WebGLRenderbuffer is true
+PASS gl.createShader(gl.VERTEX_SHADER) instanceof WebGLShader is true
+PASS gl.createTexture() instanceof WebGLTexture is true
+PASS gl.getUniformLocation(program, "color") instanceof WebGLUniformLocation is true
+PASS gl.getActiveAttrib(program, 0) instanceof WebGLActiveInfo is true
+PASS gl.getActiveUniform(program, 0) instanceof WebGLActiveInfo is true
+
+Tests that those WebGL objects can not be constructed through new operator
+
+PASS new WebGLRenderingContext threw an error
+PASS new WebGLActiveInfo threw an error
+PASS new WebGLBuffer threw an error
+PASS new WebGLFramebuffer threw an error
+PASS new WebGLProgram threw an error
+PASS new WebGLRenderbuffer threw an error
+PASS new WebGLShader threw an error
+PASS new WebGLTexture threw an error
+PASS new WebGLUniformLocation threw an error
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
diff --git a/LayoutTests/fast/canvas/webgl/instanceof-test.html b/LayoutTests/fast/canvas/webgl/instanceof-test.html
new file mode 100644
index 0000000..4feffe1
--- /dev/null
+++ b/LayoutTests/fast/canvas/webgl/instanceof-test.html
@@ -0,0 +1,92 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+ "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<title>WebGL instanceof test.</title>
+<link rel="stylesheet" href="../../js/resources/js-test-style.css"/>
+<script src="../../js/resources/js-test-pre.js"></script>
+<script src="resources/webgl-test.js"> </script>
+<script src="resources/webgl-test-utils.js"> </script>
+</head>
+<body>
+<canvas id="canvas" width="2" height="2" style="width: 40px; height: 40px;"></canvas>
+<div id="description"></div>
+<div id="console"></div>
+<script id="vshader" type="x-shader/x-vertex">
+attribute vec4 vPosition;
+varying vec2 texCoord;
+void main()
+{
+ gl_Position = vPosition;
+}
+</script>
+
+<script id="fshader" type="x-shader/x-fragment">
+#ifdef GL_ES
+precision mediump float;
+#endif
+uniform vec4 color;
+void main()
+{
+ gl_FragColor = color;
+}
+</script>
+<script>
+var wtu = WebGLTestUtils;
+debug("Tests that instanceof works on WebGL objects.");
+debug("");
+var gl = create3DContext(document.getElementById("canvas"));
+shouldBeTrue('gl instanceof WebGLRenderingContext');
+shouldBeTrue('gl.createBuffer() instanceof WebGLBuffer');
+shouldBeTrue('gl.createFramebuffer() instanceof WebGLFramebuffer');
+shouldBeTrue('gl.createProgram() instanceof WebGLProgram');
+shouldBeTrue('gl.createRenderbuffer() instanceof WebGLRenderbuffer');
+shouldBeTrue('gl.createShader(gl.VERTEX_SHADER) instanceof WebGLShader');
+shouldBeTrue('gl.createTexture() instanceof WebGLTexture');
+
+var program = wtu.setupProgram(
+ gl,
+ [wtu.loadShaderFromScript(gl, 'vshader', gl.VERTEX_SHADER),
+ wtu.loadShaderFromScript(gl, 'fshader', gl.FRAGMENT_SHADER)],
+ ['vPosition'], [0]);
+
+shouldBeTrue('gl.getUniformLocation(program, "color") instanceof WebGLUniformLocation');
+shouldBeTrue('gl.getActiveAttrib(program, 0) instanceof WebGLActiveInfo');
+shouldBeTrue('gl.getActiveUniform(program, 0) instanceof WebGLActiveInfo');
+
+debug("");
+debug("Tests that those WebGL objects can not be constructed through new operator");
+debug("");
+
+function shouldThrowWithNew(objectType, objectName)
+{
+ try {
+ new objectType;
+ testFailed('new ' + objectName + ' did not throw');
+ } catch (e) {
+ testPassed('new ' + objectName + ' threw an error');
+ }
+}
+
+shouldThrowWithNew(WebGLRenderingContext, 'WebGLRenderingContext');
+shouldThrowWithNew(WebGLActiveInfo, 'WebGLActiveInfo');
+shouldThrowWithNew(WebGLBuffer, 'WebGLBuffer');
+shouldThrowWithNew(WebGLFramebuffer, 'WebGLFramebuffer');
+shouldThrowWithNew(WebGLProgram, 'WebGLProgram');
+shouldThrowWithNew(WebGLRenderbuffer, 'WebGLRenderbuffer');
+shouldThrowWithNew(WebGLShader, 'WebGLShader');
+shouldThrowWithNew(WebGLTexture, 'WebGLTexture');
+shouldThrowWithNew(WebGLUniformLocation, 'WebGLUniformLocation');
+
+successfullyParsed = true;
+</script>
+</body>
+<script src="../../js/resources/js-test-post.js"></script>
+
+<script>
+</script>
+
+</body>
+</html>
+
+
diff --git a/LayoutTests/fast/dom/Window/script-tests/window-property-descriptors.js b/LayoutTests/fast/dom/Window/script-tests/window-property-descriptors.js
index 1a79692..0df8456 100644
--- a/LayoutTests/fast/dom/Window/script-tests/window-property-descriptors.js
+++ b/LayoutTests/fast/dom/Window/script-tests/window-property-descriptors.js
@@ -20,6 +20,14 @@ var __skip__ = {
"textInputController" : 1,
// Ignore these properties because they do not exist in all implementations. They will be tested separately
"WebGLRenderingContext" : 1,
+ "WebGLActiveInfo" : 1,
+ "WebGLBuffer" : 1,
+ "WebGLFramebuffer" : 1,
+ "WebGLProgram" : 1,
+ "WebGLRenderbuffer" : 1,
+ "WebGLShader" : 1,
+ "WebGLTexture" : 1,
+ "WebGLUniformLocation" : 1,
"ArrayBuffer" : 1,
"DataView" : 1,
"Int8Array" : 1,
diff --git a/LayoutTests/fast/dom/Window/window-properties.html b/LayoutTests/fast/dom/Window/window-properties.html
index fa1eb54..241113a 100644
--- a/LayoutTests/fast/dom/Window/window-properties.html
+++ b/LayoutTests/fast/dom/Window/window-properties.html
@@ -62,6 +62,14 @@ var __skip__ = {
"window.textInputController" : 1,
// Ignore these properties because they do not exist in all implementations. They will be tested separately
"window.WebGLRenderingContext" : 1,
+ "window.WebGLActiveInfo" : 1,
+ "window.WebGLBuffer" : 1,
+ "window.WebGLFramebuffer" : 1,
+ "window.WebGLProgram" : 1,
+ "window.WebGLRenderbuffer" : 1,
+ "window.WebGLShader" : 1,
+ "window.WebGLTexture" : 1,
+ "window.WebGLUniformLocation" : 1,
"window.ArrayBuffer" : 1,
"window.DataView" : 1,
"window.Int8Array" : 1,
diff --git a/LayoutTests/fast/dom/script-tests/prototype-inheritance-2.js b/LayoutTests/fast/dom/script-tests/prototype-inheritance-2.js
index 2309106..07c002c 100644
--- a/LayoutTests/fast/dom/script-tests/prototype-inheritance-2.js
+++ b/LayoutTests/fast/dom/script-tests/prototype-inheritance-2.js
@@ -59,7 +59,15 @@ function constructorNamesForWindow(globalObject)
continue;
var type = classNameForObject(value);
// Ignore these properties because they do not exist in all implementations. They will be tested separately
- if (type == "WebGLRenderingContextConstructor" ||
+ if (type == "WebGLRenderingContextConstructor" ||
+ type == "WebGLActiveInfoConstructor" ||
+ type == "WebGLBufferConstructor" ||
+ type == "WebGLFramebufferConstructor" ||
+ type == "WebGLProgramConstructor" ||
+ type == "WebGLRenderbufferConstructor" ||
+ type == "WebGLShaderConstructor" ||
+ type == "WebGLTextureConstructor" ||
+ type == "WebGLUniformLocationConstructor" ||
type == "ArrayBufferConstructor" ||
type == "DataViewConstructor" ||
type =="Float32ArrayConstructor" ||
diff --git a/LayoutTests/fast/dom/script-tests/prototype-inheritance.js b/LayoutTests/fast/dom/script-tests/prototype-inheritance.js
index 822ccb3..3afc7a9 100644
--- a/LayoutTests/fast/dom/script-tests/prototype-inheritance.js
+++ b/LayoutTests/fast/dom/script-tests/prototype-inheritance.js
@@ -15,7 +15,7 @@ var skippedProperties = [
// Ignore these properties because they do not exist in all implementations. They will be tested separately
"webkitNotifications",
"webkitPerformance",
- "WebGLRenderingContext",
+ "WebGLRenderingContext", "WebGLActiveInfo", "WebGLBuffer", "WebGLFramebuffer", "WebGLProgram", "WebGLRenderbuffer", "WebGLShader", "WebGLTexture", "WebGLUniformLocation",
"ArrayBuffer",
"DataView", "Int8Array", "Uint8Array", "Int16Array", "Uint16Array", "Int32Array", "Uint32Array", "Float32Array",
"FileError", "FileReader", "requestFileSystem",
diff --git a/LayoutTests/fast/js/script-tests/global-constructors.js b/LayoutTests/fast/js/script-tests/global-constructors.js
index d6c15e5..1124a58 100644
--- a/LayoutTests/fast/js/script-tests/global-constructors.js
+++ b/LayoutTests/fast/js/script-tests/global-constructors.js
@@ -18,6 +18,14 @@ for (var x in constructorNames) {
// Ignore these properties because they do not exist in all implementations. They will be tested separately
if (name == "WebGLRenderingContext" ||
+ name == "WebGLActiveInfo" ||
+ name == "WebGLBuffer" ||
+ name == "WebGLFramebuffer" ||
+ name == "WebGLProgram" ||
+ name == "WebGLRenderbuffer" ||
+ name == "WebGLShader" ||
+ name == "WebGLTexture" ||
+ name == "WebGLUniformLocation" ||
name == "ArrayBuffer" ||
name == "DataView" ||
name == "Int8Array" ||
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 67a1ef2..ab667b7 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,31 @@
+2010-12-09 Zhenyao Mo <zmo at google.com>
+
+ Reviewed by Kenneth Russell.
+
+ Expose constructor functions for instanceof checks of WebGL objects
+ https://bugs.webkit.org/show_bug.cgi?id=36512
+
+ Test: fast/canvas/webgl/instanceof-test.html
+
+ * bindings/generic/RuntimeEnabledFeatures.h:
+ (WebCore::RuntimeEnabledFeatures::webGLActiveInfoEnabled):
+ (WebCore::RuntimeEnabledFeatures::webGLBufferEnabled):
+ (WebCore::RuntimeEnabledFeatures::webGLFramebufferEnabled):
+ (WebCore::RuntimeEnabledFeatures::webGLProgramEnabled):
+ (WebCore::RuntimeEnabledFeatures::webGLRenderbufferEnabled):
+ (WebCore::RuntimeEnabledFeatures::webGLShaderEnabled):
+ (WebCore::RuntimeEnabledFeatures::webGLTextureEnabled):
+ (WebCore::RuntimeEnabledFeatures::webGLUniformLocationEnabled):
+ * html/canvas/WebGLActiveInfo.idl: Remove OmitConstructor.
+ * html/canvas/WebGLBuffer.idl: Ditto.
+ * html/canvas/WebGLFramebuffer.idl: Ditto.
+ * html/canvas/WebGLProgram.idl: Ditto.
+ * html/canvas/WebGLRenderbuffer.idl: Ditto.
+ * html/canvas/WebGLShader.idl: Ditto.
+ * html/canvas/WebGLTexture.idl: Ditto.
+ * html/canvas/WebGLUniformLocation.idl: Ditto.
+ * page/DOMWindow.idl: Expose constructors for WebGL objects in DOMWindow.
+
2010-12-09 Timothy Hatcher <timothy at apple.com>
Export Color::white and Color::transparent.
diff --git a/WebCore/bindings/generic/RuntimeEnabledFeatures.h b/WebCore/bindings/generic/RuntimeEnabledFeatures.h
index 33432ce..343c535 100644
--- a/WebCore/bindings/generic/RuntimeEnabledFeatures.h
+++ b/WebCore/bindings/generic/RuntimeEnabledFeatures.h
@@ -112,6 +112,14 @@ public:
static bool webGLIntArrayEnabled() { return isWebGLEnabled; }
static bool webGLUnsignedIntArrayEnabled() { return isWebGLEnabled; }
static bool webGLFloatArrayEnabled() { return isWebGLEnabled; }
+ static bool webGLActiveInfoEnabled() { return isWebGLEnabled; }
+ static bool webGLBufferEnabled() { return isWebGLEnabled; }
+ static bool webGLFramebufferEnabled() { return isWebGLEnabled; }
+ static bool webGLProgramEnabled() { return isWebGLEnabled; }
+ static bool webGLRenderbufferEnabled() { return isWebGLEnabled; }
+ static bool webGLShaderEnabled() { return isWebGLEnabled; }
+ static bool webGLTextureEnabled() { return isWebGLEnabled; }
+ static bool webGLUniformLocationEnabled() { return isWebGLEnabled; }
#endif
static void setPushStateEnabled(bool isEnabled) { isPushStateEnabled = isEnabled; }
diff --git a/WebCore/html/canvas/WebGLActiveInfo.idl b/WebCore/html/canvas/WebGLActiveInfo.idl
index 17bb4d6..28f7136 100644
--- a/WebCore/html/canvas/WebGLActiveInfo.idl
+++ b/WebCore/html/canvas/WebGLActiveInfo.idl
@@ -26,8 +26,7 @@
module html {
interface [
- Conditional=3D_CANVAS,
- OmitConstructor
+ Conditional=3D_CANVAS
] WebGLActiveInfo {
readonly attribute int size;
readonly attribute unsigned int type;
diff --git a/WebCore/html/canvas/WebGLBuffer.idl b/WebCore/html/canvas/WebGLBuffer.idl
index 9dd97c0..30b7606 100644
--- a/WebCore/html/canvas/WebGLBuffer.idl
+++ b/WebCore/html/canvas/WebGLBuffer.idl
@@ -24,6 +24,6 @@
*/
module html {
- interface [Conditional=3D_CANVAS, OmitConstructor] WebGLBuffer {
+ interface [Conditional=3D_CANVAS] WebGLBuffer {
};
}
diff --git a/WebCore/html/canvas/WebGLFramebuffer.idl b/WebCore/html/canvas/WebGLFramebuffer.idl
index f433352..8c1d9fd 100644
--- a/WebCore/html/canvas/WebGLFramebuffer.idl
+++ b/WebCore/html/canvas/WebGLFramebuffer.idl
@@ -24,6 +24,6 @@
*/
module html {
- interface [Conditional=3D_CANVAS, OmitConstructor] WebGLFramebuffer {
+ interface [Conditional=3D_CANVAS] WebGLFramebuffer {
};
}
diff --git a/WebCore/html/canvas/WebGLProgram.idl b/WebCore/html/canvas/WebGLProgram.idl
index 47e5cda..562fa3a 100644
--- a/WebCore/html/canvas/WebGLProgram.idl
+++ b/WebCore/html/canvas/WebGLProgram.idl
@@ -24,6 +24,6 @@
*/
module html {
- interface [Conditional=3D_CANVAS, OmitConstructor] WebGLProgram {
+ interface [Conditional=3D_CANVAS] WebGLProgram {
};
}
diff --git a/WebCore/html/canvas/WebGLRenderbuffer.idl b/WebCore/html/canvas/WebGLRenderbuffer.idl
index 6a4fc35..2524433 100644
--- a/WebCore/html/canvas/WebGLRenderbuffer.idl
+++ b/WebCore/html/canvas/WebGLRenderbuffer.idl
@@ -24,6 +24,6 @@
*/
module html {
- interface [Conditional=3D_CANVAS, OmitConstructor] WebGLRenderbuffer {
+ interface [Conditional=3D_CANVAS] WebGLRenderbuffer {
};
}
diff --git a/WebCore/html/canvas/WebGLShader.idl b/WebCore/html/canvas/WebGLShader.idl
index 2d79e49..45e7f54 100644
--- a/WebCore/html/canvas/WebGLShader.idl
+++ b/WebCore/html/canvas/WebGLShader.idl
@@ -24,6 +24,6 @@
*/
module html {
- interface [Conditional=3D_CANVAS, OmitConstructor] WebGLShader {
+ interface [Conditional=3D_CANVAS] WebGLShader {
};
}
diff --git a/WebCore/html/canvas/WebGLTexture.idl b/WebCore/html/canvas/WebGLTexture.idl
index 0200e7e..da7e066 100644
--- a/WebCore/html/canvas/WebGLTexture.idl
+++ b/WebCore/html/canvas/WebGLTexture.idl
@@ -24,6 +24,6 @@
*/
module html {
- interface [Conditional=3D_CANVAS, OmitConstructor] WebGLTexture {
+ interface [Conditional=3D_CANVAS] WebGLTexture {
};
}
diff --git a/WebCore/html/canvas/WebGLUniformLocation.idl b/WebCore/html/canvas/WebGLUniformLocation.idl
index f25e834..b080241 100644
--- a/WebCore/html/canvas/WebGLUniformLocation.idl
+++ b/WebCore/html/canvas/WebGLUniformLocation.idl
@@ -25,6 +25,6 @@
*/
module html {
- interface [Conditional=3D_CANVAS, OmitConstructor] WebGLUniformLocation {
+ interface [Conditional=3D_CANVAS] WebGLUniformLocation {
};
}
diff --git a/WebCore/page/DOMWindow.idl b/WebCore/page/DOMWindow.idl
index 3030c25..b2f4085 100644
--- a/WebCore/page/DOMWindow.idl
+++ b/WebCore/page/DOMWindow.idl
@@ -485,7 +485,15 @@ module window {
attribute CanvasGradientConstructor CanvasGradient;
attribute CanvasRenderingContext2DConstructor CanvasRenderingContext2D;
attribute ImageDataConstructor ImageData;
+ attribute [Conditional=3D_CANVAS,EnabledAtRuntime] WebGLActiveInfoConstructor WebGLActiveInfo;
+ attribute [Conditional=3D_CANVAS,EnabledAtRuntime] WebGLBufferConstructor WebGLBuffer;
+ attribute [Conditional=3D_CANVAS,EnabledAtRuntime] WebGLFramebufferConstructor WebGLFramebuffer;
+ attribute [Conditional=3D_CANVAS,EnabledAtRuntime] WebGLProgramConstructor WebGLProgram;
+ attribute [Conditional=3D_CANVAS,EnabledAtRuntime] WebGLRenderbufferConstructor WebGLRenderbuffer;
attribute [Conditional=3D_CANVAS,EnabledAtRuntime] WebGLRenderingContextConstructor WebGLRenderingContext;
+ attribute [Conditional=3D_CANVAS,EnabledAtRuntime] WebGLShaderConstructor WebGLShader;
+ attribute [Conditional=3D_CANVAS,EnabledAtRuntime] WebGLTextureConstructor WebGLTexture;
+ attribute [Conditional=3D_CANVAS,EnabledAtRuntime] WebGLUniformLocationConstructor WebGLUniformLocation;
attribute TextMetricsConstructor TextMetrics;
attribute DOMStringMapConstructor DOMStringMap;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list