Bug 1349750 - Remove the no-longer-used WebRenderScrollData[Wrapper]::GetScrollThumbLength(). r=kats

Also remove a vestigial declaration of the previously removed method
HitTestingTreeNode::GetScrollThumbLength().

MozReview-Commit-ID: 3BvFNeGwPXd

--HG--
extra : rebase_source : 6cc6d2f2e3ecc4dedce2b83f6b0faf819f4be0f8
This commit is contained in:
Botond Ballo 2017-05-03 20:23:42 -04:00
Родитель 6c0eea50b3
Коммит 3981a3686a
4 изменённых файлов: 0 добавлений и 14 удалений

Просмотреть файл

@ -95,7 +95,6 @@ public:
ScrollDirection aDir, ScrollDirection aDir,
bool aIsScrollContainer); bool aIsScrollContainer);
bool MatchesScrollDragMetrics(const AsyncDragMetrics& aDragMetrics) const; bool MatchesScrollDragMetrics(const AsyncDragMetrics& aDragMetrics) const;
LayerIntCoord GetScrollThumbLength() const;
bool IsScrollbarNode() const; bool IsScrollbarNode() const;
FrameMetrics::ViewID GetScrollTargetId() const; FrameMetrics::ViewID GetScrollTargetId() const;

Просмотреть файл

@ -45,9 +45,6 @@ WebRenderLayerScrollData::Initialize(WebRenderScrollData& aOwner,
: EventRegionsOverride::NoOverride; : EventRegionsOverride::NoOverride;
mScrollbarDirection = aLayer->GetScrollThumbData().mDirection; mScrollbarDirection = aLayer->GetScrollThumbData().mDirection;
mScrollbarTargetContainerId = aLayer->GetScrollbarTargetContainerId(); mScrollbarTargetContainerId = aLayer->GetScrollbarTargetContainerId();
mScrollThumbLength = mScrollbarDirection == ScrollDirection::VERTICAL
? aLayer->GetVisibleRegion().GetBounds().height
: aLayer->GetVisibleRegion().GetBounds().width;
mIsScrollbarContainer = aLayer->IsScrollbarContainer(); mIsScrollbarContainer = aLayer->IsScrollbarContainer();
mFixedPosScrollContainerId = aLayer->GetFixedPositionScrollContainerId(); mFixedPosScrollContainerId = aLayer->GetFixedPositionScrollContainerId();
} }

Просмотреть файл

@ -55,7 +55,6 @@ public:
EventRegionsOverride GetEventRegionsOverride() const { return mEventRegionsOverride; } EventRegionsOverride GetEventRegionsOverride() const { return mEventRegionsOverride; }
ScrollDirection GetScrollbarDirection() const { return mScrollbarDirection; } ScrollDirection GetScrollbarDirection() const { return mScrollbarDirection; }
FrameMetrics::ViewID GetScrollbarTargetContainerId() const { return mScrollbarTargetContainerId; } FrameMetrics::ViewID GetScrollbarTargetContainerId() const { return mScrollbarTargetContainerId; }
int32_t GetScrollThumbLength() const { return mScrollThumbLength; }
bool IsScrollbarContainer() const { return mIsScrollbarContainer; } bool IsScrollbarContainer() const { return mIsScrollbarContainer; }
FrameMetrics::ViewID GetFixedPositionScrollContainerId() const { return mFixedPosScrollContainerId; } FrameMetrics::ViewID GetFixedPositionScrollContainerId() const { return mFixedPosScrollContainerId; }
@ -85,7 +84,6 @@ private:
EventRegionsOverride mEventRegionsOverride; EventRegionsOverride mEventRegionsOverride;
ScrollDirection mScrollbarDirection; ScrollDirection mScrollbarDirection;
FrameMetrics::ViewID mScrollbarTargetContainerId; FrameMetrics::ViewID mScrollbarTargetContainerId;
int32_t mScrollThumbLength;
bool mIsScrollbarContainer; bool mIsScrollbarContainer;
FrameMetrics::ViewID mFixedPosScrollContainerId; FrameMetrics::ViewID mFixedPosScrollContainerId;
}; };
@ -168,7 +166,6 @@ struct ParamTraits<mozilla::layers::WebRenderLayerScrollData>
WriteParam(aMsg, aParam.mEventRegionsOverride); WriteParam(aMsg, aParam.mEventRegionsOverride);
WriteParam(aMsg, aParam.mScrollbarDirection); WriteParam(aMsg, aParam.mScrollbarDirection);
WriteParam(aMsg, aParam.mScrollbarTargetContainerId); WriteParam(aMsg, aParam.mScrollbarTargetContainerId);
WriteParam(aMsg, aParam.mScrollThumbLength);
WriteParam(aMsg, aParam.mIsScrollbarContainer); WriteParam(aMsg, aParam.mIsScrollbarContainer);
WriteParam(aMsg, aParam.mFixedPosScrollContainerId); WriteParam(aMsg, aParam.mFixedPosScrollContainerId);
} }
@ -186,7 +183,6 @@ struct ParamTraits<mozilla::layers::WebRenderLayerScrollData>
&& ReadParam(aMsg, aIter, &aResult->mEventRegionsOverride) && ReadParam(aMsg, aIter, &aResult->mEventRegionsOverride)
&& ReadParam(aMsg, aIter, &aResult->mScrollbarDirection) && ReadParam(aMsg, aIter, &aResult->mScrollbarDirection)
&& ReadParam(aMsg, aIter, &aResult->mScrollbarTargetContainerId) && ReadParam(aMsg, aIter, &aResult->mScrollbarTargetContainerId)
&& ReadParam(aMsg, aIter, &aResult->mScrollThumbLength)
&& ReadParam(aMsg, aIter, &aResult->mIsScrollbarContainer) && ReadParam(aMsg, aIter, &aResult->mIsScrollbarContainer)
&& ReadParam(aMsg, aIter, &aResult->mFixedPosScrollContainerId); && ReadParam(aMsg, aIter, &aResult->mFixedPosScrollContainerId);
} }

Просмотреть файл

@ -291,12 +291,6 @@ public:
return mLayer->GetScrollbarTargetContainerId(); return mLayer->GetScrollbarTargetContainerId();
} }
int32_t GetScrollThumbLength() const
{
MOZ_ASSERT(IsValid());
return mLayer->GetScrollThumbLength();
}
bool IsScrollbarContainer() const bool IsScrollbarContainer() const
{ {
MOZ_ASSERT(IsValid()); MOZ_ASSERT(IsValid());