Back out bug 423833 due to windows browser test failures
authorjohnath@mozilla.com
Mon, 07 Apr 2008 07:56:44 -0700
changeset 13994 5c964256d49502967018e3113cc780a598bc2b20
parent 13988 3d840a5585df3c4a852008794e56d7bfcd5934a5
child 13995 062b87341e7624ce129883939c4a8b09d2df1803
push id11
push userbsmedberg@mozilla.com
push dateTue, 15 Apr 2008 18:11:53 +0000
treeherdermozilla-central@40e4b99f0dea [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs423833
milestone1.9pre
Back out bug 423833 due to windows browser test failures
browser/base/content/nsContextMenu.js
browser/base/content/test/Makefile.in
browser/base/content/utilityOverlay.js
--- a/browser/base/content/nsContextMenu.js
+++ b/browser/base/content/nsContextMenu.js
@@ -649,42 +649,42 @@ nsContextMenu.prototype = {
   // Open linked-to URL in a new tab.
   openLinkInTab: function() {
     openNewTabWith(this.linkURL, this.target.ownerDocument, null, null, false);
   },
 
   // Open frame in a new tab.
   openFrameInTab: function() {
     var doc = this.target.ownerDocument;
-    var frameURL = doc.location.href;
+    var frameURL = doc.documentURIObject.spec;
     var referrer = doc.referrer;
 
-    return openNewTabWith(frameURL, null, null, null, false,
-                          referrer ? makeURI(referrer) : null);
+    openNewTabWith(frameURL, null, null, null, false,
+                   referrer ? makeURI(referrer) : null);
   },
 
   // Reload clicked-in frame.
   reloadFrame: function() {
     this.target.ownerDocument.location.reload();
   },
 
   // Open clicked-in frame in its own window.
   openFrame: function() {
     var doc = this.target.ownerDocument;
-    var frameURL = doc.location.href;
+    var frameURL = doc.documentURIObject.spec;
     var referrer = doc.referrer;
 
-    return openNewWindowWith(frameURL, null, null, false,
-                             referrer ? makeURI(referrer) : null);
+    openNewWindowWith(frameURL, null, null, false,
+                      referrer ? makeURI(referrer) : null);
   },
 
   // Open clicked-in frame in the same window.
   showOnlyThisFrame: function() {
     var doc = this.target.ownerDocument;
-    var frameURL = doc.location.href;
+    var frameURL = doc.documentURIObject.spec;
 
     urlSecurityCheck(frameURL, this.browser.contentPrincipal,
                      Ci.nsIScriptSecurityManager.DISALLOW_SCRIPT);
     var referrer = doc.referrer;
     this.browser.loadURI(frameURL, referrer ? makeURI(referrer) : null);
   },
 
   // View Partial Source
--- a/browser/base/content/test/Makefile.in
+++ b/browser/base/content/test/Makefile.in
@@ -49,17 +49,16 @@ include $(topsrcdir)/config/rules.mk
 		bug395533-data.txt \
 		$(NULL)
 
 _BROWSER_FILES = browser_bug321000.js \
                  browser_bug405137.js \
                  browser_bug409481.js \
                  browser_autodiscovery.js \
                  browser_bug420160.js \
-                 browser_bug423833.js \
                  autodiscovery.html \
                  moz.png \
                  browser_getshortcutoruri.js \
     $(NULL)
 
 libs:: $(_TEST_FILES)
 	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)
 
--- a/browser/base/content/utilityOverlay.js
+++ b/browser/base/content/utilityOverlay.js
@@ -573,18 +573,18 @@ function openNewTabWith(aURL, aDocument,
   var wintype = document.documentElement.getAttribute("windowtype");
   var originCharset;
   if (wintype == "navigator:browser")
     originCharset = window.content.document.characterSet;
 
   // open link in new tab
   var referrerURI = aDocument ? aDocument.documentURIObject : aReferrer;
   var browser = top.document.getElementById("content");
-  return browser.loadOneTab(aURL, referrerURI, originCharset, aPostData,
-                            loadInBackground, aAllowThirdPartyFixup || false);
+  browser.loadOneTab(aURL, referrerURI, originCharset, aPostData,
+                     loadInBackground, aAllowThirdPartyFixup || false);
 }
 
 function openNewWindowWith(aURL, aDocument, aPostData, aAllowThirdPartyFixup,
                            aReferrer)
 {
   if (aDocument)
     urlSecurityCheck(aURL, aDocument.nodePrincipal);
 
@@ -593,19 +593,19 @@ function openNewWindowWith(aURL, aDocume
   // setting from the current document and use it to initialize the new browser
   // window...
   var charsetArg = null;
   var wintype = document.documentElement.getAttribute("windowtype");
   if (wintype == "navigator:browser")
     charsetArg = "charset=" + window.content.document.characterSet;
 
   var referrerURI = aDocument ? aDocument.documentURIObject : aReferrer;
-  return window.openDialog(getBrowserURL(), "_blank", "chrome,all,dialog=no",
-                           aURL, charsetArg, referrerURI, aPostData,
-                           aAllowThirdPartyFixup);
+  window.openDialog(getBrowserURL(), "_blank", "chrome,all,dialog=no",
+                    aURL, charsetArg, referrerURI, aPostData,
+                    aAllowThirdPartyFixup);
 }
 
 /**
  * isValidFeed: checks whether the given data represents a valid feed.
  *
  * @param  aData
  *         An object representing a feed with title, href and type.
  * @param  aPrincipal