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 777293 - Remove NS_NewCSSStyleSheet; r=dbaron

Browse Source
This commit is contained in:
Ms2ger 2012-08-04 09:44:01 +02:00
parent 5410b1a8c6
commit eacd737410
5 changed files with 27 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
content/base/src/nsTreeSanitizer.cpp
View File

@ -1120,9 +1120,7 @@ nsTreeSanitizer::SanitizeStyleSheet(const nsAString& aOriginal,
// -moz-binding is blacklisted.
bool didSanitize = false;
// Create a sheet to hold the parsed CSS
nsRefPtr<nsCSSStyleSheet> sheet;
rv = NS_NewCSSStyleSheet(getter_AddRefs(sheet));
NS_ENSURE_SUCCESS(rv, true);
nsRefPtr<nsCSSStyleSheet> sheet = new nsCSSStyleSheet();
sheet->SetURIs(aDocument->GetDocumentURI(), nullptr, aBaseURI);
sheet->SetPrincipal(aDocument->NodePrincipal());
// Create the CSS parser, and parse the CSS text.

46
layout/base/nsPresShell.cpp
View File

@ -1178,39 +1178,33 @@ nsresult PresShell::ClearPreferenceStyleRules(void)
return result;
}
nsresult PresShell::CreatePreferenceStyleSheet(void)
nsresult
PresShell::CreatePreferenceStyleSheet()
{
NS_TIME_FUNCTION_MIN(1.0);
NS_ASSERTION(!mPrefStyleSheet, "prefStyleSheet already exists");
nsresult result = NS_NewCSSStyleSheet(getter_AddRefs(mPrefStyleSheet));
if (NS_SUCCEEDED(result)) {
NS_ASSERTION(mPrefStyleSheet, "null but no error");
nsCOMPtr<nsIURI> uri;
result = NS_NewURI(getter_AddRefs(uri), "about:PreferenceStyleSheet", nullptr);
if (NS_SUCCEEDED(result)) {
NS_ASSERTION(uri, "null but no error");
mPrefStyleSheet->SetURIs(uri, uri, uri);
mPrefStyleSheet->SetComplete();
PRUint32 index;
result =
mPrefStyleSheet->InsertRuleInternal(NS_LITERAL_STRING("@namespace url(http://www.w3.org/1999/xhtml);"),
0, &index);
if (NS_SUCCEEDED(result)) {
mStyleSet->AppendStyleSheet(nsStyleSet::eUserSheet, mPrefStyleSheet);
}
}
}
#ifdef DEBUG_attinasi
printf("CreatePrefStyleSheet completed: error=%ld\n",(long)result);
#endif
if (NS_FAILED(result)) {
mPrefStyleSheet = new nsCSSStyleSheet();
nsCOMPtr<nsIURI> uri;
nsresult rv = NS_NewURI(getter_AddRefs(uri), "about:PreferenceStyleSheet", nullptr);
if (NS_FAILED(rv)) {
mPrefStyleSheet = nullptr;
return rv;
}
NS_ASSERTION(uri, "null but no error");
mPrefStyleSheet->SetURIs(uri, uri, uri);
mPrefStyleSheet->SetComplete();
PRUint32 index;
rv =
mPrefStyleSheet->InsertRuleInternal(NS_LITERAL_STRING("@namespace url(http://www.w3.org/1999/xhtml);"),
0, &index);
if (NS_FAILED(rv)) {
mPrefStyleSheet = nullptr;
return rv;
}
return result;
mStyleSet->AppendStyleSheet(nsStyleSet::eUserSheet, mPrefStyleSheet);
return NS_OK;
}
// XXX We want these after the @namespace rule. Does order matter

7
layout/style/Loader.cpp
View File

@ -1080,7 +1080,6 @@ Loader::CreateSheet(nsIURI* aURI,
mPendingDatas.Init();
}
nsresult rv = NS_OK;
*aSheet = nullptr;
aSheetState = eSheetStateUnknown;
@ -1199,9 +1198,9 @@ Loader::CreateSheet(nsIURI* aURI,
originalURI = aURI;
}
rv = NS_NewCSSStyleSheet(aSheet);
NS_ENSURE_SUCCESS(rv, rv);
(*aSheet)->SetURIs(sheetURI, originalURI, baseURI);
nsRefPtr<nsCSSStyleSheet> sheet = new nsCSSStyleSheet();
sheet->SetURIs(sheetURI, originalURI, baseURI);
sheet.forget(aSheet);
}
NS_ASSERTION(*aSheet, "We should have a sheet by now!");

24
layout/style/nsCSSStyleSheet.cpp
View File

@ -774,6 +774,9 @@ nsCSSStyleSheetInner::nsCSSStyleSheetInner(nsCSSStyleSheet* aPrimarySheet)
mSheets.AppendElement(aPrimarySheet);
mPrincipal = do_CreateInstance("@mozilla.org/nullprincipal;1");
if (!mPrincipal) {
NS_RUNTIMEABORT("OOM");
}
}
static bool SetStyleSheetReference(css::Rule* aRule, void* aSheet)
@ -2161,24 +2164,3 @@ nsCSSStyleSheet::GetOriginalURI() const
{
return mInner->mOriginalSheetURI;
}
nsresult
NS_NewCSSStyleSheet(nsCSSStyleSheet** aInstancePtrResult)
{
*aInstancePtrResult = nullptr;
nsCSSStyleSheet *it = new nsCSSStyleSheet();
if (!it) {
return NS_ERROR_OUT_OF_MEMORY;
}
NS_ADDREF(it);
if (!it->mInner || !it->mInner->mPrincipal) {
NS_RELEASE(it);
return NS_ERROR_OUT_OF_MEMORY;
}
*aInstancePtrResult = it;
return NS_OK;
}

4
layout/style/nsCSSStyleSheet.h
View File

@ -48,7 +48,6 @@ class nsCSSStyleSheetInner {
public:
friend class nsCSSStyleSheet;
friend class nsCSSRuleProcessor;
friend nsresult NS_NewCSSStyleSheet(nsCSSStyleSheet** aInstancePtrResult);
private:
nsCSSStyleSheetInner(nsCSSStyleSheet* aPrimarySheet);
nsCSSStyleSheetInner(nsCSSStyleSheetInner& aCopy,
@ -282,12 +281,9 @@ protected:
friend class nsMediaList;
friend class nsCSSRuleProcessor;
friend nsresult NS_NewCSSStyleSheet(nsCSSStyleSheet** aInstancePtrResult);
friend struct ChildSheetListBuilder;
};
NS_DEFINE_STATIC_IID_ACCESSOR(nsCSSStyleSheet, NS_CSS_STYLE_SHEET_IMPL_CID)
nsresult NS_NewCSSStyleSheet(nsCSSStyleSheet** aInstancePtrResult);
#endif /* !defined(nsCSSStyleSheet_h_) */