Bug 1308057 - Update tests. - r=ethlin

MozReview-Commit-ID: Fl3ofikbPdP

dom/canvas/test/webgl-mochitest/ensure-exts/test_EXT_disjoint_timer_query.html

@@ -10,9 +10,7 @@
     <script>
 
 'use strict';
-Lastly_WithDraftExtsEnabled(function() {
-    EnsureExtFor('webgl', 'EXT_disjoint_timer_query');
-});
+EnsureExt('EXT_disjoint_timer_query');
 
     </script>
   </body>

dom/canvas/test/webgl-mochitest/ensure-exts/test_common.html

@@ -19,6 +19,7 @@ var defaultExts = [
     // Ratified
     ['ANGLE_instanced_arrays'        , [MACHINE_SPECIFIC, FORBID          ]],
     ['EXT_blend_minmax'              , [MACHINE_SPECIFIC, FORBID          ]],
+    ['EXT_disjoint_timer_query'      , [MACHINE_SPECIFIC, MACHINE_SPECIFIC]],
     ['EXT_frag_depth'                , [MACHINE_SPECIFIC, FORBID          ]],
     ['EXT_shader_texture_lod'        , [MACHINE_SPECIFIC, FORBID          ]],
     ['EXT_texture_filter_anisotropic', [MACHINE_SPECIFIC, MACHINE_SPECIFIC]],
@@ -47,7 +48,6 @@ var defaultExts = [
 ];
 
 var draftExts = [
-    ['EXT_disjoint_timer_query'    , [MACHINE_SPECIFIC, MACHINE_SPECIFIC]], // TODO: Actually Community Approved now.
     ['WEBGL_compressed_texture_es3', [MACHINE_SPECIFIC, MACHINE_SPECIFIC]],
 ];
 

dom/canvas/test/webgl-mochitest/mochitest.ini

@@ -82,7 +82,6 @@ skip-if = android_version == '18' #Android 4.3 aws only; bug 1030942
 skip-if = toolkit == 'android' #bug 865443- seperate suite - the non_conf* tests pass except for one on armv6 tests
 [test_webgl_compressed_texture_es3.html]
 [test_webgl_disjoint_timer_query.html]
-fail-if = (os == 'win' && (os_version == '6.1' || os_version == '6.2' || os_version == '10.0'))
 [test_webgl_force_enable.html]
 [test_webgl_request_context.html]
 skip-if = toolkit == 'android' #bug 865443- seperate suite - the non_conf* tests pass except for one on armv6 tests

dom/canvas/test/webgl-mochitest/test_webgl_disjoint_timer_query.html

@@ -31,10 +31,11 @@ function doTest() {
 
   var elapsedQuery = ext.createQueryEXT();
   ok(elapsedQuery, "Query creation works.");
-  ok(ext.isQueryEXT(elapsedQuery), "New query is valid after creation.");
+  ok(!ext.isQueryEXT(elapsedQuery), "isQuery fails after creation but before bind.");
 
   ext.beginQueryEXT(ext.TIME_ELAPSED_EXT, elapsedQuery);
-  is(ext.getQueryEXT(ext.TIME_ELAPSED_EXT, ext.CURRENT_QUERY_EXT), elapsedQuery,
+  ok(ext.isQueryEXT(elapsedQuery), "isQuery fails after bind.");
+  ok(ext.getQueryEXT(ext.TIME_ELAPSED_EXT, ext.CURRENT_QUERY_EXT) == elapsedQuery,
      "Query is active after beginQueryEXT.");
   ext.endQueryEXT(ext.TIME_ELAPSED_EXT);
   gl.flush();
@@ -65,8 +66,7 @@ function doTest() {
           "Time elapsed must be at least 30 bits to hold at least 1 second of timing.");
 
           SimpleTest.finish();
-
-          });
+        });
     } else {
       SimpleTest.finish();
     }
@@ -75,7 +75,7 @@ function doTest() {
 
 SimpleTest.waitForExplicitFinish();
 
-SpecialPowers.pushPrefEnv({"set": [['webgl.enable-draft-extensions', true]]}, doTest);
+doTest();
 
 </script>
 </body>