wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-05 23:38:38 +09:00
Code Issues Projects Releases Packages Wiki Activity

Issue #2828 - Part 8: Extract RuleProcessorGroup (formerly ResolvedRuleCascades) into separate file

Browse source 
The struct no longer holds rule cascades since part 5 anyway, and extracting it to a separate file allows it to be reused in the future.
This commit is contained in:
Francis Dominic Fajardo 2025-07-21 19:21:31 +08:00 • committed by roytam1
commit 3605630f4e
9 changed files with 140 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

2
layout/style/CSSStyleSheet.cpp
View file

@ -1594,7 +1594,7 @@ CSSStyleSheet::ClearRuleCascades()
RuleProcessorCache::RemoveSheet(this);
removedSheetFromRuleProcessorCache = true;
}
(*iter)->ClearRuleCascades();
(*iter)->ClearGroup();
}
}
if (mParent) {

11
layout/style/RuleCascadeData.cpp
View file

@ -1478,17 +1478,6 @@ RuleCascadeData::AddRule(RuleSelectorPair* aRuleInfo)
return true;
}
size_t
ResolvedRuleCascades::SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const
{
size_t n = aMallocSizeOf(this);
for (uint32_t i = 0; i < mProcessors.Length(); i++) {
n += mProcessors[i]->SizeOfIncludingThis(aMallocSizeOf);
}
n += mProcessors.ShallowSizeOfExcludingThis(aMallocSizeOf);
return n;
}
struct PerWeightDataListItem : public RuleSelectorPair
{
PerWeightDataListItem(css::StyleRule* aRule, nsCSSSelector* aSelector)

20
layout/style/RuleCascadeData.h
View file

@ -322,26 +322,6 @@ private:
static const PLDHashTableOps AtomSelector_CIOps;
};
struct ResolvedRuleCascades
{
ResolvedRuleCascades(nsIAtom* aMedium)
: mCacheKey(aMedium)
, mNext(nullptr)
{
}
~ResolvedRuleCascades()
{
mProcessors.Clear();
}
nsTArray<nsCOMPtr<nsIStyleRuleProcessor>> mProcessors;
nsMediaQueryResultCacheKey mCacheKey;
ResolvedRuleCascades* mNext; // for a different medium
size_t SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const;
};
struct CascadeEnumData
{
CascadeEnumData(nsPresContext* aPresContext,

17
layout/style/RuleProcessorGroup.cpp Normal file
View file

@ -0,0 +1,17 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "RuleProcessorGroup.h"
size_t
RuleProcessorGroup::SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const
{
size_t n = aMallocSizeOf(this);
for (uint32_t i = 0; i < mItems.Length(); i++) {
n += mItems[i]->SizeOfIncludingThis(aMallocSizeOf);
}
n += mItems.ShallowSizeOfExcludingThis(aMallocSizeOf);
return n;
}

26
layout/style/RuleProcessorGroup.h Normal file
View file

@ -0,0 +1,26 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#ifndef RuleProcessorGroup_h___
#define RuleProcessorGroup_h___
struct RuleProcessorGroup
{
RuleProcessorGroup(nsIAtom* aMedium)
: mCacheKey(aMedium)
, mNext(nullptr)
{
}
~RuleProcessorGroup() { mItems.Clear(); }
nsTArray<nsCOMPtr<nsIStyleRuleProcessor>> mItems;
nsMediaQueryResultCacheKey mCacheKey;
RuleProcessorGroup* mNext; // for a different medium
size_t SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const;
};
#endif /* RuleProcessorGroup_h___ */

2
layout/style/moz.build
View file

@ -73,6 +73,7 @@ EXPORTS += [
'nsStyleTransformMatrix.h',
'nsStyleUtil.h',
'RuleCascadeData.h',
'RuleProcessorGroup.h',
]
EXPORTS.mozilla += [
@ -178,6 +179,7 @@ UNIFIED_SOURCES += [
'nsTransitionManager.cpp',
'RuleNodeCacheConditions.cpp',
'RuleProcessorCache.cpp',
'RuleProcessorGroup.cpp',
'StyleAnimationValue.cpp',
'StyleRule.cpp',
'StyleSheet.cpp',

162
layout/style/nsCSSRuleProcessor.cpp
View file

@ -56,6 +56,7 @@
#include "RuleCascadeData.h"
#include "nsCSSRuleUtils.h"
#include "CascadeLayerRuleProcessor.h"
#include "RuleProcessorGroup.h"
using namespace mozilla;
using namespace mozilla::dom;
@ -82,7 +83,7 @@ nsCSSRuleProcessor::nsCSSRuleProcessor(sheet_array_type&& aSheets,
aPreviousCSSRuleProcessor,
bool aIsShared)
: mSheets(aSheets)
, mRuleCascades(nullptr)
, mGroup(nullptr)
, mPreviousCacheKey(aPreviousCSSRuleProcessor
? aPreviousCSSRuleProcessor->CloneMQCacheKey()
: UniquePtr<nsMediaQueryResultCacheKey>())
@ -113,7 +114,7 @@ nsCSSRuleProcessor::~nsCSSRuleProcessor()
MOZ_ASSERT(!mExpirationState.IsTracked());
MOZ_ASSERT(mStyleSetRefCnt == 0);
ClearSheets();
ClearRuleCascades();
ClearGroup();
}
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsCSSRuleProcessor)
@ -147,8 +148,8 @@ nsCSSRuleProcessor::ClearSheets()
/* virtual */ void
nsCSSRuleProcessor::RulesMatching(ElementRuleProcessorData *aData)
{
if (ResolvedRuleCascades* cascades = GetRuleCascade(aData->mPresContext)) {
for (nsCOMPtr<nsIStyleRuleProcessor> processor : cascades->mProcessors) {
if (RuleProcessorGroup* group = GetGroup(aData->mPresContext)) {
for (nsCOMPtr<nsIStyleRuleProcessor> processor : group->mItems) {
processor->RulesMatching(aData);
}
}
@ -157,8 +158,8 @@ nsCSSRuleProcessor::RulesMatching(ElementRuleProcessorData *aData)
/* virtual */ void
nsCSSRuleProcessor::RulesMatching(PseudoElementRuleProcessorData* aData)
{
if (ResolvedRuleCascades* cascades = GetRuleCascade(aData->mPresContext)) {
for (nsCOMPtr<nsIStyleRuleProcessor> processor : cascades->mProcessors) {
if (RuleProcessorGroup* group = GetGroup(aData->mPresContext)) {
for (nsCOMPtr<nsIStyleRuleProcessor> processor : group->mItems) {
processor->RulesMatching(aData);
}
}
@ -167,8 +168,8 @@ nsCSSRuleProcessor::RulesMatching(PseudoElementRuleProcessorData* aData)
/* virtual */ void
nsCSSRuleProcessor::RulesMatching(AnonBoxRuleProcessorData* aData)
{
if (ResolvedRuleCascades* cascades = GetRuleCascade(aData->mPresContext)) {
for (nsCOMPtr<nsIStyleRuleProcessor> processor : cascades->mProcessors) {
if (RuleProcessorGroup* group = GetGroup(aData->mPresContext)) {
for (nsCOMPtr<nsIStyleRuleProcessor> processor : group->mItems) {
processor->RulesMatching(aData);
}
}
@ -178,8 +179,8 @@ nsCSSRuleProcessor::RulesMatching(AnonBoxRuleProcessorData* aData)
/* virtual */ void
nsCSSRuleProcessor::RulesMatching(XULTreeRuleProcessorData* aData)
{
if (ResolvedRuleCascades* cascades = GetRuleCascade(aData->mPresContext)) {
for (nsCOMPtr<nsIStyleRuleProcessor> processor : cascades->mProcessors) {
if (RuleProcessorGroup* group = GetGroup(aData->mPresContext)) {
for (nsCOMPtr<nsIStyleRuleProcessor> processor : group->mItems) {
processor->RulesMatching(aData);
}
}
@ -197,8 +198,8 @@ nsCSSRuleProcessor::HasStateDependentStyle(ElementDependentRuleProcessorData* aD
"SelectorMatchesTree call");
nsRestyleHint hint = nsRestyleHint(0);
if (ResolvedRuleCascades* cascades = GetRuleCascade(aData->mPresContext)) {
for (nsCOMPtr<nsIStyleRuleProcessor> processor : cascades->mProcessors) {
if (RuleProcessorGroup* group = GetGroup(aData->mPresContext)) {
for (nsCOMPtr<nsIStyleRuleProcessor> processor : group->mItems) {
CascadeLayerRuleProcessor* layerProcessor =
static_cast<CascadeLayerRuleProcessor*>(processor.get());
layerProcessor->HasStateDependentStyle(
@ -229,8 +230,8 @@ nsCSSRuleProcessor::HasStateDependentStyle(PseudoElementStateRuleProcessorData*
/* virtual */ bool
nsCSSRuleProcessor::HasDocumentStateDependentStyle(StateRuleProcessorData* aData)
{
if (ResolvedRuleCascades* cascades = GetRuleCascade(aData->mPresContext)) {
for (nsCOMPtr<nsIStyleRuleProcessor> processor : cascades->mProcessors) {
if (RuleProcessorGroup* group = GetGroup(aData->mPresContext)) {
for (nsCOMPtr<nsIStyleRuleProcessor> processor : group->mItems) {
if (processor->HasDocumentStateDependentStyle(aData)) {
return true;
}
@ -246,8 +247,8 @@ nsCSSRuleProcessor::HasAttributeDependentStyle(
RestyleHintData& aRestyleHintDataResult)
{
AttributeEnumData data(aData, aRestyleHintDataResult);
if (ResolvedRuleCascades* cascades = GetRuleCascade(aData->mPresContext)) {
for (nsCOMPtr<nsIStyleRuleProcessor> processor : cascades->mProcessors) {
if (RuleProcessorGroup* group = GetGroup(aData->mPresContext)) {
for (nsCOMPtr<nsIStyleRuleProcessor> processor : group->mItems) {
CascadeLayerRuleProcessor* layerProcessor =
static_cast<CascadeLayerRuleProcessor*>(processor.get());
layerProcessor->HasAttributeDependentStyle(
@ -267,29 +268,29 @@ nsCSSRuleProcessor::MediumFeaturesChanged(nsPresContext* aPresContext)
// anything changed. But in the cases where it does matter, we've
// cached a previous cache key to test against, instead of our current
// rule cascades. See bug 448281 and bug 1089417.
MOZ_ASSERT(!(mRuleCascades && mPreviousCacheKey));
ResolvedRuleCascades* old = mRuleCascades;
MOZ_ASSERT(!(mGroup && mPreviousCacheKey));
RuleProcessorGroup* old = mGroup;
if (old) {
RefreshRuleCascade(aPresContext);
return (old != mRuleCascades);
RefreshGroup(aPresContext);
return (old != mGroup);
}
if (mPreviousCacheKey) {
// RefreshRuleCascade will get rid of mPreviousCacheKey anyway to
// maintain the invariant that we can't have both an mRuleCascades
// RefreshGroup will get rid of mPreviousCacheKey anyway to
// maintain the invariant that we can't have both an mGroup
// and an mPreviousCacheKey. But we need to hold it a little
// longer.
UniquePtr<nsMediaQueryResultCacheKey> previousCacheKey(
Move(mPreviousCacheKey));
RefreshRuleCascade(aPresContext);
RefreshGroup(aPresContext);
// This test is a bit pessimistic since the cache key's operator==
// just does list comparison rather than set comparison, but it
// should catch all the cases we care about (i.e., where the cascade
// order hasn't changed). Other cases will do a restyle anyway, so
// we shouldn't need to worry about posting a second.
return !mRuleCascades || // all sheets gone, but we had sheets before
mRuleCascades->mCacheKey != *previousCacheKey;
return !mGroup || // all sheets gone, but we had sheets before
mGroup->mCacheKey != *previousCacheKey;
}
return false;
@ -298,17 +299,17 @@ nsCSSRuleProcessor::MediumFeaturesChanged(nsPresContext* aPresContext)
/* virtual */ nsTArray<nsCOMPtr<nsIStyleRuleProcessor>>*
nsCSSRuleProcessor::GetChildRuleProcessors()
{
return mRuleCascades
? &mRuleCascades->mProcessors
return mGroup
? &mGroup->mItems
: nullptr;
}
UniquePtr<nsMediaQueryResultCacheKey>
nsCSSRuleProcessor::CloneMQCacheKey()
{
MOZ_ASSERT(!(mRuleCascades && mPreviousCacheKey));
MOZ_ASSERT(!(mGroup && mPreviousCacheKey));
ResolvedRuleCascades* c = mRuleCascades;
RuleProcessorGroup* c = mGroup;
if (!c) {
// We might have an mPreviousCacheKey. It already comes from a call
// to CloneMQCacheKey, so don't bother checking
@ -335,9 +336,9 @@ nsCSSRuleProcessor::SizeOfExcludingThis(MallocSizeOf aMallocSizeOf) const
{
size_t n = 0;
n += mSheets.ShallowSizeOfExcludingThis(aMallocSizeOf);
for (ResolvedRuleCascades* cascades = mRuleCascades; cascades;
cascades = cascades->mNext) {
n += cascades->SizeOfIncludingThis(aMallocSizeOf);
for (RuleProcessorGroup* group = mGroup; group;
group = group->mNext) {
n += group->SizeOfIncludingThis(aMallocSizeOf);
}
return n;
@ -354,8 +355,8 @@ nsCSSRuleProcessor::AppendFontFaceRules(
nsPresContext *aPresContext,
nsTArray<nsFontFaceRuleContainer>& aArray)
{
if (ResolvedRuleCascades* cascades = GetRuleCascade(aPresContext)) {
for (nsCOMPtr<nsIStyleRuleProcessor> processor : cascades->mProcessors) {
if (RuleProcessorGroup* group = GetGroup(aPresContext)) {
for (nsCOMPtr<nsIStyleRuleProcessor> processor : group->mItems) {
CascadeLayerRuleProcessor* layerProcessor =
static_cast<CascadeLayerRuleProcessor*>(processor.get());
if (!layerProcessor->AppendFontFaceRules(aPresContext, aArray)) {
@ -373,8 +374,8 @@ nsCSSRuleProcessor::KeyframesRuleForName(nsPresContext* aPresContext,
{
nsCSSKeyframesRule* rule = nullptr;
if (ResolvedRuleCascades* cascades = GetRuleCascade(aPresContext)) {
for (nsCOMPtr<nsIStyleRuleProcessor> processor : cascades->mProcessors) {
if (RuleProcessorGroup* group = GetGroup(aPresContext)) {
for (nsCOMPtr<nsIStyleRuleProcessor> processor : group->mItems) {
CascadeLayerRuleProcessor* layerProcessor =
static_cast<CascadeLayerRuleProcessor*>(processor.get());
if (nsCSSKeyframesRule* newRule =
@ -392,8 +393,8 @@ nsCSSRuleProcessor::CounterStyleRuleForName(nsPresContext* aPresContext,
const nsAString& aName)
{
nsCSSCounterStyleRule* rule = nullptr;
if (ResolvedRuleCascades* cascades = GetRuleCascade(aPresContext)) {
for (nsCOMPtr<nsIStyleRuleProcessor> processor : cascades->mProcessors) {
if (RuleProcessorGroup* group = GetGroup(aPresContext)) {
for (nsCOMPtr<nsIStyleRuleProcessor> processor : group->mItems) {
CascadeLayerRuleProcessor* layerProcessor =
static_cast<CascadeLayerRuleProcessor*>(processor.get());
if (nsCSSCounterStyleRule* newRule =
@ -411,8 +412,8 @@ nsCSSRuleProcessor::AppendPageRules(
nsPresContext* aPresContext,
nsTArray<nsCSSPageRule*>& aArray)
{
if (ResolvedRuleCascades* cascades = GetRuleCascade(aPresContext)) {
for (nsCOMPtr<nsIStyleRuleProcessor> processor : cascades->mProcessors) {
if (RuleProcessorGroup* group = GetGroup(aPresContext)) {
for (nsCOMPtr<nsIStyleRuleProcessor> processor : group->mItems) {
CascadeLayerRuleProcessor* layerProcessor =
static_cast<CascadeLayerRuleProcessor*>(processor.get());
if (!layerProcessor->AppendPageRules(aPresContext, aArray)) {
@ -429,8 +430,8 @@ nsCSSRuleProcessor::AppendFontFeatureValuesRules(
nsPresContext *aPresContext,
nsTArray<nsCSSFontFeatureValuesRule*>& aArray)
{
if (ResolvedRuleCascades* cascades = GetRuleCascade(aPresContext)) {
for (nsCOMPtr<nsIStyleRuleProcessor> processor : cascades->mProcessors) {
if (RuleProcessorGroup* group = GetGroup(aPresContext)) {
for (nsCOMPtr<nsIStyleRuleProcessor> processor : group->mItems) {
CascadeLayerRuleProcessor* layerProcessor =
static_cast<CascadeLayerRuleProcessor*>(processor.get());
if (!layerProcessor->AppendFontFeatureValuesRules(aPresContext, aArray)) {
@ -443,14 +444,14 @@ nsCSSRuleProcessor::AppendFontFeatureValuesRules(
}
nsresult
nsCSSRuleProcessor::ClearRuleCascades()
nsCSSRuleProcessor::ClearGroup()
{
if (!mPreviousCacheKey) {
mPreviousCacheKey = CloneMQCacheKey();
}
// No need to remove the rule processor from the RuleProcessorCache here,
// since CSSStyleSheet::ClearRuleCascades will have called
// since CSSStyleSheet::ClearGroup will have called
// RuleProcessorCache::RemoveSheet() passing itself, which will catch
// this rule processor (and any others for different @-moz-document
// cache key results).
@ -459,7 +460,7 @@ nsCSSRuleProcessor::ClearRuleCascades()
#ifdef DEBUG
// For shared rule processors, if we've already gathered document
// rules, then they will now be out of date. We don't actually need
// them to be up-to-date (see the comment in RefreshRuleCascade), so
// them to be up-to-date (see the comment in RefreshGroup), so
// record their invalidity so we can assert if we try to use them.
if (!mMustGatherDocumentRules) {
mDocumentRulesAndCacheKeyValid = false;
@ -470,10 +471,10 @@ nsCSSRuleProcessor::ClearRuleCascades()
// will rebuild style data and the user font set (either
// nsIPresShell::RestyleForCSSRuleChanges or
// nsPresContext::RebuildAllStyleData).
ResolvedRuleCascades* data = mRuleCascades;
mRuleCascades = nullptr;
RuleProcessorGroup* data = mGroup;
mGroup = nullptr;
while (data) {
ResolvedRuleCascades* next = data->mNext;
RuleProcessorGroup* next = data->mNext;
delete data;
data = next;
}
@ -672,8 +673,8 @@ nsCSSRuleProcessor::CascadeSheet(CSSStyleSheet* aSheet, CascadeEnumData* aLayer)
return true;
}
ResolvedRuleCascades*
nsCSSRuleProcessor::GetRuleCascade(nsPresContext* aPresContext)
RuleProcessorGroup*
nsCSSRuleProcessor::GetGroup(nsPresContext* aPresContext)
{
// FIXME: Make this infallible!
@ -684,12 +685,12 @@ nsCSSRuleProcessor::GetRuleCascade(nsPresContext* aPresContext)
// likely to have @media rules, and thus the cache is pretty likely to
// hit instantly even when we're switching between pres contexts.)
if (!mRuleCascades || aPresContext != mLastPresContext) {
RefreshRuleCascade(aPresContext);
if (!mGroup || aPresContext != mLastPresContext) {
RefreshGroup(aPresContext);
}
mLastPresContext = aPresContext;
return mRuleCascades;
return mGroup;
}
/**
@ -701,26 +702,26 @@ static void
CreateChildProcessorsEnumFunc(CascadeEnumData* aLayer, void* aData)
{
aLayer->AddRules();
ResolvedRuleCascades* data = static_cast<ResolvedRuleCascades*>(aData);
data->mProcessors.AppendElement(new CascadeLayerRuleProcessor(aLayer));
RuleProcessorGroup* data = static_cast<RuleProcessorGroup*>(aData);
data->mItems.AppendElement(new CascadeLayerRuleProcessor(aLayer));
}
void
nsCSSRuleProcessor::RefreshRuleCascade(nsPresContext* aPresContext)
nsCSSRuleProcessor::RefreshGroup(nsPresContext* aPresContext)
{
// Having RuleCascadeData objects be per-medium (over all variation
// caused by media queries, handled through mCacheKey) works for now
// since nsCSSRuleProcessor objects are per-document. (For a given
// set of stylesheets they can vary based on medium (@media) or
// document (@-moz-document).)
for (ResolvedRuleCascades** cascadep = &mRuleCascades, *cascade;
(cascade = *cascadep);
cascadep = &cascade->mNext) {
if (cascade->mCacheKey.Matches(aPresContext)) {
// Ensure that the current one is always mRuleCascades.
*cascadep = cascade->mNext;
cascade->mNext = mRuleCascades;
mRuleCascades = cascade;
for (RuleProcessorGroup **groupPointer = &mGroup, *group;
(group = *groupPointer);
groupPointer = &group->mNext) {
if (group->mCacheKey.Matches(aPresContext)) {
// Ensure that the current one is always mGroup.
*groupPointer = group->mNext;
group->mNext = mGroup;
mGroup = group;
return;
}
@ -732,14 +733,15 @@ nsCSSRuleProcessor::RefreshRuleCascade(nsPresContext* aPresContext)
mPreviousCacheKey = nullptr;
if (mSheets.Length() != 0) {
nsAutoPtr<ResolvedRuleCascades> cascades(
new ResolvedRuleCascades(aPresContext->Medium()));
CascadeEnumData* unlayered(new CascadeEnumData(aPresContext,
mDocumentRules,
mDocumentCacheKey,
mSheetType,
mMustGatherDocumentRules,
cascades->mCacheKey));
nsAutoPtr<RuleProcessorGroup> ruleProcessorSet(
new RuleProcessorGroup(aPresContext->Medium()));
CascadeEnumData* unlayered(
new CascadeEnumData(aPresContext,
mDocumentRules,
mDocumentCacheKey,
mSheetType,
mMustGatherDocumentRules,
ruleProcessorSet->mCacheKey));
if (unlayered->mData) {
for (uint32_t i = 0; i < mSheets.Length(); ++i) {
if (!CascadeSheet(mSheets.ElementAt(i), unlayered)) {
@ -747,11 +749,11 @@ nsCSSRuleProcessor::RefreshRuleCascade(nsPresContext* aPresContext)
}
}
// Ensure that the current one is always mRuleCascades.
cascades->mNext = mRuleCascades;
mRuleCascades = cascades.forget();
// Ensure that the current one is always mGroup.
ruleProcessorSet->mNext = mGroup;
mGroup = ruleProcessorSet.forget();
unlayered->EnumerateAllLayers(CreateChildProcessorsEnumFunc, mRuleCascades);
unlayered->EnumerateAllLayers(CreateChildProcessorsEnumFunc, mGroup);
// mMustGatherDocumentRules controls whether we build mDocumentRules
// and mDocumentCacheKey so that they can be used as keys by the
@ -767,8 +769,8 @@ nsCSSRuleProcessor::RefreshRuleCascade(nsPresContext* aPresContext)
// is called, which is immediately after the rule processor is created
// (by nsStyleSet).
//
// Note that when nsCSSRuleProcessor::ClearRuleCascades is called,
// by CSSStyleSheet::ClearRuleCascades, we will have called
// Note that when nsCSSRuleProcessor::ClearGroup is called,
// by CSSStyleSheet::ClearGroup, we will have called
// RuleProcessorCache::RemoveSheet, which will remove the rule
// processor from the cache. (This is because the list of document
// rules now may not match the one used as they key in the
@ -777,7 +779,7 @@ nsCSSRuleProcessor::RefreshRuleCascade(nsPresContext* aPresContext)
// Thus, as we'll no longer be in the RuleProcessorCache, and we won't
// have TakeDocumentRulesAndCacheKey called on us, we don't need to ensure
// mDocumentCacheKey and mDocumentRules are up-to-date after the
// first time GetRuleCascade is called.
// first time GetGroup is called.
if (mMustGatherDocumentRules) {
mDocumentRules.Sort();
mDocumentCacheKey.Finalize();
@ -799,7 +801,7 @@ nsCSSRuleProcessor::TakeDocumentRulesAndCacheKey(
{
MOZ_ASSERT(mIsShared);
GetRuleCascade(aPresContext);
GetGroup(aPresContext);
MOZ_ASSERT(mDocumentRulesAndCacheKeyValid);
aDocumentRules.Clear();

22
layout/style/nsCSSRuleProcessor.h
View file

@ -26,7 +26,7 @@
struct CascadeEnumData;
struct ElementDependentRuleProcessorData;
struct nsFontFaceRuleContainer;
struct ResolvedRuleCascades;
struct RuleProcessorGroup;
class nsCSSKeyframesRule;
class nsCSSPageRule;
class nsCSSFontFeatureValuesRule;
@ -74,7 +74,7 @@ public:
NS_DECL_CYCLE_COLLECTION_CLASS(nsCSSRuleProcessor)
public:
nsresult ClearRuleCascades();
nsresult ClearGroup();
// nsIStyleRuleProcessor
virtual void RulesMatching(ElementRuleProcessorData* aData) override;
@ -161,8 +161,8 @@ private:
static bool CascadeSheet(mozilla::CSSStyleSheet* aSheet,
CascadeEnumData* aData);
ResolvedRuleCascades* GetRuleCascade(nsPresContext* aPresContext);
void RefreshRuleCascade(nsPresContext* aPresContext);
RuleProcessorGroup* GetGroup(nsPresContext* aPresContext);
void RefreshGroup(nsPresContext* aPresContext);
nsRestyleHint HasStateDependentStyle(ElementDependentRuleProcessorData* aData,
mozilla::dom::Element* aStatefulElement,
@ -175,14 +175,14 @@ private:
sheet_array_type mSheets;
// active first, then cached (most recent first)
ResolvedRuleCascades* mRuleCascades;
RuleProcessorGroup* mGroup;
// If we cleared our mRuleCascades or replaced a previous rule
// If we cleared our mGroup or replaced a previous rule
// processor, this is the media query result cache key that was used
// before we lost the old rule cascades.
// before we lost the old group.
mozilla::UniquePtr<nsMediaQueryResultCacheKey> mPreviousCacheKey;
// The last pres context for which GetRuleCascades was called.
// The last pres context for which GetGroup was called.
nsPresContext *mLastPresContext;
// The scope element for this rule processor's scoped style sheets.
@ -201,9 +201,9 @@ private:
const bool mIsShared;
// Whether we need to build up mDocumentCacheKey and mDocumentRules as
// we build ResolvedRuleCascades. Is true only for shared rule processors
// and only before we build the first ResolvedRuleCascades. See comment in
// RefreshRuleCascade for why.
// we build RuleProcessorGroup. Is true only for shared rule processors
// and only before we build the first RuleProcessorGroup. See comment in
// RefreshGroup for why.
bool mMustGatherDocumentRules;
bool mInRuleProcessorCache;

2
layout/style/nsIMediaList.h
View file

@ -62,7 +62,7 @@ struct nsMediaExpression {
*
* This object may not be used after any media rules in any of the
* sheets it was given to have been modified. However, this is
* generally not a problem since ClearRuleCascades is called on the
* generally not a problem since ClearGroup is called on the
* sheet whenever this happens, and these objects are stored inside the
* rule cascades. (FIXME: We're not actually doing this all the time.)
*