Bug 1070516 - [e10s] window.content shim should apply only to browser windows (r=mconley)
authorBill McCloskey <wmccloskey@mozilla.com>
Tue, 23 Sep 2014 15:48:52 -0700
changeset 222396 194eaa429b65fb63e1eb41a1f764ed7cf7722fd6
parent 222395 8f13101a6dbb6868e843a9a974a294c57df5726e
child 222397 752ce35b166b97c3cf1eb92baa9f16a91f32ab1f
push id7107
push userraliiev@mozilla.com
push dateMon, 13 Oct 2014 17:43:31 +0000
treeherdermozilla-aurora@b4b34e0acc75 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmconley
bugs1070516
milestone35.0a1
Bug 1070516 - [e10s] window.content shim should apply only to browser windows (r=mconley)
toolkit/components/addoncompat/multiprocessShims.js
--- a/toolkit/components/addoncompat/multiprocessShims.js
+++ b/toolkit/components/addoncompat/multiprocessShims.js
@@ -92,17 +92,17 @@ AddonInterpositionService.prototype = {
         return "RemoteBrowserElement";
       }
 
       if (target.localName == "tabbrowser") {
         return "TabBrowserElement";
       }
     }
 
-    if (target instanceof Ci.nsIDOMChromeWindow) {
+    if (target instanceof Ci.nsIDOMChromeWindow && target.gMultiProcessBrowser) {
       return "ChromeWindow";
     }
 
     if (target instanceof Ci.nsIDOMEventTarget) {
       return "EventTarget";
     }
 
     return "generic";