aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2012-03-24 11:44:37 -0700
committerAlon Zakai <alonzakai@gmail.com>2012-03-24 11:44:37 -0700
commitd7c13abc2de3fe9db319a1bc654028427af8e704 (patch)
treec074f762b483e2571d0de1f1257e144115f5ef2b
parent26f0edbd0cc1d44c79f1563bccfe8fe8b095b7c6 (diff)
support window.WebKitURL
-rwxr-xr-xemcc7
1 files changed, 4 insertions, 3 deletions
diff --git a/emcc b/emcc
index 4df4b163..1d7cf1d0 100755
--- a/emcc
+++ b/emcc
@@ -853,7 +853,8 @@ try:
code += '''FS.createFolder('/%s', '%s', true, false);\n''' % (os.path.sep.join(parts[:i]), parts[i])
partial_dirs.append(partial)
- code += 'var BlobBuilder = typeof MozBlobBuilder != "undefined" ? MozBlobBuilder : (typeof WebKitBlobBuilder != "undefined" ? WebKitBlobBuilder : console.log("warning: cannot build blobs"));'
+ code += 'var BlobBuilder = typeof MozBlobBuilder != "undefined" ? MozBlobBuilder : (typeof WebKitBlobBuilder != "undefined" ? WebKitBlobBuilder : console.log("warning: cannot build blobs"));\n'
+ code += 'var URLObject = typeof window != "undefined" ? (window.URL ? window.URL : window.WebKitURL) : console.log("warning: cannot create object URLs");\n'
counter = 0
for file_ in data_files:
@@ -892,7 +893,7 @@ try:
'finish': 'removeRunDependency();' if not image else '''var bb = new BlobBuilder();
bb.append(byteArray.buffer);
var b = bb.getBlob();
- var url = window.URL.createObjectURL(b);
+ var url = URLObject.createObjectURL(b);
var img = new Image();
img.onload = function() {
assert(img.complete, 'Image %(filename)s could not be decoded');
@@ -902,7 +903,7 @@ try:
var ctx = canvas.getContext('2d');
ctx.drawImage(img, 0, 0);
preloadedImages['%(filename)s'] = canvas;
- window.URL.revokeObjectURL(url);
+ URLObject.revokeObjectURL(url);
removeRunDependency();
};
img.onerror = function(event) {