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

Bug 475480 - Fix warnings created by the speculative parsing landing. r+sr=sicking

Browse Source
This commit is contained in:
Blake Kaplan 2009-01-27 15:30:31 -08:00
parent 46c67c1d43
commit 67fb3b8825
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
parser/htmlparser/src/nsParser.cpp
View File

@ -202,8 +202,8 @@ public:
nsSpeculativeScriptThread()
: mLock(nsAutoLock::DestroyLock),
mCVar(PR_DestroyCondVar),
mKeepParsing(0),
mCurrentlyParsing(0),
mKeepParsing(PR_FALSE),
mCurrentlyParsing(PR_FALSE),
mNumURIs(0),
mNumConsumed(0),
mContext(nsnull),
@ -272,8 +272,8 @@ private:
Holder<PRLock> mLock;
Holder<PRCondVar> mCVar;
volatile PRUint32 mKeepParsing;
volatile PRUint32 mCurrentlyParsing;
volatile PRBool mKeepParsing;
volatile PRBool mCurrentlyParsing;
nsRefPtr<nsHTMLTokenizer> mTokenizer;
nsAutoPtr<nsScanner> mScanner;
@ -398,7 +398,7 @@ nsSpeculativeScriptThread::Run()
{
nsAutoLock al(mLock.get());
mCurrentlyParsing = 0;
mCurrentlyParsing = PR_FALSE;
PR_NotifyCondVar(mCVar.get());
}
return NS_OK;
@ -491,8 +491,8 @@ nsSpeculativeScriptThread::StartParsing(nsParser *aParser)
}
mDocument.swap(doc);
mKeepParsing = 1;
mCurrentlyParsing = 1;
mKeepParsing = PR_TRUE;
mCurrentlyParsing = PR_TRUE;
mContext = context;
return aParser->ThreadPool()->Dispatch(this, NS_DISPATCH_NORMAL);
}
@ -510,7 +510,7 @@ nsSpeculativeScriptThread::StopParsing(PRBool /*aFromDocWrite*/)
{
nsAutoLock al(mLock.get());
mKeepParsing = 0;
mKeepParsing = PR_FALSE;
if (mCurrentlyParsing) {
PR_WaitCondVar(mCVar.get(), PR_INTERVAL_NO_TIMEOUT);
NS_ASSERTION(!mCurrentlyParsing, "Didn't actually stop parsing?");
@ -552,7 +552,7 @@ nsSpeculativeScriptThread::ProcessToken(CToken *aToken)
nsAutoString src;
nsAutoString elementType;
nsAutoString charset;
PrefetchType ptype;
PrefetchType ptype = SCRIPT;
switch (tag) {
#if 0 // TODO Support stylesheet and image preloading.
@ -588,9 +588,11 @@ nsSpeculativeScriptThread::ProcessToken(CToken *aToken)
case eHTMLTag_style:
ptype = STYLESHEET;
/* FALL THROUGH */
case eHTMLTag_img:
if (tag == eHTMLTag_img)
ptype = IMAGE;
/* FALL THROUGH */
#endif
case eHTMLTag_script:
if (tag == eHTMLTag_script)