зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1380133 - Part 7: De-templatize CalcStyleDifference(Internal). r=emilio
MozReview-Commit-ID: 8c1E1gbwaHz --- layout/style/nsStyleContext.cpp | 23 +++++------------------ layout/style/nsStyleContext.h | 7 ------- 2 files changed, 5 insertions(+), 25 deletions(-) --HG-- extra : rebase_source : 0280187becf0f35bc7c5ceb272babd6e0adbb3ff
This commit is contained in:
Родитель
336a333bf0
Коммит
aa95f86b98
|
@ -185,14 +185,13 @@ nsStyleContext::MoveTo(nsStyleContext* aNewParent)
|
|||
}
|
||||
}
|
||||
|
||||
template<class StyleContextLike>
|
||||
nsChangeHint
|
||||
nsStyleContext::CalcStyleDifferenceInternal(StyleContextLike* aNewContext,
|
||||
nsStyleContext::CalcStyleDifference(nsStyleContext* aNewContext,
|
||||
uint32_t* aEqualStructs,
|
||||
uint32_t* aSamePointerStructs,
|
||||
uint32_t aRelevantStructs)
|
||||
{
|
||||
AUTO_PROFILER_LABEL("nsStyleContext::CalcStyleDifferenceInternal", CSS);
|
||||
AUTO_PROFILER_LABEL("nsStyleContext::CalcStyleDifference", CSS);
|
||||
|
||||
static_assert(nsStyleStructID_Length <= 32,
|
||||
"aEqualStructs is not big enough");
|
||||
|
@ -447,18 +446,6 @@ nsStyleContext::CalcStyleDifferenceInternal(StyleContextLike* 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
|
||||
|
|
|
@ -287,13 +287,6 @@ 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
|
||||
|
|
Загрузка…
Ссылка в новой задаче