wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix orange from bug 390168 by adopting a slightly different approach. Reviews from jst pending.

Browse Source
This commit is contained in:
bzbarsky@mit.edu 2007-08-24 18:45:15 -07:00
parent bbaf727b9d
commit ee50c0fc2c
2 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,7 +57,7 @@ PRLogModuleInfo * gWyciwygLog = nsnull;
nsWyciwygChannel::nsWyciwygChannel()
: mStatus(NS_OK),
mIsPending(PR_FALSE),
mCharsetSet(PR_FALSE),
mNeedToWriteCharset(PR_FALSE),
mCharsetSource(kCharsetUninitialized),
mContentLength(-1),
mLoadFlags(LOAD_NORMAL)
@ -350,12 +350,9 @@ nsWyciwygChannel::WriteToCacheEntry(const nsAString &aData)
mCacheEntry->SetSecurityInfo(mSecurityInfo);
}
if (mCharsetSet) {
mCacheEntry->SetMetaDataElement("charset", mCharset.get());
nsCAutoString source;
source.AppendInt(mCharsetSource);
mCacheEntry->SetMetaDataElement("charset-source", source.get());
if (mNeedToWriteCharset) {
WriteCharsetAndSourceToCache(mCharsetSource, mCharset);
mNeedToWriteCharset = PR_FALSE;
}
PRUint32 out;
@ -406,9 +403,13 @@ nsWyciwygChannel::SetCharsetAndSource(PRInt32 aSource,
{
NS_ENSURE_ARG(!aCharset.IsEmpty());
mCharsetSet = PR_TRUE;
mCharsetSource = aSource;
mCharset = aCharset;
if (mCacheEntry) {
WriteCharsetAndSourceToCache(aSource, PromiseFlatCString(aCharset));
} else {
mNeedToWriteCharset = PR_TRUE;
mCharsetSource = aSource;
mCharset = aCharset;
}
return NS_OK;
}
@ -638,4 +639,17 @@ nsWyciwygChannel::ReadFromCache()
return mPump->AsyncRead(this, nsnull);
}
void
nsWyciwygChannel::WriteCharsetAndSourceToCache(PRInt32 aSource,
const nsCString& aCharset)
{
NS_PRECONDITION(mCacheEntry, "Better have cache entry!");
mCacheEntry->SetMetaDataElement("charset", aCharset.get());
nsCAutoString source;
source.AppendInt(aSource);
mCacheEntry->SetMetaDataElement("charset-source", source.get());
}
// vim: ts=2 sw=2

5
content/html/document/src/nsWyciwygChannel.h
View File

@ -83,10 +83,13 @@ public:
protected:
nsresult ReadFromCache();
nsresult OpenCacheEntry(const nsACString & aCacheKey, nsCacheAccessMode aWriteAccess, PRBool * aDelayFlag = nsnull);
void WriteCharsetAndSourceToCache(PRInt32 aSource,
const nsCString& aCharset);
nsresult mStatus;
PRPackedBool mIsPending;
PRPackedBool mCharsetSet;
PRPackedBool mNeedToWriteCharset;
PRInt32 mCharsetSource;
nsCString mCharset;
PRInt32 mContentLength;