Bug 679198: stop using .wrappedJSObject where it isn't necessary. r=i…

…rakli
mozilla · Aug 16, 2011 · 7610f75 · 7610f75
1 parent fb55328
commit 7610f75
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 6 deletions.
diff --git a/packages/addon-kit/lib/context-menu.js b/packages/addon-kit/lib/context-menu.js
@@ -758,7 +758,7 @@ WorkerRegistry.prototype = {
 
   _makeWorker: function WR__makeWorker(win) {
     let worker = ContextMenuWorker({
-      window: win.wrappedJSObject,
+      window: win,
       contentScript: this.item.contentScript,
       contentScriptFile: this.item.contentScriptFile,
       onError: function (err) console.exception(err)

diff --git a/packages/addon-kit/lib/page-mod.js b/packages/addon-kit/lib/page-mod.js
@@ -162,7 +162,7 @@ const PageMod = Loader.compose(EventEmitter, {
   },
   _createWorker: function _createWorker(window) {
     let worker = Worker({
-      window: window.wrappedJSObject,
+      window: window,
       contentScript: this.contentScript,
       contentScriptFile: this.contentScriptFile,
       onError: this._onUncaughtError

diff --git a/packages/api-utils/lib/content/content-proxy.js b/packages/api-utils/lib/content/content-proxy.js
@@ -774,7 +774,12 @@ function handlerMaker(obj) {
  * Wrap an object from the document to a proxy wrapper.
  */
 exports.create = function create(object) {
+  // We accept either a XrayWrapper or an unwrapped reference
+  if ("wrappedJSObject" in object)
+    object = object.wrappedJSObject;
+
   let xpcWrapper = XPCNativeWrapper(object);
+
   // If we can't build an XPCNativeWrapper, it doesn't make sense to build
   // a proxy. All proxy code is based on having such wrapper that store
   // different JS attributes set.

diff --git a/packages/api-utils/lib/content/symbiont.js b/packages/api-utils/lib/content/symbiont.js
@@ -194,7 +194,7 @@ const Symbiont = Worker.resolve({
    * content scripts according to contentScriptWhen. Overloaded by Panel. 
    */
   _onInit: function () {
-    this._initWorker({ window: this._frame.contentWindow.wrappedJSObject });
+    this._initWorker({ window: this._frame.contentWindow });
   }
 
 });

diff --git a/packages/api-utils/lib/content/worker.js b/packages/api-utils/lib/content/worker.js
@@ -228,7 +228,7 @@ const WorkerGlobalScope = AsyncEventEmitter.compose({
       // JavaScript values.
       // NOTE: this functionality is experimental and may change or go away
       // at any time!
-      unsafeWindow: { get: function () window }
+      unsafeWindow: { get: function () window.wrappedJSObject }
     });
 
     // Overriding / Injecting some natives into sandbox.

diff --git a/packages/api-utils/lib/tabs/tab.js b/packages/api-utils/lib/tabs/tab.js
@@ -189,7 +189,7 @@ const TabTrait = Trait.compose(EventEmitter, {
    */
   attach: function attach(options) {
     let { Worker } = require("../content/worker");
-    options.window = this._contentWindow.wrappedJSObject;
+    options.window = this._contentWindow;
     let worker = Worker(options);
     worker.once("detach", function detach() {
       worker.destroy();
@@ -250,7 +250,7 @@ exports.Options = Options;
 
 exports.getTabForWindow = function (win) {
   // Get browser window
-  let topWindow = XPCNativeWrapper(win).QueryInterface(Ci.nsIInterfaceRequestor)
+  let topWindow = win.QueryInterface(Ci.nsIInterfaceRequestor)
                      .getInterface(Ci.nsIWebNavigation)
                      .QueryInterface(Ci.nsIDocShellTreeItem)
                      .rootTreeItem