Backout changeset 649f50ed53ca (bug 646184) because of debug crashtest failures
authorEhsan Akhgari <ehsan@mozilla.com>
Fri, 01 Apr 2011 18:22:22 -0400
changeset 64645 779e2ba9810bb6b321ff8b5684db0e5681fddbf6
parent 64644 1be5aead952132171d0f22e4d5d8e0dd4d85ffe4
child 64646 88eb5b5bb5d21ef63d0b60bc760a11377dd481dd
push idunknown
push userunknown
push dateunknown
bugs646184
milestone2.2a1pre
backs out649f50ed53cad1181843ef187f2eb79d6390a852
Backout changeset 649f50ed53ca (bug 646184) because of debug crashtest failures
content/base/crashtests/646184.html
content/base/crashtests/crashtests.list
dom/base/nsGlobalWindow.cpp
deleted file mode 100644
--- a/content/base/crashtests/646184.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<script>
-
-function boom()
-{
-  var f = document.getElementById("f");
-  var w = f.contentWindow;
-  f.parentNode.removeChild(f);
-  w.localStorage;
-}
-
-</script>
-</head>
-<body onload="boom();"><iframe id="f" src="data:text/html,1"></iframe></body>
-</html>
--- a/content/base/crashtests/crashtests.list
+++ b/content/base/crashtests/crashtests.list
@@ -83,9 +83,8 @@ load 595606-2.html
 load 606729-1.html
 load 593302-1.html
 load 593302-2.html
 load 610571-1.html
 load 604262-1.html
 load 628599-1.html
 load 637214-1.svg
 load 637214-2.svg
-load 646184.html
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -7946,19 +7946,17 @@ nsGlobalWindow::GetSessionStorage(nsIDOM
       }
     }
   }
 
   if (!mSessionStorage) {
     *aSessionStorage = nsnull;
 
     nsString documentURI;
-    if (mDocument) {
-      mDocument->GetDocumentURI(documentURI);
-    }
+    mDocument->GetDocumentURI(documentURI);
 
     nsresult rv = docShell->GetSessionStorageForPrincipal(principal,
                                                           documentURI,
                                                           PR_TRUE,
                                                           getter_AddRefs(mSessionStorage));
     NS_ENSURE_SUCCESS(rv, rv);
 
 #ifdef PR_LOGGING
@@ -8032,19 +8030,17 @@ nsGlobalWindow::GetLocalStorage(nsIDOMSt
     if (!principal)
       return NS_OK;
 
     nsCOMPtr<nsIDOMStorageManager> storageManager =
       do_GetService("@mozilla.org/dom/storagemanager;1", &rv);
     NS_ENSURE_SUCCESS(rv, rv);
 
     nsString documentURI;
-    if (mDocument) {
-      mDocument->GetDocumentURI(documentURI);
-    }
+    mDocument->GetDocumentURI(documentURI);
 
     rv = storageManager->GetLocalStorageForPrincipal(principal,
                                                      documentURI,
                                                      getter_AddRefs(mLocalStorage));
     NS_ENSURE_SUCCESS(rv, rv);
   }
 
   NS_ADDREF(*aLocalStorage = mLocalStorage);