Bug 779123 - Return NS_ERROR_FAILURE instead of false from nsDocShell::GetExtendedOrigin; r=jlebar
authorAryeh Gregor <ayg@aryeh.name>
Wed, 01 Aug 2012 18:46:48 +0300
changeset 101203 8d9891ef7bcbab357e42ad4b1386a9bccf890065
parent 101202 865a6f2d3a831e77a6756780acd1d3dbc501bdfa
child 101204 31d125be7ac50fbae3837044aa1c0c0a90e64c04
push id12896
push userayg@aryeh.name
push dateThu, 02 Aug 2012 09:31:29 +0000
treeherdermozilla-inbound@430c7512acee [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjlebar
bugs779123
milestone17.0a1
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 779123 - Return NS_ERROR_FAILURE instead of false from nsDocShell::GetExtendedOrigin; r=jlebar
docshell/base/nsDocShell.cpp
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -11376,17 +11376,17 @@ nsDocShell::GetIsContent(bool *aIsConten
 NS_IMETHODIMP
 nsDocShell::GetExtendedOrigin(nsIURI *aUri, nsACString &aResult)
 {
     bool isInBrowserElement;
     GetIsInBrowserElement(&isInBrowserElement);
 
     nsCOMPtr<nsIScriptSecurityManager> ssmgr =
       do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID);
-    NS_ENSURE_TRUE(ssmgr, false);
+    NS_ENSURE_TRUE(ssmgr, NS_ERROR_FAILURE);
 
     return ssmgr->GetExtendedOrigin(aUri, mAppId, isInBrowserElement, aResult);
 }
 
 
 bool
 nsDocShell::IsOKToLoadURI(nsIURI* aURI)
 {