Remove SHADER_COMPILER constant

kenrussell · kenrussell · commit 9301fa1378e1 · 2012-04-28T03:20:53.000Z
https://bugs.webkit.org/show_bug.cgi?id=85115 Reviewed by Darin Adler. Source/WebCore: Removed constant which was previously removed from spec. Updated layout test and expected results. * html/canvas/WebGLRenderingContext.idl: LayoutTests: * fast/canvas/webgl/constants-expected.txt: Updated expected results. * fast/canvas/webgl/constants.html: Synced test with Khronos repository. Canonical link: https://commits.webkit.org/102655@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@115531 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2012-04-27  Kenneth Russell  <kbr@google.com>
+
+        Remove SHADER_COMPILER constant
+        https://bugs.webkit.org/show_bug.cgi?id=85115
+
+        Reviewed by Darin Adler.
+
+        * fast/canvas/webgl/constants-expected.txt: Updated expected results.
+        * fast/canvas/webgl/constants.html: Synced test with Khronos repository.
+
 2012-04-27  Joe Thomas  <joethomas@motorola.com>
 
         fast/forms/listbox-clear-restore.html is failing
diff --git a/LayoutTests/fast/canvas/webgl/constants-expected.txt b/LayoutTests/fast/canvas/webgl/constants-expected.txt
@@ -5,6 +5,7 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
 
 Canvas.getContext
 PASS All WebGL constants found to have correct values.
+PASS All constants removed from WebGL spec were absent from WebGL context.
 
 PASS successfullyParsed is true
 
diff --git a/LayoutTests/fast/canvas/webgl/constants.html b/LayoutTests/fast/canvas/webgl/constants.html
@@ -372,7 +372,6 @@
     
     /* Shader Source */
 COMPILE_STATUS                 : 0x8B81,
-SHADER_COMPILER                : 0x8DFA,
     
     /* Shader Precision-Specified Types */
 LOW_FLOAT                      : 0x8DF0,
@@ -436,10 +435,33 @@
 BROWSER_DEFAULT_WEBGL              : 0x9244
 };
 
+// Constants removed from the WebGL spec compared to ES 2.0
+var removedConstants = {
+NUM_COMPRESSED_TEXTURE_FORMATS : 0x86A2,
+FIXED                          : 0x140C,
+ACTIVE_UNIFORM_MAX_LENGTH      : 0x8B87,
+ACTIVE_ATTRIBUTE_MAX_LENGTH    : 0x8B8A,
+EXTENSIONS                     : 0x1F03,
+INFO_LOG_LENGTH                : 0x8B84,
+SHADER_SOURCE_LENGTH           : 0x8B88,
+SHADER_COMPILER                : 0x8DFA,
+SHADER_BINARY_FORMATS          : 0x8DF8,
+NUM_SHADER_BINARY_FORMATS      : 0x8DF9,
+};
+
 function assertProperty(v, p) {
-  if (v[p] == null) {
+  if (p in v) {
+    return true;
+  } else {
     testFailed("Property does not exist: " + p)
     return false;
+  }
+}
+
+function assertNoProperty(v, p) {
+  if (p in v) {
+    testFailed("Property is defined and should not be: " + p)
+    return false;
   } else {
     return true;
   }
@@ -464,6 +486,14 @@
 if (passed) {
   testPassed("All WebGL constants found to have correct values.");
 }
+passed = true;
+for (var i in removedConstants) {
+  var r = assertNoProperty(gl, i);
+  passed = passed && r;
+}
+if (passed) {
+  testPassed("All constants removed from WebGL spec were absent from WebGL context.");
+}
 var extended = false;
 for (var i in gl) {
   if (i.match(/^[^a-z]/) && constants[i] == null) {
@@ -478,8 +508,6 @@
 debug("");
 </script>
 <script src="../../js/resources/js-test-post.js"></script>
-<script>
-</script>
 
 </body>
 </html>
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2012-04-27  Kenneth Russell  <kbr@google.com>
+
+        Remove SHADER_COMPILER constant
+        https://bugs.webkit.org/show_bug.cgi?id=85115
+
+        Reviewed by Darin Adler.
+
+        Removed constant which was previously removed from spec. Updated
+        layout test and expected results.
+
+        * html/canvas/WebGLRenderingContext.idl:
+
 2012-04-27  Arvid Nilsson  <anilsson@rim.com>
 
         [BlackBerry] Fixed background is scrolling in http://www.nieuwecode.nl
diff --git a/Source/WebCore/html/canvas/WebGLRenderingContext.idl b/Source/WebCore/html/canvas/WebGLRenderingContext.idl
@@ -384,7 +384,6 @@ module html {
 
         /* Shader Source */
         const unsigned int COMPILE_STATUS                 = 0x8B81;
-        const unsigned int SHADER_COMPILER                = 0x8DFA;
 
         /* Shader Precision-Specified Types */
         const unsigned int LOW_FLOAT                      = 0x8DF0;
