Backed out changeset 1f1175528301 (bug 1380133)

This commit is contained in:
Sebastian Hengst 2017-07-20 15:39:48 +02:00
parent 8851ad32bc
commit 4e48589974
2 changed files with 25 additions and 5 deletions

View File

@ -185,13 +185,14 @@ nsStyleContext::MoveTo(nsStyleContext* aNewParent)
}
}
template<class StyleContextLike>
nsChangeHint
nsStyleContext::CalcStyleDifference(nsStyleContext* aNewContext,
uint32_t* aEqualStructs,
uint32_t* aSamePointerStructs,
uint32_t aRelevantStructs)
nsStyleContext::CalcStyleDifferenceInternal(StyleContextLike* aNewContext,
uint32_t* aEqualStructs,
uint32_t* aSamePointerStructs,
uint32_t aRelevantStructs)
{
AUTO_PROFILER_LABEL("nsStyleContext::CalcStyleDifference", CSS);
AUTO_PROFILER_LABEL("nsStyleContext::CalcStyleDifferenceInternal", CSS);
static_assert(nsStyleStructID_Length <= 32,
"aEqualStructs is not big enough");
@ -446,6 +447,18 @@ nsStyleContext::CalcStyleDifference(nsStyleContext* aNewContext,
return hint & ~nsChangeHint_NeutralChange;
}
nsChangeHint
nsStyleContext::CalcStyleDifference(nsStyleContext* aNewContext,
uint32_t* aEqualStructs,
uint32_t* aSamePointerStructs,
uint32_t aRelevantStructs)
{
return CalcStyleDifferenceInternal(aNewContext,
aEqualStructs,
aSamePointerStructs,
aRelevantStructs);
}
namespace mozilla {
void

View File

@ -287,6 +287,13 @@ public:
uint32_t aRelevantStructs =
kAllResolvedStructs);
private:
template<class StyleContextLike>
nsChangeHint CalcStyleDifferenceInternal(StyleContextLike* aNewContext,
uint32_t* aEqualStructs,
uint32_t* aSamePointerStructs,
uint32_t aRelevantStructs);
public:
/**
* Get a color that depends on link-visitedness using this and