Bug 369560 followup: Soften language in unusual-but-innocuous NS_WARNING for XBL docs with no root element. r=bz
authorDaniel Holbert <dholbert@cs.stanford.edu>
Sun, 08 Apr 2012 18:37:41 -0700
changeset 94536 5b3f94379f5cd2a1e9871a95e50ba4d1b5af6fcb
parent 94535 6dffa132f245bfd8cdbfc05b56b1a04b9b7c04ff
child 94537 7227004c889379546c4e8bdbf61b83fd9d4eb8f1
child 94550 2b364a0ca1da908db47d92dba3edf378f6ecc8a2
push id886
push userlsblakk@mozilla.com
push dateMon, 04 Jun 2012 19:57:52 +0000
treeherdermozilla-beta@bbd8d5efd6d1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbz
bugs369560
milestone14.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 369560 followup: Soften language in unusual-but-innocuous NS_WARNING for XBL docs with no root element. r=bz
content/xbl/src/nsXBLService.cpp
--- a/content/xbl/src/nsXBLService.cpp
+++ b/content/xbl/src/nsXBLService.cpp
@@ -395,17 +395,17 @@ nsXBLStreamListener::HandleEvent(nsIDOME
 
     // Remove ourselves from the set of pending docs.
     nsBindingManager *bindingManager = doc->BindingManager();
     nsIURI* documentURI = bindingDocument->GetDocumentURI();
     bindingManager->RemoveLoadingDocListener(documentURI);
 
     if (!bindingDocument->GetRootElement()) {
       // FIXME: How about an error console warning?
-      NS_WARNING("*** XBL doc with no root element! Something went horribly wrong! ***");
+      NS_WARNING("XBL doc with no root element - this usually shouldn't happen");
       return NS_ERROR_FAILURE;
     }
 
     // Put our doc info in the doc table.
     nsBindingManager *xblDocBindingManager = bindingDocument->BindingManager();
     nsRefPtr<nsXBLDocumentInfo> info =
       xblDocBindingManager->GetXBLDocumentInfo(documentURI);
     xblDocBindingManager->RemoveXBLDocumentInfo(info); // Break the self-imposed cycle.