Report the right URI in the warning. Bug 360863, patch by Nickolay Ponomarev

<asqueella@gmail.com>, r+sr=bzbarsky

content/xul/document/src/nsXULDocument.cpp

@@ -3003,11 +3003,14 @@ nsXULDocument::ResumeWalk()
 
                     const PRUnichar* params[] = { piProto->mTarget.get() };
 
+                    nsCOMPtr<nsIURI> overlayURI;
+                    mCurrentPrototype->GetURI(getter_AddRefs(overlayURI));
+
                     nsContentUtils::ReportToConsole(
                                         nsContentUtils::eXUL_PROPERTIES,
                                         "PINotInProlog",
                                         params, NS_ARRAY_LENGTH(params),
-                                        mDocumentURI,
+                                        overlayURI,
                                         EmptyString(), /* source line */
                                         0, /* line number */
                                         0, /* column number */

layout/style/nsCSSLoader.cpp

@@ -1881,7 +1881,7 @@ CSSLoaderImpl::InternalLoadNonDocumentSheet(nsIURI* aURL,
                                             nsICSSLoaderObserver* aObserver)
 {
   NS_PRECONDITION(aURL, "Must have a URI to load");
-  NS_PRECONDITION(aSheet || aObserver, "One or the other please");
+  NS_PRECONDITION(aSheet || aObserver, "Sheet and observer can't both be null");
   NS_ASSERTION(mParsingDatas.Count() == 0, "We're in the middle of a parse?");
 
   LOG_URI("  Non-document sheet uri: '%s'", aURL);