Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 06:11:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

#162239 POST document could not inherit charset from previous page if the previous charset is from autodetection.

Browse Source 
r=ftang, darin, sr=jst
added PrevDocCharset to markupViewer, and pass around previous document charset.
This charset is later used to load POST document.
This commit is contained in:
shanjian%netscape.com 2002-08-26 20:13:31 +00:00
parent 35b76fe46c
commit fd1c7b2e6c
9 changed files with 143 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
content/base/src/nsDocumentViewer.cpp
View File

@ -467,6 +467,7 @@ protected:
nsString mHintCharset;
PRInt32 mHintCharsetSource;
nsString mForceCharacterSet;
nsString mPrevDocCharacterSet;
};
//------------------------------------------------------------------
@ -2397,6 +2398,31 @@ NS_IMETHODIMP DocumentViewerImpl::GetHintCharacterSetSource(PRInt32 *aHintCharac
return NS_OK;
}
NS_IMETHODIMP DocumentViewerImpl::GetPrevDocCharacterSet(PRUnichar * *aPrevDocCharacterSet)
{
NS_ENSURE_ARG_POINTER(aPrevDocCharacterSet);
*aPrevDocCharacterSet = ToNewUnicode(mPrevDocCharacterSet);
return NS_OK;
}
static void
SetChildPrevDocCharacterSet(nsIMarkupDocumentViewer* aChild, void* aClosure)
{
aChild->SetPrevDocCharacterSet((PRUnichar*) aClosure);
}
NS_IMETHODIMP DocumentViewerImpl::SetPrevDocCharacterSet(const PRUnichar* aPrevDocCharacterSet)
{
mPrevDocCharacterSet = aPrevDocCharacterSet;
return CallChildren(SetChildPrevDocCharacterSet,
(void*) aPrevDocCharacterSet);
}
static void
SetChildHintCharacterSetSource(nsIMarkupDocumentViewer* aChild, void* aClosure)
{

35
content/html/document/src/nsHTMLContentSink.cpp
View File

@ -151,6 +151,7 @@
#include "nsLayoutCID.h"
#include "nsIFrameManager.h"
#include "nsILayoutHistoryState.h"
#include "nsIDocShellTreeItem.h"
#include "nsEscape.h"
@ -5117,6 +5118,40 @@ HTMLContentSink::FlushPendingNotifications()
NS_IMETHODIMP
HTMLContentSink::SetDocumentCharset(nsAString& aCharset)
{
if (mWebShell) {
// the following logic to get muCV is copied from
// nsHTMLDocument::StartDocumentLoad
// We need to call muCV->SetPrevDocCharacterSet here in case
// the charset is detected by parser DetectMetaTag
nsCOMPtr<nsIDocShell> docShell(do_QueryInterface(mWebShell));
nsCOMPtr<nsIMarkupDocumentViewer> muCV;
nsCOMPtr<nsIContentViewer> cv;
docShell->GetContentViewer(getter_AddRefs(cv));
if (cv) {
muCV = do_QueryInterface(cv);
} else {
// in this block of code, if we get an error result, we return it
// but if we get a null pointer, that's perfectly legal for parent and parentContentViewer
nsCOMPtr<nsIDocShellTreeItem> docShellAsItem(do_QueryInterface(docShell));
NS_ENSURE_TRUE(docShellAsItem, NS_ERROR_FAILURE);
nsCOMPtr<nsIDocShellTreeItem> parentAsItem;
docShellAsItem->GetSameTypeParent(getter_AddRefs(parentAsItem));
nsCOMPtr<nsIDocShell> parent(do_QueryInterface(parentAsItem));
if (parent) {
nsCOMPtr<nsIContentViewer> parentContentViewer;
nsresult rv = parent->GetContentViewer(getter_AddRefs(parentContentViewer));
if (NS_SUCCEEDED(rv) && parentContentViewer) {
muCV = do_QueryInterface(parentContentViewer);
}
}
}
if (muCV) {
muCV->SetPrevDocCharacterSet(PromiseFlatString(aCharset).get());
}
}
if (mDocument) {
return mDocument->SetDocumentCharacterSet(aCharset);
}

34
content/html/document/src/nsHTMLDocument.cpp
View File

@ -964,17 +964,27 @@ nsHTMLDocument::StartDocumentLoad(const char* aCommand,
UseWeakDocTypeDefault(charsetSource, charset);
}
}
if(kCharsetFromAutoDetection > charsetSource) {
PRBool isPostPage = PR_FALSE;
//check if current doc is from POST command
if (httpChannel) {
nsCAutoString methodStr;
if (httpChannel) {
rv = httpChannel->GetRequestMethod(methodStr);
if (NS_FAILED(rv) || !methodStr.Equals(NS_LITERAL_CSTRING("POST"))) {
StartAutodetection(docShell, charset, aCommand);
}
rv = httpChannel->GetRequestMethod(methodStr);
if (NS_SUCCEEDED(rv) && methodStr.Equals(NS_LITERAL_CSTRING("POST")))
isPostPage = PR_TRUE;
}
if (isPostPage && muCV && kCharsetFromHintPrevDoc > charsetSource) {
PRUnichar* requestCharset;
muCV->GetPrevDocCharacterSet(&requestCharset);
if (*requestCharset) {
charsetSource = kCharsetFromHintPrevDoc;
charset = requestCharset;
}
else
StartAutodetection(docShell, charset, aCommand);
}
if(kCharsetFromAutoDetection > charsetSource && !isPostPage) {
StartAutodetection(docShell, charset, aCommand);
}
#endif
@ -987,7 +997,11 @@ nsHTMLDocument::StartDocumentLoad(const char* aCommand,
SetDocumentCharacterSet(charset);
SetDocumentCharacterSetSource(charsetSource);
// set doc charset to muCV for next document.
if (muCV)
muCV->SetPrevDocCharacterSet(charset.get());
if(cacheDescriptor) {
rv = cacheDescriptor->SetMetaDataElement("charset",
NS_ConvertUCS2toUTF8(charset).get());

6
docshell/base/nsDocShell.cpp
View File

@ -4442,6 +4442,7 @@ nsDocShell::SetupNewViewer(nsIContentViewer * aNewViewer)
nsXPIDLString forceCharset;
nsXPIDLString hintCharset;
PRInt32 hintCharsetSource;
nsXPIDLString prevDocCharset;
nsCOMPtr<nsIMarkupDocumentViewer>
newMUDV(do_QueryInterface(aNewViewer));
@ -4459,6 +4460,9 @@ nsDocShell::SetupNewViewer(nsIContentViewer * aNewViewer)
NS_ENSURE_SUCCESS(oldMUDV->
GetHintCharacterSetSource(&hintCharsetSource),
NS_ERROR_FAILURE);
NS_ENSURE_SUCCESS(oldMUDV->
GetPrevDocCharacterSet(getter_Copies(prevDocCharset)),
NS_ERROR_FAILURE);
// set the old state onto the new content viewer
NS_ENSURE_SUCCESS(newMUDV->SetDefaultCharacterSet(defaultCharset),
@ -4470,6 +4474,8 @@ nsDocShell::SetupNewViewer(nsIContentViewer * aNewViewer)
NS_ENSURE_SUCCESS(newMUDV->
SetHintCharacterSetSource(hintCharsetSource),
NS_ERROR_FAILURE);
NS_ENSURE_SUCCESS(newMUDV->SetPrevDocCharacterSet(prevDocCharset),
NS_ERROR_FAILURE);
}
}

5
docshell/base/nsIMarkupDocumentViewer.idl
View File

@ -70,6 +70,11 @@ interface nsIMarkupDocumentViewer : nsISupports
*/
attribute PRInt32 hintCharacterSetSource;
/*
character set from prev document
*/
attribute wstring prevDocCharacterSet;
//void GetCharacterSetHint(in wstring hintCharset, in PRInt32 charsetSource);
/**

15
htmlparser/public/nsIParser.h
View File

@ -102,13 +102,14 @@ enum eParserDocType {
#define kCharsetFromParentFrame 5
#define kCharsetFromBookmarks 6
#define kCharsetFromAutoDetection 7
#define kCharsetFromMetaTag 8
#define kCharsetFromByteOrderMark 9
#define kCharsetFromChannel 10
#define kCharsetFromParentForced 11
#define kCharsetFromUserForced 12
#define kCharsetFromOtherComponent 13
#define kCharsetFromPreviousLoading 14
#define kCharsetFromHintPrevDoc 8
#define kCharsetFromMetaTag 9
#define kCharsetFromByteOrderMark 10
#define kCharsetFromChannel 11
#define kCharsetFromParentForced 12
#define kCharsetFromUserForced 13
#define kCharsetFromOtherComponent 14
#define kCharsetFromPreviousLoading 15
enum eStreamState {eNone,eOnStart,eOnDataAvail,eOnStop};

5
intl/chardet/src/nsDetectionAdaptor.cpp
View File

@ -44,6 +44,7 @@
#include "nsIParser.h"
#include "nsIDocument.h"
#include "nsDetectionAdaptor.h"
#include "nsIContentSink.h"
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
@ -65,6 +66,10 @@ NS_IMETHODIMP nsMyObserver::Notify(
mWeakRefParser->GetDocumentCharset(existingCharset, existingSource);
if (existingSource < kCharsetFromAutoDetection) {
mWeakRefParser->SetDocumentCharset(newcharset, kCharsetFromAutoDetection);
nsCOMPtr<nsIContentSink> contentSink = mWeakRefParser->GetContentSink();
if (contentSink)
contentSink->SetDocumentCharset(newcharset);
if(mWeakRefDocument)
mWeakRefDocument->SetDocumentCharacterSet(newcharset);
}

26
layout/base/nsDocumentViewer.cpp
View File

@ -467,6 +467,7 @@ protected:
nsString mHintCharset;
PRInt32 mHintCharsetSource;
nsString mForceCharacterSet;
nsString mPrevDocCharacterSet;
};
//------------------------------------------------------------------
@ -2397,6 +2398,31 @@ NS_IMETHODIMP DocumentViewerImpl::GetHintCharacterSetSource(PRInt32 *aHintCharac
return NS_OK;
}
NS_IMETHODIMP DocumentViewerImpl::GetPrevDocCharacterSet(PRUnichar * *aPrevDocCharacterSet)
{
NS_ENSURE_ARG_POINTER(aPrevDocCharacterSet);
*aPrevDocCharacterSet = ToNewUnicode(mPrevDocCharacterSet);
return NS_OK;
}
static void
SetChildPrevDocCharacterSet(nsIMarkupDocumentViewer* aChild, void* aClosure)
{
aChild->SetPrevDocCharacterSet((PRUnichar*) aClosure);
}
NS_IMETHODIMP DocumentViewerImpl::SetPrevDocCharacterSet(const PRUnichar* aPrevDocCharacterSet)
{
mPrevDocCharacterSet = aPrevDocCharacterSet;
return CallChildren(SetChildPrevDocCharacterSet,
(void*) aPrevDocCharacterSet);
}
static void
SetChildHintCharacterSetSource(nsIMarkupDocumentViewer* aChild, void* aClosure)
{

15
parser/htmlparser/public/nsIParser.h
View File

@ -102,13 +102,14 @@ enum eParserDocType {
#define kCharsetFromParentFrame 5
#define kCharsetFromBookmarks 6
#define kCharsetFromAutoDetection 7
#define kCharsetFromMetaTag 8
#define kCharsetFromByteOrderMark 9
#define kCharsetFromChannel 10
#define kCharsetFromParentForced 11
#define kCharsetFromUserForced 12
#define kCharsetFromOtherComponent 13
#define kCharsetFromPreviousLoading 14
#define kCharsetFromHintPrevDoc 8
#define kCharsetFromMetaTag 9
#define kCharsetFromByteOrderMark 10
#define kCharsetFromChannel 11
#define kCharsetFromParentForced 12
#define kCharsetFromUserForced 13
#define kCharsetFromOtherComponent 14
#define kCharsetFromPreviousLoading 15
enum eStreamState {eNone,eOnStart,eOnDataAvail,eOnStop};