Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-13 11:38:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Consolidate SetEnabled and SetDisabled; make sure both of them clear the rule cascade on the rule processors. Bug 230651, r+sr=bzbarsky.

Browse Source
This commit is contained in:
bryner%brianryner.com 2004-01-15 03:26:56 +00:00
parent 107a86d7ae
commit 072b7160a8
2 changed files with 6 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
content/html/style/src/nsCSSStyleSheet.cpp
View File

@ -1873,18 +1873,7 @@ CSSStyleSheetImpl::GetApplicable(PRBool& aApplicable) const
NS_IMETHODIMP
CSSStyleSheetImpl::SetEnabled(PRBool aEnabled)
{
PRBool oldDisabled = mDisabled;
mDisabled = !aEnabled;
if (mDocument && mInner && mInner->mComplete && oldDisabled != mDisabled) {
ClearRuleCascades();
mDocument->BeginUpdate(UPDATE_STYLE);
mDocument->SetStyleSheetApplicableState(this, !mDisabled);
mDocument->EndUpdate(UPDATE_STYLE);
}
return NS_OK;
return CSSStyleSheetImpl::SetDisabled(!aEnabled);
}
NS_IMETHODIMP
@ -2446,6 +2435,8 @@ CSSStyleSheetImpl::SetDisabled(PRBool aDisabled)
mDisabled = aDisabled;
if (mDocument && mInner && mInner->mComplete && oldDisabled != mDisabled) {
ClearRuleCascades();
mDocument->BeginUpdate(UPDATE_STYLE);
mDocument->SetStyleSheetApplicableState(this, !mDisabled);
mDocument->EndUpdate(UPDATE_STYLE);

15
layout/style/nsCSSStyleSheet.cpp
View File

@ -1873,18 +1873,7 @@ CSSStyleSheetImpl::GetApplicable(PRBool& aApplicable) const
NS_IMETHODIMP
CSSStyleSheetImpl::SetEnabled(PRBool aEnabled)
{
PRBool oldDisabled = mDisabled;
mDisabled = !aEnabled;
if (mDocument && mInner && mInner->mComplete && oldDisabled != mDisabled) {
ClearRuleCascades();
mDocument->BeginUpdate(UPDATE_STYLE);
mDocument->SetStyleSheetApplicableState(this, !mDisabled);
mDocument->EndUpdate(UPDATE_STYLE);
}
return NS_OK;
return CSSStyleSheetImpl::SetDisabled(!aEnabled);
}
NS_IMETHODIMP
@ -2446,6 +2435,8 @@ CSSStyleSheetImpl::SetDisabled(PRBool aDisabled)
mDisabled = aDisabled;
if (mDocument && mInner && mInner->mComplete && oldDisabled != mDisabled) {
ClearRuleCascades();
mDocument->BeginUpdate(UPDATE_STYLE);
mDocument->SetStyleSheetApplicableState(this, !mDisabled);
mDocument->EndUpdate(UPDATE_STYLE);