Issue #2828 - Part 9: Rename CascadeEnumData to CascadeLayer

This commit is contained in:
Francis Dominic Fajardo 2025-07-22 12:01:53 +08:00 committed by roytam1
commit 1655a5a4a9
6 changed files with 97 additions and 98 deletions

View file

@ -495,7 +495,7 @@ nsCSSRuleProcessor::ClearGroup()
static bool
GatherDocRuleEnumFunc(css::Rule* aRule, void* aData)
{
CascadeEnumData* layer = (CascadeEnumData*)aData;
CascadeLayer* layer = (CascadeLayer*)aData;
int32_t type = aRule->GetType();
MOZ_ASSERT(layer->mMustGatherDocumentRules,
@ -556,7 +556,7 @@ GatherDocRuleEnumFunc(css::Rule* aRule, void* aData)
static bool
CascadeRuleEnumFunc(css::Rule* aRule, void* aData)
{
CascadeEnumData* layer = (CascadeEnumData*)aData;
CascadeLayer* layer = (CascadeLayer*)aData;
int32_t type = aRule->GetType();
if (css::Rule::STYLE_RULE == type) {
@ -589,9 +589,9 @@ CascadeRuleEnumFunc(css::Rule* aRule, void* aData)
layerRule->GetPath(path);
nsString name;
layerRule->GetName(name);
CascadeEnumData* targetLayer = name.IsEmpty()
? layer->CreateAnonymousChildLayer()
: layer->CreateNamedChildLayer(path);
CascadeLayer* targetLayer = name.IsEmpty()
? layer->CreateAnonymousChildLayer()
: layer->CreateNamedChildLayer(path);
const bool use = layerRule->UseForPresentation(layer->mPresContext,
layer->mCacheKey);
if (use || layer->mMustGatherDocumentRules) {
@ -654,7 +654,7 @@ CascadeRuleEnumFunc(css::Rule* aRule, void* aData)
}
/* static */ bool
nsCSSRuleProcessor::CascadeSheet(CSSStyleSheet* aSheet, CascadeEnumData* aLayer)
nsCSSRuleProcessor::CascadeSheet(CSSStyleSheet* aSheet, CascadeLayer* aLayer)
{
if (aSheet->IsApplicable() &&
aSheet->UseForPresentation(aLayer->mPresContext,
@ -699,7 +699,7 @@ nsCSSRuleProcessor::GetGroup(nsPresContext* aPresContext)
* that the layers are encountered.
*/
static void
CreateChildProcessorsEnumFunc(CascadeEnumData* aLayer, void* aData)
CreateChildProcessorsEnumFunc(CascadeLayer* aLayer, void* aData)
{
aLayer->AddRules();
RuleProcessorGroup* data = static_cast<RuleProcessorGroup*>(aData);
@ -735,16 +735,15 @@ nsCSSRuleProcessor::RefreshGroup(nsPresContext* aPresContext)
if (mSheets.Length() != 0) {
nsAutoPtr<RuleProcessorGroup> ruleProcessorSet(
new RuleProcessorGroup(aPresContext->Medium()));
CascadeEnumData* unlayered(
new CascadeEnumData(aPresContext,
mDocumentRules,
mDocumentCacheKey,
mSheetType,
mMustGatherDocumentRules,
ruleProcessorSet->mCacheKey));
if (unlayered->mData) {
CascadeLayer* implicitLayer(new CascadeLayer(aPresContext,
mDocumentRules,
mDocumentCacheKey,
mSheetType,
mMustGatherDocumentRules,
ruleProcessorSet->mCacheKey));
if (implicitLayer->mData) {
for (uint32_t i = 0; i < mSheets.Length(); ++i) {
if (!CascadeSheet(mSheets.ElementAt(i), unlayered)) {
if (!CascadeSheet(mSheets.ElementAt(i), implicitLayer)) {
return; /* out of memory */
}
}
@ -753,7 +752,7 @@ nsCSSRuleProcessor::RefreshGroup(nsPresContext* aPresContext)
ruleProcessorSet->mNext = mGroup;
mGroup = ruleProcessorSet.forget();
unlayered->EnumerateAllLayers(CreateChildProcessorsEnumFunc, mGroup);
implicitLayer->EnumerateAllLayers(CreateChildProcessorsEnumFunc, mGroup);
// mMustGatherDocumentRules controls whether we build mDocumentRules
// and mDocumentCacheKey so that they can be used as keys by the