Added a check for force charset.

git-svn-id: svn://10.0.0.236/trunk@33150 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/content/html/document/src/nsHTMLDocument.cpp

@@ -339,6 +339,13 @@ nsHTMLDocument::StartDocumentLoad(nsIURL *aURL,
             	charset = requestCharset;
             }
        }
+       const PRUnichar* forceCharsetFromWebShell = NULL;
+       rv = webShell->GetForceCharacterSet(&forceCharsetFromWebShell);
+       if(NS_SUCCEEDED(rv) && (nsnull != forceCharsetFromWebShell)) {
+            charset = forceCharsetFromWebShell;
+            //TODO: we should define appropriate constant for force charset
+            charsetSource = kCharsetFromPreviousLoading;  
+       }
     }
     NS_IF_RELEASE(webShell);
 #endif