[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
oliver at apple.com
oliver at apple.com
Wed Apr 7 23:21:18 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 38c2a1bd82fe86fb5430f5f85bb78bb73d673dce
Author: oliver at apple.com <oliver at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Nov 4 01:25:52 2009 +0000
2009-11-03 Kenneth Russell <kbr at google.com>
Reviewed by Oliver Hunt.
Add overridePreference call to all WebGL layout tests
https://bugs.webkit.org/show_bug.cgi?id=31088
* fast/canvas/webgl/array-unit-tests.html:
* fast/canvas/webgl/getActiveTest.html:
* fast/canvas/webgl/gl-get-calls.html:
* fast/canvas/webgl/incorrect-context-object-behaviour.html:
* fast/canvas/webgl/null-object-behaviour.html:
* fast/canvas/webgl/resources/shader-test.js: Removed.
* fast/canvas/webgl/resources/webgl-test.js: Copied from LayoutTests/fast/canvas/webgl/resources/shader-test.js.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50492 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index c035389..b2bbb80 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,18 @@
+2009-11-03 Kenneth Russell <kbr at google.com>
+
+ Reviewed by Oliver Hunt.
+
+ Add overridePreference call to all WebGL layout tests
+ https://bugs.webkit.org/show_bug.cgi?id=31088
+
+ * fast/canvas/webgl/array-unit-tests.html:
+ * fast/canvas/webgl/getActiveTest.html:
+ * fast/canvas/webgl/gl-get-calls.html:
+ * fast/canvas/webgl/incorrect-context-object-behaviour.html:
+ * fast/canvas/webgl/null-object-behaviour.html:
+ * fast/canvas/webgl/resources/shader-test.js: Removed.
+ * fast/canvas/webgl/resources/webgl-test.js: Copied from LayoutTests/fast/canvas/webgl/resources/shader-test.js.
+
2009-11-03 Eric Z. Ayers <zundel at google.com>
Reviewed by Timothy Hatcher.
diff --git a/LayoutTests/fast/canvas/webgl/array-unit-tests.html b/LayoutTests/fast/canvas/webgl/array-unit-tests.html
index cbadd1f..50af025 100644
--- a/LayoutTests/fast/canvas/webgl/array-unit-tests.html
+++ b/LayoutTests/fast/canvas/webgl/array-unit-tests.html
@@ -2,6 +2,7 @@
<head>
<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>
</head>
<body>
<div id="description"></div>
@@ -9,9 +10,6 @@
<script>
-if (window.layoutTestController)
- layoutTestController.overridePreference("WebKitWebGLEnabled", "1");
-
description("Verifies the functionality of the new array-like objects in the WebGL spec");
var currentlyRunning = '';
diff --git a/LayoutTests/fast/canvas/webgl/getActiveTest.html b/LayoutTests/fast/canvas/webgl/getActiveTest.html
index d70c418..f115f9a 100644
--- a/LayoutTests/fast/canvas/webgl/getActiveTest.html
+++ b/LayoutTests/fast/canvas/webgl/getActiveTest.html
@@ -2,7 +2,7 @@
<head>
<link rel="stylesheet" href="../../js/resources/js-test-style.css"/>
<script src="../../js/resources/js-test-pre.js"></script>
-<script src="resources/shader-test.js"></script>
+<script src="resources/webgl-test.js"></script>
</head>
<body>
<div id="description"></div>
diff --git a/LayoutTests/fast/canvas/webgl/gl-get-calls.html b/LayoutTests/fast/canvas/webgl/gl-get-calls.html
index 60fc217..7d2b8b3 100644
--- a/LayoutTests/fast/canvas/webgl/gl-get-calls.html
+++ b/LayoutTests/fast/canvas/webgl/gl-get-calls.html
@@ -2,6 +2,7 @@
<head>
<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>
</head>
<body>
<div id="description"></div>
@@ -10,9 +11,6 @@
<script>
-if (window.layoutTestController)
- layoutTestController.overridePreference("WebKitWebGLEnabled", "1");
-
description("This test ensures basic functionality of the underlying graphics library");
debug("");
diff --git a/LayoutTests/fast/canvas/webgl/incorrect-context-object-behaviour.html b/LayoutTests/fast/canvas/webgl/incorrect-context-object-behaviour.html
index f37684d..2a75594 100644
--- a/LayoutTests/fast/canvas/webgl/incorrect-context-object-behaviour.html
+++ b/LayoutTests/fast/canvas/webgl/incorrect-context-object-behaviour.html
@@ -2,7 +2,7 @@
<head>
<link rel="stylesheet" href="../../js/resources/js-test-style.css"/>
<script src="../../js/resources/js-test-pre.js"></script>
-<script src="resources/shader-test.js"></script>
+<script src="resources/webgl-test.js"></script>
</head>
<body>
<div id="description"></div>
diff --git a/LayoutTests/fast/canvas/webgl/null-object-behaviour.html b/LayoutTests/fast/canvas/webgl/null-object-behaviour.html
index b076c5f..d8add72 100644
--- a/LayoutTests/fast/canvas/webgl/null-object-behaviour.html
+++ b/LayoutTests/fast/canvas/webgl/null-object-behaviour.html
@@ -2,7 +2,7 @@
<head>
<link rel="stylesheet" href="../../js/resources/js-test-style.css"/>
<script src="../../js/resources/js-test-pre.js"></script>
-<script src="resources/shader-test.js"></script>
+<script src="resources/webgl-test.js"></script>
</head>
<body>
<div id="description"></div>
diff --git a/LayoutTests/fast/canvas/webgl/resources/shader-test.js b/LayoutTests/fast/canvas/webgl/resources/shader-test.js
deleted file mode 100644
index 5df6a50..0000000
--- a/LayoutTests/fast/canvas/webgl/resources/shader-test.js
+++ /dev/null
@@ -1,36 +0,0 @@
-function getShaderSource(file) {
- var xhr = new XMLHttpRequest();
- xhr.open("GET", file, false);
- xhr.send();
- return xhr.responseText;
-}
-
-function create3DContext() {
- var canvas = document.createElement("canvas");
- try {
- return canvas.getContext("webkit-3d");
- } catch(e) {}
- return canvas.getContext("moz-webgl");
-}
-
-function loadStandardProgram(context) {
- var program = context.createProgram();
- context.attachShader(program, loadStandardVertexShader(context));
- context.attachShader(program, loadStandardFragmentShader(context));
- context.linkProgram(program);
- return program;
-}
-
-function loadStandardVertexShader(context) {
- var vertexShader = context.createShader(context.VERTEX_SHADER);
- context.shaderSource(vertexShader, getShaderSource("resources/vertexShader.vert"));
- context.compileShader(vertexShader);
- return vertexShader;
-}
-
-function loadStandardFragmentShader(context) {
- var fragmentShader = context.createShader(context.FRAGMENT_SHADER);
- context.shaderSource(fragmentShader, getShaderSource("resources/fragmentShader.frag"));
- context.compileShader(fragmentShader);
- return fragmentShader;
-}
diff --git a/LayoutTests/fast/canvas/webgl/resources/webgl-test.js b/LayoutTests/fast/canvas/webgl/resources/webgl-test.js
new file mode 100644
index 0000000..f68a434
--- /dev/null
+++ b/LayoutTests/fast/canvas/webgl/resources/webgl-test.js
@@ -0,0 +1,39 @@
+if (window.layoutTestController)
+ layoutTestController.overridePreference("WebKitWebGLEnabled", "1");
+
+function getShaderSource(file) {
+ var xhr = new XMLHttpRequest();
+ xhr.open("GET", file, false);
+ xhr.send();
+ return xhr.responseText;
+}
+
+function create3DContext() {
+ var canvas = document.createElement("canvas");
+ try {
+ return canvas.getContext("webkit-3d");
+ } catch(e) {}
+ return canvas.getContext("moz-webgl");
+}
+
+function loadStandardProgram(context) {
+ var program = context.createProgram();
+ context.attachShader(program, loadStandardVertexShader(context));
+ context.attachShader(program, loadStandardFragmentShader(context));
+ context.linkProgram(program);
+ return program;
+}
+
+function loadStandardVertexShader(context) {
+ var vertexShader = context.createShader(context.VERTEX_SHADER);
+ context.shaderSource(vertexShader, getShaderSource("resources/vertexShader.vert"));
+ context.compileShader(vertexShader);
+ return vertexShader;
+}
+
+function loadStandardFragmentShader(context) {
+ var fragmentShader = context.createShader(context.FRAGMENT_SHADER);
+ context.shaderSource(fragmentShader, getShaderSource("resources/fragmentShader.frag"));
+ context.compileShader(fragmentShader);
+ return fragmentShader;
+}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list