зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1271168 - Part 1: Remove nsPresContext arg from nsStyleOutline::RecalcData. r=bholley
This commit is contained in:
Родитель
e0ef4e6c7a
Коммит
74881f45fe
|
@ -7747,7 +7747,7 @@ nsRuleNode::ComputeOutlineData(void* aStartStruct,
|
|||
outline->SetOutlineStyle(parentOutline->GetOutlineStyle());
|
||||
}
|
||||
|
||||
outline->RecalcData(mPresContext);
|
||||
outline->RecalcData();
|
||||
COMPUTE_END_RESET(Outline, outline)
|
||||
}
|
||||
|
||||
|
|
|
@ -546,7 +546,7 @@ nsStyleOutline::nsStyleOutline(const nsStyleOutline& aSrc)
|
|||
}
|
||||
|
||||
void
|
||||
nsStyleOutline::RecalcData(nsPresContext* aContext)
|
||||
nsStyleOutline::RecalcData()
|
||||
{
|
||||
if (NS_STYLE_BORDER_STYLE_NONE == GetOutlineStyle()) {
|
||||
mCachedOutlineWidth = 0;
|
||||
|
@ -555,7 +555,8 @@ nsStyleOutline::RecalcData(nsPresContext* aContext)
|
|||
mOutlineWidth.GetUnit() == eStyleUnit_Enumerated);
|
||||
// Clamp negative calc() to 0.
|
||||
mCachedOutlineWidth =
|
||||
std::max(CalcCoord(mOutlineWidth, aContext->GetBorderWidthTable(), 3), 0);
|
||||
std::max(CalcCoord(mOutlineWidth,
|
||||
StaticPresData::Get()->GetBorderWidthTable(), 3), 0);
|
||||
mCachedOutlineWidth =
|
||||
NS_ROUND_BORDER_TO_PIXELS(mCachedOutlineWidth, mTwipsPerPixel);
|
||||
}
|
||||
|
|
|
@ -1300,7 +1300,7 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleOutline
|
|||
FreeByObjectID(mozilla::eArenaObjectID_nsStyleOutline, this);
|
||||
}
|
||||
|
||||
void RecalcData(nsPresContext* aContext);
|
||||
void RecalcData();
|
||||
nsChangeHint CalcDifference(const nsStyleOutline& aOther) const;
|
||||
static nsChangeHint MaxDifference() {
|
||||
return NS_CombineHint(NS_CombineHint(nsChangeHint_UpdateOverflow,
|
||||
|
|
Загрузка…
Ссылка в новой задаче