Bug 580128. Remove .wrappedJSObject gets that don't work with the new wrappers. r=mrbkap@gmail.com
authorJohnny Stenback <jst@mozilla.org>
Sun, 10 Oct 2010 15:48:39 -0700
changeset 55698 574b0fb3560461b37ea4d6986878a28689e6a6cb
parent 55697 d8e411980e37d589bf4aafac031d43cfa700941e
child 55699 37486757a90c6a8b4380ac356d942d07725553a2
push id16269
push userjst@mozilla.com
push dateThu, 14 Oct 2010 01:40:35 +0000
treeherdermozilla-central@29c228a4d7eb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmrbkap
bugs580128
milestone2.0b8pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 580128. Remove .wrappedJSObject gets that don't work with the new wrappers. r=mrbkap@gmail.com
browser/base/content/test/browser_tab_dragdrop2.js
browser/components/sessionstore/test/browser/browser_393716.js
browser/components/sessionstore/test/browser/browser_394759.js
--- a/browser/base/content/test/browser_tab_dragdrop2.js
+++ b/browser/base/content/test/browser_tab_dragdrop2.js
@@ -29,18 +29,17 @@ function test()
             window_B.gBrowser.addEventListener("pagehide", function(aEvent) {
               window_B.gBrowser.removeEventListener("pagehide", arguments.callee, true);
               executeSoon(function () {
                 // alert("closing window_B which has "+ window_B.gBrowser.tabs.length+" tabs\n"+
                 //      window_B.gBrowser.getBrowserForTab(window_B.gBrowser.tabs[0]).contentWindow.location);
                 window_B.close();
 
                 var doc = window_C.gBrowser.getBrowserForTab(window_C.gBrowser.tabs[0])
-                            .docShell.contentViewer.DOMDocument.wrappedJSObject;
-                var elems = document.documentElement.childNodes;
+                            .docShell.contentViewer.DOMDocument;
                 var calls = doc.defaultView.test_panels();
                 window_C.close();
                 finish();
               });
             }, true);
             window_B.gBrowser.selectedTab = window_B.gBrowser.tabs[0];
             var window_C = window_B.gBrowser.replaceTabWithWindow(window_B.gBrowser.tabs[0]);
             }, 1000);  // 1 second to allow the tests to create the popups
--- a/browser/components/sessionstore/test/browser/browser_393716.js
+++ b/browser/components/sessionstore/test/browser/browser_393716.js
@@ -54,28 +54,28 @@ function test() {
   tab2.linkedBrowser.addEventListener("load", function(aEvent) {
     this.removeEventListener("load", arguments.callee, true);
     // verify the correctness of the restored tab
     ok(ss.getTabValue(tab2, key2) == value2 && this.currentURI.spec == testURL,
        "the tab's state was correctly restored");
     
     // add text data
     let textbox = this.contentDocument.getElementById("textbox");
-    textbox.wrappedJSObject.value = value3;
+    textbox.value = value3;
     
     // duplicate the tab
     let duplicateTab = ss.duplicateTab(window, tab2);
     tabbrowser.removeTab(tab2);
     
     duplicateTab.linkedBrowser.addEventListener("load", function(aEvent) {
       this.removeEventListener("load", arguments.callee, true);
       // verify the correctness of the duplicated tab
       ok(ss.getTabValue(duplicateTab, key2) == value2 && this.currentURI.spec == testURL,
          "correctly duplicated the tab's state");
       let textbox = this.contentDocument.getElementById("textbox");
-      is(textbox.wrappedJSObject.value, value3, "also duplicated text data");
+      is(textbox.value, value3, "also duplicated text data");
       
       // clean up
       tabbrowser.removeTab(duplicateTab);
       finish();
     }, true);
   }, true);
 }
--- a/browser/components/sessionstore/test/browser/browser_394759.js
+++ b/browser/components/sessionstore/test/browser/browser_394759.js
@@ -75,17 +75,17 @@ function test() {
         newWin.gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true);
 
         executeSoon(function() {
           newWin.gBrowser.addTab().linkedBrowser.stop();
           executeSoon(function() {
             // mark the window with some unique data to be restored later on
             ss.setWindowValue(newWin, uniqueKey, uniqueValue);
             let textbox = newWin.content.document.getElementById("textbox");
-            textbox.wrappedJSObject.value = uniqueText;
+            textbox.value = uniqueText;
 
             newWin.close();
 
             is(ss.getClosedWindowCount(), closedWindowCount + 1,
                "The closed window was added to Recently Closed Windows");
             let data = JSON.parse(ss.getClosedWindowData())[0];
             ok(data.title == testURL && JSON.stringify(data).indexOf(uniqueText) > -1,
                "The closed window data was stored correctly");
@@ -103,17 +103,17 @@ function test() {
                 newWin2.gBrowser.tabContainer.removeEventListener("SSTabRestored", arguments.callee, true);
 
                 is(newWin2.gBrowser.tabs.length, 2,
                    "The window correctly restored 2 tabs");
                 is(newWin2.gBrowser.currentURI.spec, testURL,
                    "The window correctly restored the URL");
 
                 let textbox = newWin2.content.document.getElementById("textbox");
-                is(textbox.wrappedJSObject.value, uniqueText,
+                is(textbox.value, uniqueText,
                    "The window correctly restored the form");
                 is(ss.getWindowValue(newWin2, uniqueKey), uniqueValue,
                    "The window correctly restored the data associated with it");
 
                 // clean up
                 newWin2.close();
                 if (gPrefService.prefHasUserValue("browser.sessionstore.max_windows_undo"))
                   gPrefService.clearUserPref("browser.sessionstore.max_windows_undo");