Fix bug 397605. r+sr+a=jst

content/base/src/nsScriptLoader.cpp

@@ -852,13 +852,13 @@ nsScriptLoader::PrepareLoadedRequest(nsScriptLoadRequest* aRequest,
     // the script has a non-cert principal, the document's principal should be
     // downgraded.
     if (channel) {
-      nsCOMPtr<nsISupports> owner;
+      nsCOMPtr<nsIPrincipal> channelPrincipal;
-      channel->GetOwner(getter_AddRefs(owner));
+      nsContentUtils::GetSecurityManager()->
-      nsCOMPtr<nsIPrincipal> principal = do_QueryInterface(owner);
+        GetChannelPrincipal(channel, getter_AddRefs(channelPrincipal));
-
+      if (channelPrincipal) {
-      if (principal) {
         nsCOMPtr<nsIPrincipal> newPrincipal =
-          MaybeDowngradeToCodebase(mDocument->NodePrincipal(), principal);
+          MaybeDowngradeToCodebase(mDocument->NodePrincipal(),
+                                   channelPrincipal);
 
         mDocument->SetPrincipal(newPrincipal);
       }