Rename GetNodePrincipal to NodePrincipal. Bug 327246, r+sr=sicking

2006-04-27 18:21:11 +00:00
parent 9bbb5ad09b
commit 1bf48679f8
41 changed files with 152 additions and 287 deletions
--- a/content/base/src/nsFrameLoader.cpp
+++ b/content/base/src/nsFrameLoader.cpp
@@ -164,14 +164,10 @@ nsFrameLoader::LoadURI(nsIURI* aURI)
  nsIScriptSecurityManager *secMan = nsContentUtils::GetSecurityManager();

  // Get our principal
-  nsIPrincipal* principal = mOwnerContent->GetNodePrincipal();
-  NS_ASSERTION(principal == doc->GetNodePrincipal(),
+  nsIPrincipal* principal = mOwnerContent->NodePrincipal();
+  NS_ASSERTION(principal == doc->NodePrincipal(),
               "Principal mismatch.  Should not happen");

-  if (!principal) {
-    return NS_ERROR_FAILURE;
-  }
-  
  // Check if we are allowed to load absURL
  rv = secMan->CheckLoadURIWithPrincipal(principal, aURI,
                                         nsIScriptSecurityManager::STANDARD);