diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2019-09-05 03:35:35 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2019-09-05 16:07:12 +0300 |
| commit | 34c2a6ebc0d579f08c18ce4e895fd3a9fadf7370 (patch) | |
| tree | d5bd7a5f15e814298ef29920f157155b2ca3e24e /Source/WebInspectorUI/UserInterface | |
| parent | 2c94535e5c4dc6ad22bc2f34f76f5a5da6cf652e (diff) | |
| download | qtwebkit-34c2a6ebc0d579f08c18ce4e895fd3a9fadf7370.tar.gz | |
Import QtWebKit commit 55ed4f703de7bfbb0f554cd05dccff4c6db1bba3
Change-Id: I5063dd830f1cedda84e1ae66b0e659ffe7efa22c
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Source/WebInspectorUI/UserInterface')
| -rw-r--r-- | Source/WebInspectorUI/UserInterface/Main.html | 2 | ||||
| -rw-r--r-- | Source/WebInspectorUI/UserInterface/Views/ImageResourceContentView.js | 24 |
2 files changed, 23 insertions, 3 deletions
diff --git a/Source/WebInspectorUI/UserInterface/Main.html b/Source/WebInspectorUI/UserInterface/Main.html index f080f7f55..8718f7941 100644 --- a/Source/WebInspectorUI/UserInterface/Main.html +++ b/Source/WebInspectorUI/UserInterface/Main.html @@ -26,7 +26,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> - <meta http-equiv="Content-Security-Policy" content="default-src 'self'; img-src * file: blob: resource: qrc:; connect-src * ws:; media-src * blob:; font-src * blob:; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline'"> + <meta http-equiv="Content-Security-Policy" content="default-src 'self'; img-src * file: blob: resource: qrc:; connect-src * blob: ws:; media-src * blob:; font-src * blob:; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline'"> <link rel="stylesheet" href="External/CodeMirror/codemirror.css"> diff --git a/Source/WebInspectorUI/UserInterface/Views/ImageResourceContentView.js b/Source/WebInspectorUI/UserInterface/Views/ImageResourceContentView.js index 54fb13a85..be8b2ad63 100644 --- a/Source/WebInspectorUI/UserInterface/Views/ImageResourceContentView.js +++ b/Source/WebInspectorUI/UserInterface/Views/ImageResourceContentView.js @@ -45,8 +45,28 @@ WebInspector.ImageResourceContentView = class ImageResourceContentView extends W var objectURL = this.resource.createObjectURL(); this._imageElement = document.createElement("img"); - this._imageElement.addEventListener("load", function() { URL.revokeObjectURL(objectURL); }); - this._imageElement.src = objectURL; + this._imageElement.dataset.url = this.resource.url; + + var imageElement = this._imageElement; + var xhr = new XMLHttpRequest(); + xhr.open("GET", objectURL, true); + xhr.responseType = "blob"; + xhr.onload = function() { + if (this.status == 200) { + var reader = new FileReader(); + reader.onload = function() { + imageElement.src = reader.result; + + URL.revokeObjectURL(objectURL); + } + + reader.readAsDataURL(this.response); + } else { + imageElement.addEventListener("load", function() { URL.revokeObjectURL(objectURL) }); + imageElement.src = objectURL; + } + }; + xhr.send(); this.element.appendChild(this._imageElement); } |