Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-29 07:42:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1660651, create URL for screenshots image using the iframe's contentWindow r=sfoster

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D91641
This commit is contained in:
Emma Malysz 2020-09-29 00:36:39 +00:00
parent 7cc4032397
commit 9123f76464
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
browser/extensions/screenshots/selector/ui.js
View File

@ -90,6 +90,7 @@ this.ui = (function() { // eslint-disable-line no-unused-vars
lastWidth: null,
},
document: null,
window: null,
display(installHandlerOnDocument) {
return new Promise((resolve, reject) => {
if (!this.element) {
@ -102,6 +103,7 @@ this.ui = (function() { // eslint-disable-line no-unused-vars
this.updateElementSize();
this.element.addEventListener("load", watchFunction(() => {
this.document = this.element.contentDocument;
this.window = this.element.contentWindow;
assertIsBlankDocument(this.document);
// eslint-disable-next-line no-unsanitized/property
this.document.documentElement.innerHTML = `
@ -218,7 +220,7 @@ this.ui = (function() { // eslint-disable-line no-unused-vars
remove() {
this.stopSizeWatch();
util.removeNode(this.element);
this.element = this.document = null;
this.element = this.document = this.window = null;
},
};
@ -227,6 +229,7 @@ this.ui = (function() { // eslint-disable-line no-unused-vars
const iframePreSelection = exports.iframePreSelection = {
element: null,
document: null,
window: null,
display(installHandlerOnDocument, standardOverlayCallbacks) {
return new Promise((resolve, reject) => {
if (!this.element) {
@ -239,6 +242,7 @@ this.ui = (function() { // eslint-disable-line no-unused-vars
this.element.setAttribute("role", "dialog");
this.element.addEventListener("load", watchFunction(() => {
this.document = this.element.contentDocument;
this.window = this.element.contentWindow;
assertIsBlankDocument(this.document);
// eslint-disable-next-line no-unsanitized/property
this.document.documentElement.innerHTML = `
@ -332,8 +336,7 @@ this.ui = (function() { // eslint-disable-line no-unused-vars
remove() {
this.hide();
util.removeNode(this.element);
this.element = null;
this.document = null;
this.element = this.document = this.window = null;
},
};
@ -348,6 +351,7 @@ this.ui = (function() { // eslint-disable-line no-unused-vars
const iframePreview = exports.iframePreview = {
element: null,
document: null,
window: null,
display(installHandlerOnDocument, standardOverlayCallbacks) {
return new Promise((resolve, reject) => {
if (!this.element) {
@ -362,6 +366,7 @@ this.ui = (function() { // eslint-disable-line no-unused-vars
this.element.onload = watchFunction(() => {
msgsPromise.then(([cancelTitle, copyTitle, downloadTitle]) => {
this.document = this.element.contentDocument;
this.window = this.element.contentWindow;
// eslint-disable-next-line no-unsanitized/property
this.document.documentElement.innerHTML = `
<head>
@ -474,6 +479,10 @@ this.ui = (function() { // eslint-disable-line no-unused-vars
iframePreview.remove();
},
getContentWindow() {
return this.currentIframe.element.contentWindow;
},
document() {
return this.currentIframe.document;
},
@ -789,7 +798,7 @@ this.ui = (function() { // eslint-disable-line no-unused-vars
display(dataUrl) {
const img = makeEl("IMG");
const imgBlob = blobConverters.dataUrlToBlob(dataUrl);
img.src = URL.createObjectURL(imgBlob);
img.src = iframe.getContentWindow().URL.createObjectURL(imgBlob);
iframe.document().querySelector(".preview-image-wrapper").appendChild(img);
},
};