From 4266a00e98f68bb4d6c878adf9f032a8386c87f7 Mon Sep 17 00:00:00 2001
From: "shanjian%netscape.com" <shanjian%netscape.com>
Date: Fri, 27 Apr 2001 21:47:14 +0000
Subject: [PATCH] #43529 Propagate charset override in frames r = ftang sr=erik
 Charset from parent frame should take precedence of charset from cache.

---
 htmlparser/src/nsIParser.h        | 2 +-
 parser/htmlparser/src/nsIParser.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htmlparser/src/nsIParser.h b/htmlparser/src/nsIParser.h
index 9dfba85e56e..197f84d8fe5 100644
--- a/htmlparser/src/nsIParser.h
+++ b/htmlparser/src/nsIParser.h
@@ -87,8 +87,8 @@ typedef enum {
    kCharsetFromWeakDocTypeDefault,
    kCharsetFromUserDefault ,
    kCharsetFromDocTypeDefault,
-   kCharsetFromParentFrame,
    kCharsetFromCache,
+   kCharsetFromParentFrame,
    kCharsetFromBookmarks,
    kCharsetFromAutoDetection,
    kCharsetFromMetaTag,
diff --git a/parser/htmlparser/src/nsIParser.h b/parser/htmlparser/src/nsIParser.h
index 9dfba85e56e..197f84d8fe5 100644
--- a/parser/htmlparser/src/nsIParser.h
+++ b/parser/htmlparser/src/nsIParser.h
@@ -87,8 +87,8 @@ typedef enum {
    kCharsetFromWeakDocTypeDefault,
    kCharsetFromUserDefault ,
    kCharsetFromDocTypeDefault,
-   kCharsetFromParentFrame,
    kCharsetFromCache,
+   kCharsetFromParentFrame,
    kCharsetFromBookmarks,
    kCharsetFromAutoDetection,
    kCharsetFromMetaTag,