mirrors/gecko-dev
1
0
Fork 1
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-11-02 17:28:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bug 1554499 - Part 7: Remove index from nsDisplayCompositorHitTestInfo r=mattwoodrow

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D74086
This commit is contained in:
Miko Mynttinen 2020-05-11 16:57:01 +00:00
parent 6619843fbf
commit 1965529d52
3 changed files with 8 additions and 15 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

9
layout/generic/nsGfxScrollFrame.cpp
View file

@ -3606,8 +3606,9 @@ void ScrollFrameHelper::BuildDisplayList(nsDisplayListBuilder* aBuilder,
mScrolledFrame->GetCompositorHitTestInfo(aBuilder); mScrolledFrame->GetCompositorHitTestInfo(aBuilder);
if (info != CompositorHitTestInvisibleToHit) { if (info != CompositorHitTestInvisibleToHit) {
auto* hitInfo = MakeDisplayItem<nsDisplayCompositorHitTestInfo>( auto* hitInfo =
aBuilder, mScrolledFrame, info, 1); MakeDisplayItemWithIndex<nsDisplayCompositorHitTestInfo>(
aBuilder, mScrolledFrame, 1, info);
if (hitInfo) { if (hitInfo) {
aBuilder->SetCompositorHitTestInfo(hitInfo->HitTestArea(), aBuilder->SetCompositorHitTestInfo(hitInfo->HitTestArea(),
hitInfo->HitTestFlags()); hitInfo->HitTestFlags());
@ -3786,8 +3787,8 @@ void ScrollFrameHelper::BuildDisplayList(nsDisplayListBuilder* aBuilder,
if (!mWillBuildScrollableLayer) { if (!mWillBuildScrollableLayer) {
if (aBuilder->BuildCompositorHitTestInfo()) { if (aBuilder->BuildCompositorHitTestInfo()) {
nsDisplayCompositorHitTestInfo* hitInfo = nsDisplayCompositorHitTestInfo* hitInfo =
MakeDisplayItem<nsDisplayCompositorHitTestInfo>( MakeDisplayItemWithIndex<nsDisplayCompositorHitTestInfo>(
aBuilder, mScrolledFrame, info, 1, Some(area)); aBuilder, mScrolledFrame, 1, info, Some(area));
if (hitInfo) { if (hitInfo) {
AppendInternalItemToTop(scrolledContent, hitInfo, Some(INT32_MAX)); AppendInternalItemToTop(scrolledContent, hitInfo, Some(INT32_MAX));
} }

10
layout/painting/nsDisplayList.cpp
View file

@ -1994,7 +1994,7 @@ void nsDisplayListBuilder::BuildCompositorHitTestInfoIfNeeded(
} }
auto* item = MakeDisplayItem<nsDisplayCompositorHitTestInfo>( auto* item = MakeDisplayItem<nsDisplayCompositorHitTestInfo>(
this, aFrame, info, 0, Some(area)); this, aFrame, info, Some(area));
MOZ_ASSERT(item); MOZ_ASSERT(item);
SetCompositorHitTestInfo(area, info); SetCompositorHitTestInfo(area, info);
@ -4754,10 +4754,9 @@ void nsDisplayEventReceiver::HitTest(nsDisplayListBuilder* aBuilder,
nsDisplayCompositorHitTestInfo::nsDisplayCompositorHitTestInfo( nsDisplayCompositorHitTestInfo::nsDisplayCompositorHitTestInfo(
nsDisplayListBuilder* aBuilder, nsIFrame* aFrame, nsDisplayListBuilder* aBuilder, nsIFrame* aFrame,
const mozilla::gfx::CompositorHitTestInfo& aHitTestFlags, uint16_t aIndex, const mozilla::gfx::CompositorHitTestInfo& aHitTestFlags,
const mozilla::Maybe<nsRect>& aArea) const mozilla::Maybe<nsRect>& aArea)
: nsDisplayHitTestInfoBase(aBuilder, aFrame), : nsDisplayHitTestInfoBase(aBuilder, aFrame),
mIndex(aIndex),
mAppUnitsPerDevPixel(mFrame->PresContext()->AppUnitsPerDevPixel()) { mAppUnitsPerDevPixel(mFrame->PresContext()->AppUnitsPerDevPixel()) {
MOZ_COUNT_CTOR(nsDisplayCompositorHitTestInfo); MOZ_COUNT_CTOR(nsDisplayCompositorHitTestInfo);
// We should never even create this display item if we're not building // We should never even create this display item if we're not building
@ -4777,7 +4776,6 @@ nsDisplayCompositorHitTestInfo::nsDisplayCompositorHitTestInfo(
nsDisplayListBuilder* aBuilder, nsIFrame* aFrame, nsDisplayListBuilder* aBuilder, nsIFrame* aFrame,
mozilla::UniquePtr<HitTestInfo>&& aHitTestInfo) mozilla::UniquePtr<HitTestInfo>&& aHitTestInfo)
: nsDisplayHitTestInfoBase(aBuilder, aFrame), : nsDisplayHitTestInfoBase(aBuilder, aFrame),
mIndex(0),
mAppUnitsPerDevPixel(mFrame->PresContext()->AppUnitsPerDevPixel()) { mAppUnitsPerDevPixel(mFrame->PresContext()->AppUnitsPerDevPixel()) {
MOZ_COUNT_CTOR(nsDisplayCompositorHitTestInfo); MOZ_COUNT_CTOR(nsDisplayCompositorHitTestInfo);
SetHitTestInfo(std::move(aHitTestInfo)); SetHitTestInfo(std::move(aHitTestInfo));
@ -4844,10 +4842,6 @@ bool nsDisplayCompositorHitTestInfo::CreateWebRenderCommands(
return true; return true;
} }
uint16_t nsDisplayCompositorHitTestInfo::CalculatePerFrameKey() const {
return mIndex;
}
int32_t nsDisplayCompositorHitTestInfo::ZIndex() const { int32_t nsDisplayCompositorHitTestInfo::ZIndex() const {
return mOverrideZIndex ? *mOverrideZIndex return mOverrideZIndex ? *mOverrideZIndex
: nsDisplayHitTestInfoBase::ZIndex(); : nsDisplayHitTestInfoBase::ZIndex();

4
layout/painting/nsDisplayList.h
View file

@ -5304,7 +5304,6 @@ class nsDisplayCompositorHitTestInfo : public nsDisplayHitTestInfoBase {
nsDisplayCompositorHitTestInfo( nsDisplayCompositorHitTestInfo(
nsDisplayListBuilder* aBuilder, nsIFrame* aFrame, nsDisplayListBuilder* aBuilder, nsIFrame* aFrame,
const mozilla::gfx::CompositorHitTestInfo& aHitTestFlags, const mozilla::gfx::CompositorHitTestInfo& aHitTestFlags,
uint16_t aIndex = 0,
const mozilla::Maybe<nsRect>& aArea = mozilla::Nothing()); const mozilla::Maybe<nsRect>& aArea = mozilla::Nothing());
nsDisplayCompositorHitTestInfo( nsDisplayCompositorHitTestInfo(
@ -5323,7 +5322,7 @@ class nsDisplayCompositorHitTestInfo : public nsDisplayHitTestInfoBase {
const StackingContextHelper& aSc, const StackingContextHelper& aSc,
mozilla::layers::RenderRootStateManager* aManager, mozilla::layers::RenderRootStateManager* aManager,
nsDisplayListBuilder* aDisplayListBuilder) override; nsDisplayListBuilder* aDisplayListBuilder) override;
uint16_t CalculatePerFrameKey() const override;
int32_t ZIndex() const override; int32_t ZIndex() const override;
void SetOverrideZIndex(int32_t aZIndex); void SetOverrideZIndex(int32_t aZIndex);
@ -5345,7 +5344,6 @@ class nsDisplayCompositorHitTestInfo : public nsDisplayHitTestInfoBase {
private: private:
mozilla::Maybe<mozilla::layers::ScrollableLayerGuid::ViewID> mScrollTarget; mozilla::Maybe<mozilla::layers::ScrollableLayerGuid::ViewID> mScrollTarget;
uint16_t mIndex;
mozilla::Maybe<int32_t> mOverrideZIndex; mozilla::Maybe<int32_t> mOverrideZIndex;
int32_t mAppUnitsPerDevPixel; int32_t mAppUnitsPerDevPixel;
}; };