Fixing comments and assertion text. Bug 466681
authorBoris Zbarsky <bzbarsky@mit.edu>
Wed, 26 Nov 2008 13:48:36 -0500
changeset 21959 d55b29bfe3bfad7d7fd05c07128c5d2374cf53d2
parent 21958 bb54a5700bca96d77b76734db5ea4518b024b327
child 21960 062df3024e5539406dd39cbe375687c3fe3af21f
push id3757
push userbzbarsky@mozilla.com
push dateWed, 26 Nov 2008 18:48:57 +0000
treeherdermozilla-central@d55b29bfe3bf [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs466681
milestone1.9.1b3pre
Fixing comments and assertion text. Bug 466681
docshell/base/nsDocShell.cpp
docshell/base/nsDocShellLoadTypes.h
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -708,17 +708,17 @@ nsDocShell::ConvertLoadTypeToDocShellLoa
 NS_IMETHODIMP
 nsDocShell::LoadURI(nsIURI * aURI,
                     nsIDocShellLoadInfo * aLoadInfo,
                     PRUint32 aLoadFlags,
                     PRBool aFirstParty)
 {
     NS_PRECONDITION(aLoadInfo || (aLoadFlags & EXTRA_LOAD_FLAGS) == 0,
                     "Unexpected flags");
-    NS_PRECONDITION((aLoadFlags & 0xf) == 0, "Should have these flags set");
+    NS_PRECONDITION((aLoadFlags & 0xf) == 0, "Should not have these flags set");
     
     // Note: we allow loads to get through here even if mFiredUnloadEvent is
     // true; that case will get handled in LoadInternal or LoadHistoryEntry.
     if (IsPrintingOrPP()) {
       return NS_OK; // JS may not handle returning of an error code
     }
     nsresult rv;
     nsCOMPtr<nsIURI> referrer;
--- a/docshell/base/nsDocShellLoadTypes.h
+++ b/docshell/base/nsDocShellLoadTypes.h
@@ -43,17 +43,17 @@
 
 #ifdef MOZILLA_INTERNAL_API
 
 #include "nsIDocShell.h"
 #include "nsIWebNavigation.h"
 
 /**
  * Load flag for error pages. This uses one of the reserved flag
- * values from nsIWebNabvigation.
+ * values from nsIWebNavigation.
  */
 #define LOAD_FLAGS_ERROR_PAGE 0x0001U
 
 #define MAKE_LOAD_TYPE(type, flags) ((type) | ((flags) << 16))
 #define LOAD_TYPE_HAS_FLAGS(type, flags) ((type) & ((flags) << 16))
 
 /**
  * These are flags that confuse ConvertLoadTypeToDocShellLoadInfo and should