Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 20036. Fix style sheet ordering.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@54443 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
waterson%netscape.com
1999-11-24 22:43:45 +00:00
parent 52425f1d69
commit bb116685ba
2 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mozilla/content/xul/document/src/nsXULContentSink.cpp
View File

@@ -239,7 +239,6 @@ protected:
nsIParser* mParser; // [OWNER] We use regular pointer b/c of funky exports on nsIParser
nsString mPreferredStyle;
PRInt32 mStyleSheetCount;
nsCOMPtr<nsICSSLoader> mCSSLoader; // [OWNER]
nsCOMPtr<nsICSSParser> mCSSParser; // [OWNER]
};
@@ -362,8 +361,7 @@ XULContentSinkImpl::XULContentSinkImpl(nsresult& rv)
mTextSize(0),
mConstrainSize(PR_TRUE),
mState(eInProlog),
mParser(nsnull),
mStyleSheetCount(0)
mParser(nsnull)
{
NS_INIT_REFCNT();
@@ -891,12 +889,13 @@ XULContentSinkImpl::ProcessStyleLink(nsIContent* aElement,
}
}
// XXX Note that mStyleSheetCount is going to place the style
// sheet in a fairly random location if we're loading an
// overlay. Should we just use a Very Large Number?
nsCOMPtr<nsIDocument> doc = do_QueryReferent(mDocument);
if (! doc)
return NS_ERROR_FAILURE; // doc went away!
PRBool doneLoading;
rv = mCSSLoader->LoadStyleLink(aElement, url, aTitle, aMedia, kNameSpaceID_Unknown,
mStyleSheetCount++,
doc->GetNumberOfStyleSheets(),
((blockParser) ? mParser : nsnull),
doneLoading);
if (NS_SUCCEEDED(rv) && blockParser && (! doneLoading)) {

13
mozilla/rdf/content/src/nsXULContentSink.cpp
View File

@@ -239,7 +239,6 @@ protected:
nsIParser* mParser; // [OWNER] We use regular pointer b/c of funky exports on nsIParser
nsString mPreferredStyle;
PRInt32 mStyleSheetCount;
nsCOMPtr<nsICSSLoader> mCSSLoader; // [OWNER]
nsCOMPtr<nsICSSParser> mCSSParser; // [OWNER]
};
@@ -362,8 +361,7 @@ XULContentSinkImpl::XULContentSinkImpl(nsresult& rv)
mTextSize(0),
mConstrainSize(PR_TRUE),
mState(eInProlog),
mParser(nsnull),
mStyleSheetCount(0)
mParser(nsnull)
{
NS_INIT_REFCNT();
@@ -891,12 +889,13 @@ XULContentSinkImpl::ProcessStyleLink(nsIContent* aElement,
}
}
// XXX Note that mStyleSheetCount is going to place the style
// sheet in a fairly random location if we're loading an
// overlay. Should we just use a Very Large Number?
nsCOMPtr<nsIDocument> doc = do_QueryReferent(mDocument);
if (! doc)
return NS_ERROR_FAILURE; // doc went away!
PRBool doneLoading;
rv = mCSSLoader->LoadStyleLink(aElement, url, aTitle, aMedia, kNameSpaceID_Unknown,
mStyleSheetCount++,
doc->GetNumberOfStyleSheets(),
((blockParser) ? mParser : nsnull),
doneLoading);
if (NS_SUCCEEDED(rv) && blockParser && (! doneLoading)) {