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 868730 - Make nsDocument::ResetStylesheetsToURI return void; r=mounir

Browse Source
This commit is contained in:
Ms2ger 2013-05-10 09:13:37 +02:00
parent cbd5d22f79
commit b151a55d94
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
content/base/src/nsDocument.cpp
View File

@ -2198,10 +2198,10 @@ nsDocument::RemoveStyleSheetsFromStyleSets(nsCOMArray<nsIStyleSheet>& aSheets, n
}
nsresult
void
nsDocument::ResetStylesheetsToURI(nsIURI* aURI)
{
NS_PRECONDITION(aURI, "Null URI passed to ResetStylesheetsToURI");
MOZ_ASSERT(aURI);
mozAutoDocUpdate upd(this, UPDATE_STYLE, true);
RemoveDocStyleSheetsFromStyleSets();
@ -2257,8 +2257,6 @@ nsDocument::ResetStylesheetsToURI(nsIURI* aURI)
if (shell) {
FillStyleSet(shell->StyleSet());
}
return NS_OK;
}
static bool

2
content/base/src/nsDocument.h
View File

@ -1150,7 +1150,7 @@ protected:
void RemoveDocStyleSheetsFromStyleSets();
void RemoveStyleSheetsFromStyleSets(nsCOMArray<nsIStyleSheet>& aSheets,
nsStyleSet::sheetType aType);
nsresult ResetStylesheetsToURI(nsIURI* aURI);
void ResetStylesheetsToURI(nsIURI* aURI);
void FillStyleSet(nsStyleSet* aStyleSet);
// Return whether all the presshells for this document are safe to flush

3
content/xul/document/src/XULDocument.cpp
View File

@ -433,8 +433,7 @@ XULDocument::StartDocumentLoad(const char* aCommand, nsIChannel* aChannel,
NS_GetFinalChannelURI(aChannel, getter_AddRefs(mDocumentURI));
NS_ENSURE_SUCCESS(rv, rv);
rv = ResetStylesheetsToURI(mDocumentURI);
if (NS_FAILED(rv)) return rv;
ResetStylesheetsToURI(mDocumentURI);
RetrieveRelevantHeaders(aChannel);