From 3557271e5a5292abff52146b770cb57dcc755d18 Mon Sep 17 00:00:00 2001
From: ahocevar <andreas.hocevar@gmail.com>
Date: Sun, 23 Jun 2019 14:06:14 +0200
Subject: [PATCH] Use Image.prototype.decode also in Safari

---
 src/ol/Image.js | 15 +++++++++------
 src/ol/has.js   |  6 ++++++
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/ol/Image.js b/src/ol/Image.js
index ec5385f772..bf4601d6fb 100644
--- a/src/ol/Image.js
+++ b/src/ol/Image.js
@@ -6,7 +6,7 @@ import ImageState from './ImageState.js';
 import {listenOnce, unlistenByKey} from './events.js';
 import EventType from './events/EventType.js';
 import {getHeight} from './extent.js';
-import {SAFARI} from './has.js';
+import {IMAGE_DECODE} from './has.js';
 
 
 /**
@@ -159,10 +159,7 @@ class ImageWrapper extends ImageBase {
 export function listenImage(image, loadHandler, errorHandler) {
   const img = /** @type {HTMLImageElement} */ (image);
 
-  // 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) {
+  if (IMAGE_DECODE) {
     const promise = img.decode();
     let listening = true;
     const unlisten = function() {
@@ -174,7 +171,13 @@ export function listenImage(image, loadHandler, errorHandler) {
       }
     }).catch(function(error) {
       if (listening) {
-        errorHandler();
+        // FIXME: Unconditionally call errorHandler() when this bug is fixed upstream:
+        //        https://bugs.webkit.org/show_bug.cgi?id=198527
+        if (error.name === 'EncodingError' && error.message === 'Invalid image type.') {
+          loadHandler();
+        } else {
+          errorHandler();
+        }
       }
     });
     return unlisten;
diff --git a/src/ol/has.js b/src/ol/has.js
index 84e7fca05f..c71bc12d1c 100644
--- a/src/ol/has.js
+++ b/src/ol/has.js
@@ -38,3 +38,9 @@ export const MAC = ua.indexOf('macintosh') !== -1;
  * @api
  */
 export const DEVICE_PIXEL_RATIO = window.devicePixelRatio || 1;
+
+/**
+ * Image.prototype.decode() is supported.
+ * @type {boolean}
+ */
+export const IMAGE_DECODE = typeof Image !== 'undefined' && Image.prototype.decode;