Bug 1270680 - Part 3 - Get origin attributes from loadInfo in LoadImageWithChannel(). r=tanvi

image/imgLoader.cpp

@@ -2342,12 +2342,8 @@ imgLoader::LoadImageWithChannel(nsIChannel* channel,
   nsCOMPtr<nsILoadInfo> loadInfo = channel->GetLoadInfo();
   NS_ENSURE_TRUE(loadInfo, NS_ERROR_FAILURE);
 
-  nsCOMPtr<nsIPrincipal> principal;
-  loadInfo->GetLoadingPrincipal(getter_AddRefs(principal));
-  NS_ENSURE_TRUE(principal, NS_ERROR_FAILURE);
-
-  const PrincipalOriginAttributes& attrs =
-    BasePrincipal::Cast(principal)->OriginAttributesRef();
+  PrincipalOriginAttributes attrs;
+  attrs.InheritFromNecko(loadInfo->GetOriginAttributes());
 
   ImageCacheKey key(uri, attrs, doc);