From efdc7bfac3ad3a4ffdbbc6c1af003ea2526c3d59 Mon Sep 17 00:00:00 2001 From: "jst%mozilla.jstenback.com" Date: Thu, 13 Nov 2003 04:15:25 +0000 Subject: [PATCH] Silly whitespace cleanup. git-svn-id: svn://10.0.0.236/trunk@149234 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/base/src/nsScriptLoader.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/mozilla/content/base/src/nsScriptLoader.cpp b/mozilla/content/base/src/nsScriptLoader.cpp index 1901f1300b4..8725d6ab4ed 100644 --- a/mozilla/content/base/src/nsScriptLoader.cpp +++ b/mozilla/content/base/src/nsScriptLoader.cpp @@ -430,16 +430,17 @@ nsScriptLoader::ProcessScriptElement(nsIDOMHTMLScriptElement *aElement, aElement->GetSrc(src); if (!src.IsEmpty()) { nsCOMPtr baseURI, scriptURI; - + // Use the SRC attribute value to load the URL nsCOMPtr content(do_QueryInterface(aElement)); NS_ASSERTION(content, "nsIDOMHTMLScriptElement not implementing nsIContent"); content->GetBaseURL(getter_AddRefs(baseURI)); rv = NS_NewURI(getter_AddRefs(scriptURI), src, nsnull, baseURI); + if (NS_FAILED(rv)) { return FireErrorNotification(rv, aElement, aObserver); } - + // Check that the containing page is allowed to load this URI. nsIURI *docURI = mDocument->GetDocumentURL(); if (!docURI) { @@ -460,7 +461,8 @@ nsScriptLoader::ProcessScriptElement(nsIDOMHTMLScriptElement *aElement, rv = NS_CheckContentLoadPolicy(nsIContentPolicy::SCRIPT, scriptURI, aElement, domWin, &shouldLoad); if (NS_SUCCEEDED(rv) && !shouldLoad) { - return FireErrorNotification(NS_ERROR_NOT_AVAILABLE, aElement, aObserver); + return FireErrorNotification(NS_ERROR_NOT_AVAILABLE, aElement, + aObserver); } request->mURI = scriptURI; @@ -579,7 +581,7 @@ nsScriptLoader::ProcessRequest(nsScriptLoadRequest* aRequest) FireScriptAvailable(NS_OK, aRequest, *script); nsresult rv = EvaluateScript(aRequest, *script); FireScriptEvaluated(rv, aRequest); - + return rv; }