ImageBitmapLoader: Latest Firefox no longer complains about options a…

…nymore.
mrdoob · Nov 15, 2017 · cb20c47 · cb20c47
1 parent a8f1818
commit cb20c47
Showing 1 changed file with 4 additions and 68 deletions.
diff --git a/examples/js/loaders/ImageBitmapLoader.js b/examples/js/loaders/ImageBitmapLoader.js
@@ -2,70 +2,13 @@
  * @author thespite / http://clicktorelease.com/
  */
 
-function detectCreateImageBitmap( optionsList ) {
-
-	var url = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+M9QDwADhgGAWjR9awAAAABJRU5ErkJggg==';
-
-	return new Promise( function ( resolve, reject ) {
-
-		if ( ! ( 'createImageBitmap' in window ) ) {
-
-			reject();
-			return;
-
-		}
-
-		fetch( url ).then( function ( res ) {
-
-			return res.blob();
-
-		} ).then( function ( blob ) {
-
-			var pendingImages = [];
-
-			for ( var i = 0; i < optionsList.length; i ++ ) {
-
-				var pendingImage = optionsList[ i ] === undefined
-					? createImageBitmap( blob )
-					: createImageBitmap( blob, optionsList[ i ] );
-
-				pendingImages.push( pendingImage );
-
-			}
-
-			Promise.all( pendingImages ).then( function () {
-
-				resolve();
-
-			} ).catch( function () {
-
-				reject();
-
-			} );
-
-		} );
-
-	} );
-
-}
-
-var canUseImageBitmap = detectCreateImageBitmap( [ undefined ] );
-
-var canUseImageBitmapOptions = detectCreateImageBitmap( [
-	{ imageOrientation: 'none', premultiplyAlpha: 'none' },
-	{ imageOrientation: 'flipY', premultiplyAlpha: 'none' },
-	{ imageOrientation: 'none', premultiplyAlpha: 'premultiply' },
-	{ imageOrientation: 'flipY', premultiplyAlpha: 'premultiply' }
-] );
-
-
 THREE.ImageBitmapLoader = function ( manager ) {
 
-	canUseImageBitmap.catch( function () {
+	if ( typeof createImageBitmap === 'undefined' ) {
 
 		console.warn( 'THREE.ImageBitmapLoader: createImageBitmap() not supported.' );
 
-	} );
+	}
 
 	this.manager = manager !== undefined ? manager : THREE.DefaultLoadingManager;
 	this.options = undefined;
@@ -78,13 +21,8 @@ THREE.ImageBitmapLoader.prototype = {
 
 	setOptions: function setOptions( options ) {
 
-		canUseImageBitmapOptions.catch( function () {
-
-			console.warn( 'THREE.ImageBitmapLoader: createImageBitmap() options not supported.' );
-
-		} );
-
 		this.options = options;
+
 		return this;
 
 	},
@@ -121,9 +59,7 @@ THREE.ImageBitmapLoader.prototype = {
 
 		} ).then( function ( blob ) {
 
-			return scope.options === undefined
-				? createImageBitmap( blob )
-				: createImageBitmap( blob, scope.options );
+			return createImageBitmap( blob, scope.options );
 
 		} ).then( function ( imageBitmap ) {