зеркало из https://github.com/mozilla/gecko-dev.git
bug 856779 - make nsStyleSet::Init() return void r=dholbert
This commit is contained in:
Родитель
617729fa2f
Коммит
ef82aa217b
|
@ -812,8 +812,7 @@ PresShell::Init(nsIDocument* aDocument,
|
|||
aPresContext->SetShell(this);
|
||||
|
||||
// Now we can initialize the style set.
|
||||
result = aStyleSet->Init(aPresContext);
|
||||
NS_ENSURE_SUCCESS(result, result);
|
||||
aStyleSet->Init(aPresContext);
|
||||
|
||||
// From this point on, any time we return an error we need to make
|
||||
// sure to null out mStyleSet first, since an error return from this
|
||||
|
|
|
@ -138,7 +138,7 @@ nsStyleSet::SizeOfIncludingThis(nsMallocSizeOfFun aMallocSizeOf) const
|
|||
return n;
|
||||
}
|
||||
|
||||
nsresult
|
||||
void
|
||||
nsStyleSet::Init(nsPresContext *aPresContext)
|
||||
{
|
||||
mFirstLineRule = new nsEmptyStyleRule;
|
||||
|
@ -149,8 +149,6 @@ nsStyleSet::Init(nsPresContext *aPresContext)
|
|||
|
||||
GatherRuleProcessors(eAnimationSheet);
|
||||
GatherRuleProcessors(eTransitionSheet);
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
nsresult
|
||||
|
|
|
@ -62,10 +62,7 @@ class nsStyleSet
|
|||
|
||||
size_t SizeOfIncludingThis(nsMallocSizeOfFun aMallocSizeOf) const;
|
||||
|
||||
// Initialize the object. You must check the return code and not use
|
||||
// the nsStyleSet if Init() fails.
|
||||
|
||||
nsresult Init(nsPresContext *aPresContext);
|
||||
void Init(nsPresContext *aPresContext);
|
||||
|
||||
nsRuleNode* GetRuleTree() { return mRuleTree; }
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче