Fix for bugs 89169 and 89522. Reverting the priority of the cached charset to fix regressions. We now resniff the charset even on a cached load. r=yokoyama, sr=jst

htmlparser/src/nsIParser.h

@@ -87,12 +87,12 @@ typedef enum {
    kCharsetFromWeakDocTypeDefault,
    kCharsetFromUserDefault ,
    kCharsetFromDocTypeDefault,
+   kCharsetFromCache,
    kCharsetFromParentFrame,
    kCharsetFromBookmarks,
    kCharsetFromAutoDetection,
    kCharsetFromMetaTag,
    kCharsetFromByteOrderMark,
-   kCharsetFromCache,
    kCharsetFromHTTPHeader,
    kCharsetFromUserForced,
    kCharsetFromOtherComponent,

parser/htmlparser/src/nsIParser.h

@@ -87,12 +87,12 @@ typedef enum {
    kCharsetFromWeakDocTypeDefault,
    kCharsetFromUserDefault ,
    kCharsetFromDocTypeDefault,
+   kCharsetFromCache,
    kCharsetFromParentFrame,
    kCharsetFromBookmarks,
    kCharsetFromAutoDetection,
    kCharsetFromMetaTag,
    kCharsetFromByteOrderMark,
-   kCharsetFromCache,
    kCharsetFromHTTPHeader,
    kCharsetFromUserForced,
    kCharsetFromOtherComponent,