ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't use HTMLImageElement.decode method on Safari

Browse Source 
The decode function is supported by Safari but not when the image is a svg file.
This commit is contained in:
Frederic Junod
2019-06-04 14:57:07 +02:00
parent 9ae7256048
commit 002dc34455
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/Image.js
+6 -1
View File
@@ -6,6 +6,7 @@ import ImageState from './ImageState.js';
import {listenOnce, unlistenByKey} from './events.js'; import {listenOnce, unlistenByKey} from './events.js';
import EventType from './events/EventType.js'; import EventType from './events/EventType.js';
import {getHeight} from './extent.js'; import {getHeight} from './extent.js';
import {SAFARI} from './has.js';
/** /**
@@ -157,7 +158,11 @@ class ImageWrapper extends ImageBase {
*/ */
export function listenImage(image, loadHandler, errorHandler) { export function listenImage(image, loadHandler, errorHandler) {
const img = /** @type {HTMLImageElement} */ (image); const img = /** @type {HTMLImageElement} */ (image);
if (img.decode) {
// The decode function is supported by Safari but not when the image is a svg file.
// FIXME: remove `!SAFARI` in the test when this bug is fixed upstream.
// See: https://bugs.webkit.org/show_bug.cgi?id=198527
if (!SAFARI && img.decode) {
const promise = img.decode(); const promise = img.decode();
let listening = true; let listening = true;
const unlisten = function() { const unlisten = function() {