Backout d83c1ffb7397 (bug 741266) due to Windows M1 failures
authorMarco Bonardo <mbonardo@mozilla.com>
Sat, 07 Apr 2012 01:34:28 +0200
changeset 94520 3be23dcd43e45a3e108aded097c0065a6b244698
parent 94519 b94616a8d514973c005d75a9692f00f024102725
child 94521 a29bc0e8de0a89c49257239ba1aec2eb9781cec9
push id886
push userlsblakk@mozilla.com
push dateMon, 04 Jun 2012 19:57:52 +0000
treeherdermozilla-beta@bbd8d5efd6d1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs741266
milestone14.0a1
backs outd83c1ffb7397e8bcf4919bb44b87bf33bc3b853c
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
Backout d83c1ffb7397 (bug 741266) due to Windows M1 failures
content/html/document/src/nsHTMLDocument.cpp
content/html/document/test/Makefile.in
content/html/document/test/test_bug741266.html
--- a/content/html/document/src/nsHTMLDocument.cpp
+++ b/content/html/document/src/nsHTMLDocument.cpp
@@ -130,17 +130,16 @@
 #include "nsHtml5Module.h"
 #include "prprf.h"
 #include "mozilla/dom/Element.h"
 #include "mozilla/Preferences.h"
 #include "nsMimeTypes.h"
 #include "nsIRequest.h"
 #include "nsHtml5TreeOpExecutor.h"
 #include "nsHtml5Parser.h"
-#include "nsIDOMJSWindow.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;
 
 #define NS_MAX_DOCUMENT_WRITE_DEPTH 20
 
 #include "prmem.h"
 #include "prtime.h"
@@ -1322,20 +1321,19 @@ nsHTMLDocument::Open(const nsAString& aC
                "XOW should have caught this!");
 
   // When called with 3 or more arguments, document.open() calls window.open().
   if (aOptionalArgCount > 2) {
     nsCOMPtr<nsIDOMWindow> window = GetWindowInternal();
     if (!window) {
       return NS_OK;
     }
-    nsCOMPtr<nsIDOMJSWindow> win = do_QueryInterface(window);
     nsCOMPtr<nsIDOMWindow> newWindow;
-    nsresult rv = win->OpenJS(aContentTypeOrUrl, aReplaceOrName, aFeatures,
-                              getter_AddRefs(newWindow));
+    nsresult rv = window->Open(aContentTypeOrUrl, aReplaceOrName, aFeatures,
+                               getter_AddRefs(newWindow));
     *aReturn = newWindow.forget().get();
     return rv;
   }
 
   if (!IsHTML() || mDisableDocWrite) {
     // No calling document.open() on XHTML
     return NS_ERROR_DOM_INVALID_STATE_ERR;
   }
--- a/content/html/document/test/Makefile.in
+++ b/content/html/document/test/Makefile.in
@@ -102,17 +102,16 @@ include $(topsrcdir)/config/rules.mk
 		test_bug499092.html \
 		bug499092.xml \
 		bug499092.html \
 		test_bug512367.html \
 		test_bug571981.html \
 		test_bug677495.html \
 		test_bug677495-1.html \
 		test_bug742261.html \
-		test_bug741266.html \
 		$(NULL)
 
 ifneq (mobile,$(MOZ_BUILD_APP))
 _BROWSER_TEST_FILES = \
 		browser_bug592641.js \
 		bug592641_img.jpg \
 		$(NULL)
 endif
deleted file mode 100644
--- a/content/html/document/test/test_bug741266.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=741266
--->
-<head>
-  <meta charset="utf-8">
-  <title>Test for Bug 741266</title>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=741266">Mozilla Bug 741266</a>
-<p id="display"></p>
-<div id="content" style="display: none">
-  
-</div>
-<pre id="test">
-<script type="application/javascript">
-
-/** Test for Bug 741266 **/
-var w = window.open("", "", "width=100,height=100");
-is(w.innerHeight, 100, "Popup height should be 100 when opened with window.open");
-is(w.innerWidth, 100, "Popup width should be 100 when opened with window.open");
-w.close();
-w = document.open("", "", "width=100,height=100");
-is(w.innerHeight, 100, "Popup height should be 100 when opened with document.open");
-is(w.innerWidth, 100, "Popup width should be 100 when opened with document.open");
-w.close();
-</script>
-</pre>
-</body>
-</html>