diff --git a/layout/style/CascadeLayerRuleProcessor.cpp b/layout/style/CascadeLayerRuleProcessor.cpp index 4edc50347f..897a010280 100644 --- a/layout/style/CascadeLayerRuleProcessor.cpp +++ b/layout/style/CascadeLayerRuleProcessor.cpp @@ -64,7 +64,7 @@ using namespace mozilla::dom; // CascadeLayerRuleProcessor::CascadeLayerRuleProcessor( - CascadeEnumData* aLayer) + CascadeLayer* aLayer) : mLayer(aLayer) , mCascade(aLayer->mData) { diff --git a/layout/style/CascadeLayerRuleProcessor.h b/layout/style/CascadeLayerRuleProcessor.h index 93f0d3e0ca..a5b2cf05cf 100644 --- a/layout/style/CascadeLayerRuleProcessor.h +++ b/layout/style/CascadeLayerRuleProcessor.h @@ -23,7 +23,7 @@ #include "nsTArray.h" struct AttributeEnumData; -struct CascadeEnumData; +struct CascadeLayer; struct RuleCascadeData; struct ElementDependentRuleProcessorData; struct nsFontFaceRuleContainer; @@ -46,14 +46,14 @@ class DocumentRule; * rule processor within the context of a specific cascade layer. It ensures * rules are applied in the correct order, as defined by the CSS specification. * - * It also handles unlayered rules, which are treated as belonging to an - * implicit base layer. + * It also handles unlayered styles, which are treated as belonging to an + * implicit layer. */ class CascadeLayerRuleProcessor : public nsIStyleRuleProcessor { public: - CascadeLayerRuleProcessor(CascadeEnumData* aLayer); + CascadeLayerRuleProcessor(CascadeLayer* aLayer); NS_DECL_CYCLE_COLLECTING_ISUPPORTS NS_DECL_CYCLE_COLLECTION_CLASS(CascadeLayerRuleProcessor) @@ -124,7 +124,7 @@ public: protected: virtual ~CascadeLayerRuleProcessor(); - CascadeEnumData* mLayer; + CascadeLayer* mLayer; RuleCascadeData* mCascade; private: diff --git a/layout/style/RuleCascadeData.cpp b/layout/style/RuleCascadeData.cpp index 172f703488..4cac848d46 100644 --- a/layout/style/RuleCascadeData.cpp +++ b/layout/style/RuleCascadeData.cpp @@ -7,7 +7,7 @@ // We want page-sized arenas so there's no fragmentation involved. // Including plarena.h must come first to avoid it being included by some // header file thereby making PL_ARENA_CONST_ALIGN_MASK ineffective. -#define NS_CASCADEENUMDATA_ARENA_BLOCK_SIZE (4096) +#define NS_CASCADELAYER_ARENA_BLOCK_SIZE (4096) #include "plarena.h" #include "RuleCascadeData.h" @@ -1536,7 +1536,7 @@ InitWeightEntry(PLDHashEntryHdr* hdr, const void* key) new (KnownNotNull, entry) RuleByWeightEntry(); } -/* static */ const PLDHashTableOps CascadeEnumData::sRulesByWeightOps = { +/* static */ const PLDHashTableOps CascadeLayer::sRulesByWeightOps = { HashIntKey, MatchWeightEntry, PLDHashTable::MoveEntryStub, @@ -1544,17 +1544,17 @@ InitWeightEntry(PLDHashEntryHdr* hdr, const void* key) InitWeightEntry }; -CascadeEnumData::CascadeEnumData(nsPresContext* aPresContext, - nsString aName, +CascadeLayer::CascadeLayer(nsPresContext* aPresContext, + nsString aName, #ifdef DEBUG - CascadeEnumData* aParent, + CascadeLayer* aParent, #endif - bool aIsWeak, - nsTArray& aDocumentRules, - nsDocumentRuleResultCacheKey& aDocumentKey, - SheetType aSheetType, - bool aMustGatherDocumentRules, - nsMediaQueryResultCacheKey& aCacheKey) + bool aIsWeak, + nsTArray& aDocumentRules, + nsDocumentRuleResultCacheKey& aDocumentKey, + SheetType aSheetType, + bool aMustGatherDocumentRules, + nsMediaQueryResultCacheKey& aCacheKey) : mPresContext(aPresContext) , mName(aName) , mIsAnonymous(mName.IsEmpty()) @@ -1574,12 +1574,12 @@ CascadeEnumData::CascadeEnumData(nsPresContext* aPresContext, Initialize(); } -CascadeEnumData::CascadeEnumData(nsPresContext* aPresContext, - nsTArray& aDocumentRules, - nsDocumentRuleResultCacheKey& aDocumentKey, - SheetType aSheetType, - bool aMustGatherDocumentRules, - nsMediaQueryResultCacheKey& aCacheKey) +CascadeLayer::CascadeLayer(nsPresContext* aPresContext, + nsTArray& aDocumentRules, + nsDocumentRuleResultCacheKey& aDocumentKey, + SheetType aSheetType, + bool aMustGatherDocumentRules, + nsMediaQueryResultCacheKey& aCacheKey) : mPresContext(aPresContext) , mIsAnonymous(false) , mIsWeak(false) @@ -1598,35 +1598,35 @@ CascadeEnumData::CascadeEnumData(nsPresContext* aPresContext, Initialize(); } -CascadeEnumData::~CascadeEnumData() +CascadeLayer::~CascadeLayer() { delete mData; PL_FinishArenaPool(&mArena); } -CascadeEnumData* -CascadeEnumData::CreateNamedChildLayer(const nsTArray& aPath) +CascadeLayer* +CascadeLayer::CreateNamedChildLayer(const nsTArray& aPath) { if (aPath.IsEmpty()) { return this; } const nsString& name = aPath[0]; - CascadeEnumData* childLayer = nullptr; + CascadeLayer* childLayer = nullptr; // Create new layer if it doesn't exist. if (!mLayers.Get(name, &childLayer)) { - childLayer = new CascadeEnumData(mPresContext, - name, + childLayer = new CascadeLayer(mPresContext, + name, #ifdef DEBUG - this, + this, #endif - false, - mDocumentRules, - mDocumentCacheKey, - mSheetType, - mMustGatherDocumentRules, - mCacheKey); + false, + mDocumentRules, + mDocumentCacheKey, + mSheetType, + mMustGatherDocumentRules, + mCacheKey); mPreLayers.AppendElement(childLayer); mLayers.Put(name, childLayer); } @@ -1642,21 +1642,21 @@ CascadeEnumData::CreateNamedChildLayer(const nsTArray& aPath) return childLayer->CreateNamedChildLayer(tail); } -CascadeEnumData* -CascadeEnumData::CreateAnonymousChildLayer() +CascadeLayer* +CascadeLayer::CreateAnonymousChildLayer() { nsString name; - CascadeEnumData* childLayer = new CascadeEnumData(mPresContext, - name, + CascadeLayer* childLayer = new CascadeLayer(mPresContext, + name, #ifdef DEBUG - this, + this, #endif - false, - mDocumentRules, - mDocumentCacheKey, - mSheetType, - mMustGatherDocumentRules, - mCacheKey); + false, + mDocumentRules, + mDocumentCacheKey, + mSheetType, + mMustGatherDocumentRules, + mCacheKey); mPreLayers.AppendElement(childLayer); return childLayer; } @@ -1670,7 +1670,7 @@ CompareWeightData(const void* aArg1, const void* aArg2, void* closure) } void -CascadeEnumData::AddRules() +CascadeLayer::AddRules() { MOZ_ASSERT(!mRulesAdded, "Rule cascade data already filled"); @@ -1746,10 +1746,10 @@ CascadeEnumData::AddRules() } void -CascadeEnumData::EnumerateAllLayers(nsLayerEnumFunc aFunc, void* aData) +CascadeLayer::EnumerateAllLayers(nsLayerEnumFunc aFunc, void* aData) { if (mPreLayers.Length() > 0) { - for (CascadeEnumData* pre : mPreLayers) { + for (CascadeLayer* pre : mPreLayers) { pre->EnumerateAllLayers(aFunc, aData); } } @@ -1757,19 +1757,19 @@ CascadeEnumData::EnumerateAllLayers(nsLayerEnumFunc aFunc, void* aData) (*aFunc)(this, aData); if (mPostLayers.Length() > 0) { - for (CascadeEnumData* post : mPostLayers) { + for (CascadeLayer* post : mPostLayers) { post->EnumerateAllLayers(aFunc, aData); } } } void -CascadeEnumData::Initialize() +CascadeLayer::Initialize() { mData = new RuleCascadeData(eCompatibility_NavQuirks == mPresContext->CompatibilityMode()); // Initialize our arena PL_INIT_ARENA_POOL( - &mArena, "CascadeEnumDataArena", NS_CASCADEENUMDATA_ARENA_BLOCK_SIZE); + &mArena, "CascadeLayerArena", NS_CASCADELAYER_ARENA_BLOCK_SIZE); } diff --git a/layout/style/RuleCascadeData.h b/layout/style/RuleCascadeData.h index 0db7ee6296..e7cddfb8d2 100644 --- a/layout/style/RuleCascadeData.h +++ b/layout/style/RuleCascadeData.h @@ -322,28 +322,28 @@ private: static const PLDHashTableOps AtomSelector_CIOps; }; -struct CascadeEnumData +struct CascadeLayer { - CascadeEnumData(nsPresContext* aPresContext, - nsString aName, + CascadeLayer(nsPresContext* aPresContext, + nsString aName, #ifdef DEBUG - CascadeEnumData* aParent, + CascadeLayer* aParent, #endif - bool aIsWeak, - nsTArray& aDocumentRules, - nsDocumentRuleResultCacheKey& aDocumentKey, - SheetType aSheetType, - bool aMustGatherDocumentRules, - nsMediaQueryResultCacheKey& aCacheKey); + bool aIsWeak, + nsTArray& aDocumentRules, + nsDocumentRuleResultCacheKey& aDocumentKey, + SheetType aSheetType, + bool aMustGatherDocumentRules, + nsMediaQueryResultCacheKey& aCacheKey); - CascadeEnumData(nsPresContext* aPresContext, - nsTArray& aDocumentRules, - nsDocumentRuleResultCacheKey& aDocumentKey, - SheetType aSheetType, - bool aMustGatherDocumentRules, - nsMediaQueryResultCacheKey& aCacheKey); + CascadeLayer(nsPresContext* aPresContext, + nsTArray& aDocumentRules, + nsDocumentRuleResultCacheKey& aDocumentKey, + SheetType aSheetType, + bool aMustGatherDocumentRules, + nsMediaQueryResultCacheKey& aCacheKey); - ~CascadeEnumData(); + ~CascadeLayer(); nsPresContext* mPresContext; nsString mName; @@ -366,17 +366,17 @@ struct CascadeEnumData PLDHashTable mRulesByWeight; // of PerWeightDataListItem linked lists #ifdef DEBUG - CascadeEnumData* mParent; + CascadeLayer* mParent; bool mIsRoot; #endif - nsTArray mPreLayers; - nsTArray mPostLayers; - nsDataHashtable mLayers; + nsTArray mPreLayers; + nsTArray mPostLayers; + nsDataHashtable mLayers; - CascadeEnumData* CreateNamedChildLayer(const nsTArray& aPath); - CascadeEnumData* CreateAnonymousChildLayer(); + CascadeLayer* CreateNamedChildLayer(const nsTArray& aPath); + CascadeLayer* CreateAnonymousChildLayer(); - typedef void (*nsLayerEnumFunc)(CascadeEnumData* aLayer, void* aData); + typedef void (*nsLayerEnumFunc)(CascadeLayer* aLayer, void* aData); void EnumerateAllLayers(nsLayerEnumFunc aFunc, void* aData); void AddRules(); diff --git a/layout/style/nsCSSRuleProcessor.cpp b/layout/style/nsCSSRuleProcessor.cpp index cef071535e..958fe1c27a 100644 --- a/layout/style/nsCSSRuleProcessor.cpp +++ b/layout/style/nsCSSRuleProcessor.cpp @@ -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(aData); @@ -735,16 +735,15 @@ nsCSSRuleProcessor::RefreshGroup(nsPresContext* aPresContext) if (mSheets.Length() != 0) { nsAutoPtr 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 diff --git a/layout/style/nsCSSRuleProcessor.h b/layout/style/nsCSSRuleProcessor.h index 71c2cc2a53..9d695fedd3 100644 --- a/layout/style/nsCSSRuleProcessor.h +++ b/layout/style/nsCSSRuleProcessor.h @@ -23,7 +23,7 @@ #include "nsRuleWalker.h" #include "nsTArray.h" -struct CascadeEnumData; +struct CascadeLayer; struct ElementDependentRuleProcessorData; struct nsFontFaceRuleContainer; struct RuleProcessorGroup; @@ -159,7 +159,7 @@ protected: private: static bool CascadeSheet(mozilla::CSSStyleSheet* aSheet, - CascadeEnumData* aData); + CascadeLayer* aLayer); RuleProcessorGroup* GetGroup(nsPresContext* aPresContext); void RefreshGroup(nsPresContext* aPresContext);