[embedlite-components] Guard removeEventListener and sendAsyncMessage…

… service calls. Fixes JB#21694
sailfishos · May 6, 2016 · 7e6a20b · 7e6a20b
1 parent f0f9c6b
commit 7e6a20b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/jscomps/EmbedLiteErrorPageHandler.js b/jscomps/EmbedLiteErrorPageHandler.js
@@ -44,8 +44,13 @@ EventLinkListener.prototype = {
           ErrorPageEventHandler._targetWindow = this._targetWindow;
           Services.embedlite.chromeEventHandler(this._targetWindow).addEventListener("click", ErrorPageEventHandler, true);
           let listener = function() {
-            Services.embedlite.chromeEventHandler(this._targetWindow).removeEventListener("click", ErrorPageEventHandler, true);
-            Services.embedlite.chromeEventHandler(this._targetWindow).removeEventListener("pagehide", listener, true);
+            try {
+              Services.embedlite.chromeEventHandler(this._targetWindow).removeEventListener("click", ErrorPageEventHandler, true);
+            } catch (e) {}
+
+            try {
+              Services.embedlite.chromeEventHandler(this._targetWindow).removeEventListener("pagehide", listener, true);
+            } catch (e) {}
             ErrorPageEventHandler._targetWindow = null;
           }.bind(this);
 

diff --git a/jsscripts/embedhelper.js b/jsscripts/embedhelper.js
@@ -577,7 +577,9 @@ EmbedHelper.prototype = {
     let window = aEvent.target.defaultView;
     if (window) {
       let winid = Services.embedlite.getIDByWindow(window);
-      Services.embedlite.sendAsyncMessage(winid, "embed:domcontentloaded", JSON.stringify({ "rootFrame": window.parent === window }));
+      try {
+        Services.embedlite.sendAsyncMessage(winid, "embed:domcontentloaded", JSON.stringify({ "rootFrame": window.parent === window }));
+      } catch (e) {}
     }
   },