Merge 117918 - Must set/reset pixel unpack alignment to 1 during texSubImage2D

LayoutTests/fast/canvas/webgl/resources/webgl-test-utils.js

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 WebGLTestUtils = (function() {
 
 /**
  * Wrapped logging function.
  * @param {string} msg The message to log.
  */
@@ skipping 435 matching lines @@
 };
 
 /**
  * Creates a webgl context.
  * @param {!Canvas} opt_canvas The canvas tag to get context from. If one is not
  *     passed in one will be created.
  * @return {!WebGLContext} The created context.
  */
 var create3DContext = function(opt_canvas, opt_attributes) {
   opt_canvas = opt_canvas || document.createElement("canvas");
+  if (typeof opt_canvas == 'string') {
+    opt_canvas = document.getElementById(opt_canvas);
+  }
   var context = null;
-  try {
-    context = opt_canvas.getContext("webgl", opt_attributes);
-  } catch(e) {}
-  if (!context) {
+  var names = ["webgl", "experimental-webgl"];
+  for (var i = 0; i < names.length; ++i) {
     try {
-      context = opt_canvas.getContext("experimental-webgl", opt_attributes);
-    } catch(e) {}
+      context = opt_canvas.getContext(names[i], opt_attributes);
+    } catch (e) {
+    }
+    if (context) {
+      break;
+    }
   }
   if (!context) {
     testFailed("Unable to fetch WebGL rendering context for Canvas");
   }
   return context;
 }
 
 /**
  * Gets a GLError value as a string.
  * @param {!WebGLContext} gl The WebGLContext to use.
@@ skipping 734 matching lines @@
   readFileList: readFileList,
   requestAnimFrame: requestAnimFrame,
   waitFrames: waitFrames,
 
   none: false
 };
 
 }());