#112793 fine tune frame charset mechanism

Besides charset, document now records charset source as well.
nsCharsetSource was replaced by PRInt32.
Some code relocation in nsHTMLDocument.cpp
r=yokoyama sr=waterson
This commit is contained in:
shanjian@netscape.com
2001-12-26 03:17:59 +00:00
parent 41f70f6e57
commit a27effa4b8
35 changed files with 507 additions and 332 deletions

View File

@@ -1881,6 +1881,16 @@ nsDocShell::AddChild(nsIDocShellTreeItem * aChild)
if (NS_FAILED(res))
return NS_OK;
PRInt32 charsetSource;
res = doc->GetDocumentCharacterSetSource(&charsetSource);
if (NS_FAILED(res))
return NS_OK;
// set the child's parentCharset
res = dcInfo->SetParentCharsetSource(charsetSource);
if (NS_FAILED(res))
return NS_OK;
// printf("### 1 >>> Adding child. Parent CS = %s. ItemType = %d.\n", NS_LossyConvertUCS2toASCII(parentCS).get(), mItemType);
return NS_OK;