Fix for bug #37543, a=ftang, r=nhotta.

git-svn-id: svn://10.0.0.236/trunk@75618 18797224-902f-48f8-a5cc-f745e15eee43
2000-08-05 00:07:03 +00:00
parent 078c67b29e
commit 99abc99837
5 changed files with 119 additions and 0 deletions
--- a/mozilla/content/html/document/src/nsHTMLDocument.cpp
+++ b/mozilla/content/html/document/src/nsHTMLDocument.cpp
@@ -752,6 +752,19 @@ nsHTMLDocument::StartDocumentLoad(const char* aCommand,
       }
    } 

+    if (kCharsetFromParentFrame > charsetSource) {
+      if (dcInfo) {
+        nsCOMPtr<nsIAtom> csAtom;
+        dcInfo->GetParentCharset(getter_AddRefs(csAtom));
+        if (csAtom) {
+          csAtom->ToString(charset);
+          charsetSource = kCharsetFromParentFrame;  
+
+          // printf("### 0 >>> Having parent CS = %s\n", charset.ToNewCString());
+        }
+      }
+    }
+
    if((kCharsetFromAutoDetection > charsetSource )  && gPlugDetector)
    {
      nsCOMPtr <nsICharsetDetector> cdet = do_CreateInstance(g_detector_progid,