Backed out changeset 49976a593558 (bug 866748) for mochitest asserts.
authorRyan VanderMeulen <ryanvm@gmail.com>
Tue, 30 Apr 2013 10:15:09 -0400
changeset 130339 598cfd4cb5ebfd40e1e6d833c236dae2e292a825
parent 130338 b2c7297fe7ed8ab6deeda3e48765d9edc3897b44
child 130340 d2348909462c06471e2f5f69bfac6bbcc5782c26
push id27313
push userryanvm@gmail.com
push dateTue, 30 Apr 2013 14:15:16 +0000
treeherdermozilla-inbound@598cfd4cb5eb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs866748
milestone23.0a1
backs out49976a5935584a9854327fc44128d51e6a4b1891
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
Backed out changeset 49976a593558 (bug 866748) for mochitest asserts.
uriloader/base/nsDocLoader.cpp
--- a/uriloader/base/nsDocLoader.cpp
+++ b/uriloader/base/nsDocLoader.cpp
@@ -947,28 +947,27 @@ nsDocLoader::GetDOMWindowID(uint64_t *aR
 }
 
 NS_IMETHODIMP
 nsDocLoader::GetIsTopLevel(bool *aResult)
 {
   *aResult = false;
 
   nsCOMPtr<nsIDOMWindow> window;
-  GetDOMWindow(getter_AddRefs(window));
-  if (window) {
-    nsCOMPtr<nsPIDOMWindow> piwindow = do_QueryInterface(window);
-    NS_ENSURE_STATE(piwindow);
+  nsresult rv = GetDOMWindow(getter_AddRefs(window));
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  nsCOMPtr<nsPIDOMWindow> piwindow = do_QueryInterface(window);
+  NS_ENSURE_STATE(piwindow);
 
-    nsCOMPtr<nsIDOMWindow> topWindow;
-    nsresult rv = piwindow->GetTop(getter_AddRefs(topWindow));
-    NS_ENSURE_SUCCESS(rv, rv);
+  nsCOMPtr<nsIDOMWindow> topWindow;
+  rv = piwindow->GetTop(getter_AddRefs(topWindow));
+  NS_ENSURE_SUCCESS(rv, rv);
 
-    *aResult = piwindow == topWindow;
-  }
-
+  *aResult = piwindow == topWindow;
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsDocLoader::GetIsLoadingDocument(bool *aIsLoadingDocument)
 {
   *aIsLoadingDocument = mIsLoadingDocument;