diff --git a/cocos2d/core/load-pipeline/downloader.js b/cocos2d/core/load-pipeline/downloader.js index 27e3d48a70..57a7a5ea66 100644 --- a/cocos2d/core/load-pipeline/downloader.js +++ b/cocos2d/core/load-pipeline/downloader.js @@ -63,6 +63,16 @@ function downloadScript (item, callback, isAsync) { d.body.appendChild(s); } +function downloadWebp (item, callback, isCrossOrigin, img) { + if (!cc.sys.capabilities.webp) { + setTimeout(function () { + callback('Load Webp ( ' + item.url + ' ) failed') + }, 0); + return; + } + downloadImage(item, callback, isCrossOrigin, img); +} + function downloadImage (item, callback, isCrossOrigin, img) { if (isCrossOrigin === undefined) { isCrossOrigin = true; @@ -232,7 +242,7 @@ var defaultMap = { 'gif' : downloadImage, 'ico' : downloadImage, 'tiff' : downloadImage, - 'webp' : downloadImage, + 'webp' : downloadWebp, 'image' : downloadImage, // Audio diff --git a/cocos2d/core/platform/CCSys.js b/cocos2d/core/platform/CCSys.js index c5a22755b9..f3b3b5b193 100644 --- a/cocos2d/core/platform/CCSys.js +++ b/cocos2d/core/platform/CCSys.js @@ -729,6 +729,7 @@ else { }; } + var _supportWebp = _tmpCanvas1.toDataURL('image/webp').startsWith('data:image/webp'); var _supportCanvas = !!_tmpCanvas1.getContext("2d"); var _supportWebGL = false; if (win.WebGLRenderingContext) { @@ -792,7 +793,8 @@ else { */ var capabilities = sys.capabilities = { "canvas": _supportCanvas, - "opengl": _supportWebGL + "opengl": _supportWebGL, + "webp": _supportWebp, }; if (docEle['ontouchstart'] !== undefined || doc['ontouchstart'] !== undefined || nav.msPointerEnabled) capabilities["touches"] = true;