Handle removal of nsIDOMWindow QI

mkaply · Jan 9, 2020 · 8e8d482 · 8e8d482
1 parent 3d7866e
commit 8e8d482
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/cck2/modules/CCK2.jsm b/cck2/modules/CCK2.jsm
@@ -1441,7 +1441,7 @@ function updatePermissions(permissions) {
 var documentObserver = {
   observe: function observe(subject, topic, data) {
     if (subject instanceof Ci.nsIDOMWindow) {
-      var win = subject.QueryInterface(Components.interfaces.nsIDOMWindow);
+      var win = subject;
       if (topic == "chrome-document-global-created" ||
           (topic == "content-document-global-created" && win.document.documentURIObject.scheme == "about")) {
         win.addEventListener("load", function onLoad(event) {

diff --git a/cck2/modules/CCK2AboutAddonsOverlay.jsm b/cck2/modules/CCK2AboutAddonsOverlay.jsm
@@ -17,7 +17,7 @@ var observer = {
   observe: function observe(subject, topic, data) {
     switch (topic) {
       case "chrome-document-global-created":
-        var win = subject.QueryInterface(Components.interfaces.nsIDOMWindow);
+        var win = subject;
         win.addEventListener("load", function onLoad(event) {
           win.removeEventListener("load", onLoad, false);
           var doc = event.target;

diff --git a/cck2/modules/CCK2AboutDialogOverlay.jsm b/cck2/modules/CCK2AboutDialogOverlay.jsm
@@ -12,7 +12,7 @@ var observer = {
   observe: function observe(subject, topic, data) {
     switch (topic) {
       case "chrome-document-global-created":
-        var win = subject.QueryInterface(Components.interfaces.nsIDOMWindow);
+        var win = subject;
         win.addEventListener("load", function onLoad(event) {
           win.removeEventListener("load", onLoad, false);
           var doc = event.target;

diff --git a/cck2/modules/CCK2AboutHomeFramescript.js b/cck2/modules/CCK2AboutHomeFramescript.js
@@ -16,7 +16,7 @@ var observer = {
   observe: function observe(subject, topic, data) {
     switch (topic) {
       case "content-document-global-created":
-        var win = subject.QueryInterface(Components.interfaces.nsIDOMWindow);
+        var win = subject;
         win.addEventListener("load", function onLoad(event) {
           win.removeEventListener("load", onLoad, false);
           var doc = event.target;

diff --git a/cck2/modules/CCK2AboutSupportOverlay.jsm b/cck2/modules/CCK2AboutSupportOverlay.jsm
@@ -17,7 +17,7 @@ var observer = {
   observe: function observe(subject, topic, data) {
     switch (topic) {
       case "chrome-document-global-created":
-        var win = subject.QueryInterface(Components.interfaces.nsIDOMWindow);
+        var win = subject;
         win.addEventListener("load", function onLoad(event) {
           win.removeEventListener("load", onLoad, false);
           var doc = event.target;

diff --git a/cck2/modules/CCK2BrowserOverlay.jsm b/cck2/modules/CCK2BrowserOverlay.jsm
@@ -18,7 +18,7 @@ var observer = {
   observe: function observe(subject, topic, data) {
     switch (topic) {
       case "chrome-document-global-created":
-        var win = subject.QueryInterface(Components.interfaces.nsIDOMWindow);
+        var win = subject;
         win.addEventListener("load", function onLoad(event) {
           win.removeEventListener("load", onLoad, false);
           var doc = event.target;

diff --git a/cck2/modules/CCK2PreferencesOverlay.jsm b/cck2/modules/CCK2PreferencesOverlay.jsm
@@ -20,7 +20,7 @@ var observer = {
   observe: function observe(subject, topic, data) {
     switch (topic) {
       case "chrome-document-global-created":
-        var win = subject.QueryInterface(Components.interfaces.nsIDOMWindow);
+        var win = subject;
         win.addEventListener("load", function onLoad(event) {
           win.removeEventListener("load", onLoad, false);
           var doc = event.target;