From 6fe6aa277801e3b36ee35b279e1d9166be031db9 Mon Sep 17 00:00:00 2001 From: Nicholas Nethercote Date: Tue, 5 Jan 2016 16:08:17 -0800 Subject: [PATCH] Bug 1232852 (part 7) - Remove some unused parameters in and around layout/base/. r=tn. --HG-- extra : rebase_source : 2af990358f65806ca7602e0b1c2e4dbd54e3884c --- layout/base/FrameLayerBuilder.cpp | 5 ++--- layout/base/nsDisplayList.cpp | 23 +++++++++-------------- layout/base/nsDisplayList.h | 27 ++++++++++++--------------- 3 files changed, 23 insertions(+), 32 deletions(-) diff --git a/layout/base/FrameLayerBuilder.cpp b/layout/base/FrameLayerBuilder.cpp index e88d291fc739..98ab9bfab164 100644 --- a/layout/base/FrameLayerBuilder.cpp +++ b/layout/base/FrameLayerBuilder.cpp @@ -3456,8 +3456,7 @@ PaintedLayerData::Accumulate(ContainerState* aState, bool isFirstVisibleItem = mVisibleRegion.IsEmpty(); if (isFirstVisibleItem) { nscolor fontSmoothingBGColor; - if (aItem->ProvidesFontSmoothingBackgroundColor(aState->mBuilder, - &fontSmoothingBGColor)) { + if (aItem->ProvidesFontSmoothingBackgroundColor(&fontSmoothingBGColor)) { mFontSmoothingBackgroundColor = fontSmoothingBGColor; } } @@ -3814,7 +3813,7 @@ ContainerState::ProcessDisplayItems(nsDisplayList* aList) // if necessary. nsDisplayItem* aboveItem; while ((aboveItem = aList->GetBottom()) != nullptr) { - if (aboveItem->TryMerge(mBuilder, item)) { + if (aboveItem->TryMerge(item)) { aList->RemoveBottom(); item->~nsDisplayItem(); item = aboveItem; diff --git a/layout/base/nsDisplayList.cpp b/layout/base/nsDisplayList.cpp index 232e1d011a52..91ffeba6d486 100644 --- a/layout/base/nsDisplayList.cpp +++ b/layout/base/nsDisplayList.cpp @@ -3070,8 +3070,7 @@ nsDisplayThemedBackground::IsUniform(nsDisplayListBuilder* aBuilder, nscolor* aC } bool -nsDisplayThemedBackground::ProvidesFontSmoothingBackgroundColor(nsDisplayListBuilder* aBuilder, - nscolor* aColor) +nsDisplayThemedBackground::ProvidesFontSmoothingBackgroundColor(nscolor* aColor) { nsITheme* theme = mFrame->PresContext()->GetTheme(); return theme->WidgetProvidesFontSmoothingBackgroundColor(mFrame, mAppearance, aColor); @@ -4205,7 +4204,7 @@ nsDisplayOpacity::ComputeVisibility(nsDisplayListBuilder* aBuilder, nsDisplayWrapList::ComputeVisibility(aBuilder, &visibleUnderChildren); } -bool nsDisplayOpacity::TryMerge(nsDisplayListBuilder* aBuilder, nsDisplayItem* aItem) { +bool nsDisplayOpacity::TryMerge(nsDisplayItem* aItem) { if (aItem->GetType() != TYPE_OPACITY) return false; // items for the same content element should be merged into a single @@ -4228,8 +4227,7 @@ nsDisplayOpacity::WriteDebugInfo(std::stringstream& aStream) } nsDisplayMixBlendMode::nsDisplayMixBlendMode(nsDisplayListBuilder* aBuilder, - nsIFrame* aFrame, nsDisplayList* aList, - uint32_t aFlags) + nsIFrame* aFrame, nsDisplayList* aList) : nsDisplayWrapList(aBuilder, aFrame, aList) { MOZ_COUNT_CTOR(nsDisplayMixBlendMode); } @@ -4292,7 +4290,7 @@ bool nsDisplayMixBlendMode::ComputeVisibility(nsDisplayListBuilder* aBuilder, return nsDisplayWrapList::ComputeVisibility(aBuilder, &visibleUnderChildren); } -bool nsDisplayMixBlendMode::TryMerge(nsDisplayListBuilder* aBuilder, nsDisplayItem* aItem) { +bool nsDisplayMixBlendMode::TryMerge(nsDisplayItem* aItem) { if (aItem->GetType() != TYPE_MIX_BLEND_MODE) return false; // items for the same content element should be merged into a single @@ -4364,7 +4362,7 @@ nsDisplayBlendContainer::GetLayerState(nsDisplayListBuilder* aBuilder, return mozilla::LAYER_INACTIVE; } -bool nsDisplayBlendContainer::TryMerge(nsDisplayListBuilder* aBuilder, nsDisplayItem* aItem) { +bool nsDisplayBlendContainer::TryMerge(nsDisplayItem* aItem) { if (aItem->GetType() != TYPE_BLEND_CONTAINER) return false; // items for the same content element should be merged into a single @@ -4691,7 +4689,7 @@ nsDisplayStickyPosition::BuildLayer(nsDisplayListBuilder* aBuilder, return layer.forget(); } -bool nsDisplayStickyPosition::TryMerge(nsDisplayListBuilder* aBuilder, nsDisplayItem* aItem) { +bool nsDisplayStickyPosition::TryMerge(nsDisplayItem* aItem) { if (aItem->GetType() != TYPE_STICKY_POSITION) return false; // Items with the same fixed position frame can be merged. @@ -5960,8 +5958,7 @@ bool nsDisplayTransform::IsUniform(nsDisplayListBuilder *aBuilder, nscolor* aCol #ifndef UNIFIED_CONTINUATIONS bool -nsDisplayTransform::TryMerge(nsDisplayListBuilder *aBuilder, - nsDisplayItem *aItem) +nsDisplayTransform::TryMerge(nsDisplayItem *aItem) { return false; } @@ -5969,11 +5966,9 @@ nsDisplayTransform::TryMerge(nsDisplayListBuilder *aBuilder, #else bool -nsDisplayTransform::TryMerge(nsDisplayListBuilder *aBuilder, - nsDisplayItem *aItem) +nsDisplayTransform::TryMerge(nsDisplayItem *aItem) { NS_PRECONDITION(aItem, "Why did you try merging with a null item?"); - NS_PRECONDITION(aBuilder, "Why did you try merging with a null builder?"); /* Make sure that we're dealing with two transforms. */ if (aItem->GetType() != TYPE_TRANSFORM) @@ -6331,7 +6326,7 @@ bool nsDisplaySVGEffects::ComputeVisibility(nsDisplayListBuilder* aBuilder, return true; } -bool nsDisplaySVGEffects::TryMerge(nsDisplayListBuilder* aBuilder, nsDisplayItem* aItem) +bool nsDisplaySVGEffects::TryMerge(nsDisplayItem* aItem) { if (aItem->GetType() != TYPE_SVG_EFFECTS) return false; diff --git a/layout/base/nsDisplayList.h b/layout/base/nsDisplayList.h index 869bff117f34..c2cc8f983c7c 100644 --- a/layout/base/nsDisplayList.h +++ b/layout/base/nsDisplayList.h @@ -1570,8 +1570,7 @@ public: virtual bool ClearsBackground() { return false; } - virtual bool ProvidesFontSmoothingBackgroundColor(nsDisplayListBuilder* aBuilder, - nscolor* aColor) + virtual bool ProvidesFontSmoothingBackgroundColor(nscolor* aColor) { return false; } /** @@ -1689,7 +1688,7 @@ public: * (also for correctness). * @return true if the merge was successful and the other item should be deleted */ - virtual bool TryMerge(nsDisplayListBuilder* aBuilder, nsDisplayItem* aItem) { + virtual bool TryMerge(nsDisplayItem* aItem) { return false; } @@ -2770,8 +2769,7 @@ public: virtual nsRegion GetOpaqueRegion(nsDisplayListBuilder* aBuilder, bool* aSnap) override; virtual bool IsUniform(nsDisplayListBuilder* aBuilder, nscolor* aColor) override; - virtual bool ProvidesFontSmoothingBackgroundColor(nsDisplayListBuilder* aBuilder, - nscolor* aColor) override; + virtual bool ProvidesFontSmoothingBackgroundColor(nscolor* aColor) override; /** * GetBounds() returns the background painting area. @@ -3203,7 +3201,7 @@ public: virtual void Paint(nsDisplayListBuilder* aBuilder, nsRenderingContext* aCtx) override; virtual bool ComputeVisibility(nsDisplayListBuilder* aBuilder, nsRegion* aVisibleRegion) override; - virtual bool TryMerge(nsDisplayListBuilder* aBuilder, nsDisplayItem* aItem) override { + virtual bool TryMerge(nsDisplayItem* aItem) override { return false; } virtual void GetMergedFrames(nsTArray* aFrames) override @@ -3344,7 +3342,7 @@ public: const ContainerLayerParameters& aParameters) override; virtual bool ComputeVisibility(nsDisplayListBuilder* aBuilder, nsRegion* aVisibleRegion) override; - virtual bool TryMerge(nsDisplayListBuilder* aBuilder, nsDisplayItem* aItem) override; + virtual bool TryMerge(nsDisplayItem* aItem) override; virtual void ComputeInvalidationRegion(nsDisplayListBuilder* aBuilder, const nsDisplayItemGeometry* aGeometry, nsRegion* aInvalidRegion) override @@ -3374,7 +3372,7 @@ private: class nsDisplayMixBlendMode : public nsDisplayWrapList { public: nsDisplayMixBlendMode(nsDisplayListBuilder* aBuilder, nsIFrame* aFrame, - nsDisplayList* aList, uint32_t aFlags = 0); + nsDisplayList* aList); #ifdef NS_BUILD_REFCNT_LOGGING virtual ~nsDisplayMixBlendMode(); #endif @@ -3396,7 +3394,7 @@ public: const ContainerLayerParameters& aParameters) override; virtual bool ComputeVisibility(nsDisplayListBuilder* aBuilder, nsRegion* aVisibleRegion) override; - virtual bool TryMerge(nsDisplayListBuilder* aBuilder, nsDisplayItem* aItem) override; + virtual bool TryMerge(nsDisplayItem* aItem) override; virtual bool ShouldFlattenAway(nsDisplayListBuilder* aBuilder) override { return false; } @@ -3420,7 +3418,7 @@ public: virtual LayerState GetLayerState(nsDisplayListBuilder* aBuilder, LayerManager* aManager, const ContainerLayerParameters& aParameters) override; - virtual bool TryMerge(nsDisplayListBuilder* aBuilder, nsDisplayItem* aItem) override; + virtual bool TryMerge(nsDisplayItem* aItem) override; virtual bool ShouldFlattenAway(nsDisplayListBuilder* aBuilder) override { return false; } @@ -3480,7 +3478,7 @@ public: { return mozilla::LAYER_ACTIVE_FORCE; } - virtual bool TryMerge(nsDisplayListBuilder* aBuilder, nsDisplayItem* aItem) override + virtual bool TryMerge(nsDisplayItem* aItem) override { // Don't allow merging, each sublist must have its own layer return false; @@ -3577,7 +3575,7 @@ public: { return mozilla::LAYER_ACTIVE; } - virtual bool TryMerge(nsDisplayListBuilder* aBuilder, nsDisplayItem* aItem) override; + virtual bool TryMerge(nsDisplayItem* aItem) override; }; /** @@ -3708,8 +3706,7 @@ public: } virtual bool ComputeVisibility(nsDisplayListBuilder* aBuilder, nsRegion* aVisibleRegion) override; - virtual bool TryMerge(nsDisplayListBuilder* aBuilder, - nsDisplayItem* aItem) override; + virtual bool TryMerge(nsDisplayItem* aItem) override; virtual bool ShouldFlattenAway(nsDisplayListBuilder* aBuilder) override { return false; } @@ -3853,7 +3850,7 @@ public: virtual bool ShouldBuildLayerEvenIfInvisible(nsDisplayListBuilder* aBuilder) override; virtual bool ComputeVisibility(nsDisplayListBuilder *aBuilder, nsRegion *aVisibleRegion) override; - virtual bool TryMerge(nsDisplayListBuilder *aBuilder, nsDisplayItem *aItem) override; + virtual bool TryMerge(nsDisplayItem *aItem) override; virtual uint32_t GetPerFrameKey() override { return (mIndex << nsDisplayItem::TYPE_BITS) | nsDisplayItem::GetPerFrameKey(); }