roytam1/palemoon27
1
0
Fork 0
mirror of https://github.com/roytam1/palemoon27.git synced 2026-06-04 15:38:59 +00:00
Code Issues Projects Releases Wiki Activity

Using "View Image" and "Save Image as" on a large canvas doesn't work

Browse Source
This commit is contained in:
janekptacijarabaci
2017-03-03 13:04:24 +01:00
committed by roytam1
parent 89aa843706
commit 3ebfeabab5
1 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
browser/base/content/nsContextMenu.js
+29 -14
View File
@@ -4,6 +4,8 @@
Components.utils.import("resource://gre/modules/PrivateBrowsingUtils.jsm");
Components.utils.importGlobalProperties(["URL"]);
function nsContextMenu(aXulMenu, aIsShift) {
this.shouldDisplay = true;
this.initMenu(aXulMenu, aIsShift);
@@ -904,18 +906,26 @@ nsContextMenu.prototype = {
viewMedia: function(e) {
var viewURL;
if (this.onCanvas)
viewURL = this.target.toDataURL();
else {
if (this.onCanvas) {
var target = this.target;
new Promise.resolve({then: function (resolve) {
target.toBlob((blob) => {
resolve(URL.createObjectURL(blob));
})
}}).then(function (blobURL) {
let doc = target.ownerDocument;
openUILink(blobURL, e, { disallowInheritPrincipal: true,
referrerURI: doc.documentURIObject });
}, Components.utils.reportError);
} else {
viewURL = this.mediaURL;
urlSecurityCheck(viewURL,
this.browser.contentPrincipal,
Ci.nsIScriptSecurityManager.DISALLOW_SCRIPT);
let doc = this.target.ownerDocument;
openUILink(viewURL, e, { disallowInheritPrincipal: true,
referrerURI: doc.documentURIObject });
}
var doc = this.target.ownerDocument;
openUILink(viewURL, e, { disallowInheritPrincipal: true,
referrerURI: doc.documentURIObject });
},
saveVideoFrameAsImage: function () {
@@ -1188,16 +1198,21 @@ nsContextMenu.prototype = {
saveMedia: function() {
var doc = this.target.ownerDocument;
if (this.onCanvas) {
// Bypass cache, since it's a data: URL.
saveImageURL(this.target.toDataURL(), "canvas.png", "SaveImageTitle",
true, false, doc.documentURIObject, doc);
}
else if (this.onImage) {
// Bypass cache, since it's a blob: URL.
var target = this.target;
new Promise.resolve({then: function (resolve) {
target.toBlob((blob) => {
resolve(URL.createObjectURL(blob));
})
}}).then(function (blobURL) {
saveImageURL(blobURL, "canvas.png", "SaveImageTitle", true,
false, doc.documentURIObject, doc);
}, Components.utils.reportError);
} else if (this.onImage) {
urlSecurityCheck(this.mediaURL, doc.nodePrincipal);
saveImageURL(this.mediaURL, null, "SaveImageTitle", false,
false, doc.documentURIObject, doc);
}
else if (this.onVideo || this.onAudio) {
} else if (this.onVideo || this.onAudio) {
urlSecurityCheck(this.mediaURL, doc.nodePrincipal);
var dialogTitle = this.onVideo ? "SaveVideoTitle" : "SaveAudioTitle";
this.saveHelper(this.mediaURL, null, dialogTitle, false, doc, "");