wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 480888 patch 2: Remove always-true aStoreRectProperties parameter to ComputeEffectsRect. r=roc

Browse Source
This commit is contained in:
L. David Baron 2014-02-14 21:29:12 -08:00
parent e4a5561d0e
commit 56df9ce565
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
layout/generic/nsFrame.cpp
View File

@ -4957,7 +4957,7 @@ nsIFrame::InvalidateLayer(uint32_t aDisplayItemKey,
static nsRect
ComputeEffectsRect(nsIFrame* aFrame, const nsRect& aOverflowRect,
const nsSize& aNewSize, bool aStoreRectProperties)
const nsSize& aNewSize)
{
nsRect r = aOverflowRect;
@ -4966,10 +4966,8 @@ ComputeEffectsRect(nsIFrame* aFrame, const nsRect& aOverflowRect,
// TODO: We could also take account of clipPath and mask to reduce the
// visual overflow, but that's not essential.
if (aFrame->StyleSVGReset()->HasFilters()) {
if (aStoreRectProperties) {
aFrame->Properties().
Set(nsIFrame::PreEffectsBBoxProperty(), new nsRect(r));
}
aFrame->Properties().
Set(nsIFrame::PreEffectsBBoxProperty(), new nsRect(r));
r = nsSVGUtils::GetPostFilterVisualOverflowRect(aFrame, aOverflowRect);
}
return r;
@ -4985,10 +4983,8 @@ ComputeEffectsRect(nsIFrame* aFrame, const nsRect& aOverflowRect,
DebugOnly<bool> result = outline->GetOutlineWidth(width);
NS_ASSERTION(result, "GetOutlineWidth had no cached outline width");
if (width > 0) {
if (aStoreRectProperties) {
aFrame->Properties().
Set(nsIFrame::OutlineInnerRectProperty(), new nsRect(r));
}
aFrame->Properties().
Set(nsIFrame::OutlineInnerRectProperty(), new nsRect(r));
nscoord offset = outline->mOutlineOffset;
nscoord inflateBy = std::max(width + offset, 0);
@ -5030,10 +5026,8 @@ ComputeEffectsRect(nsIFrame* aFrame, const nsRect& aOverflowRect,
// the frame dies.
if (nsSVGIntegrationUtils::UsingEffectsForFrame(aFrame)) {
if (aStoreRectProperties) {
aFrame->Properties().
Set(nsIFrame::PreEffectsBBoxProperty(), new nsRect(r));
}
aFrame->Properties().
Set(nsIFrame::PreEffectsBBoxProperty(), new nsRect(r));
r = nsSVGIntegrationUtils::ComputePostEffectsVisualOverflowRect(aFrame, r);
}
@ -6935,7 +6929,7 @@ nsIFrame::FinishAndStoreOverflow(nsOverflowAreas& aOverflowAreas,
// Nothing in here should affect scrollable overflow.
aOverflowAreas.VisualOverflow() =
ComputeEffectsRect(this, aOverflowAreas.VisualOverflow(), aNewSize, true);
ComputeEffectsRect(this, aOverflowAreas.VisualOverflow(), aNewSize);
// Absolute position clipping
nsRect clipPropClipRect;