Bug 1355374 - Remove the no-longer-used LayerMetricsWrapper::GetScrollThumbLength() and HitTestingTreeNode::mScrollThumbLength. r=kats

MozReview-Commit-ID: ICm2Q1hnKD6

--HG--
extra : rebase_source : 3152714a349ce134d30dc48c94b40b59053ab195
This commit is contained in:
Botond Ballo 2017-04-21 13:59:32 -04:00
Родитель 9323d2bb93
Коммит db703a3ed0
4 изменённых файлов: 0 добавлений и 22 удалений

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

@ -411,15 +411,6 @@ public:
return mLayer->GetScrollbarTargetContainerId();
}
int32_t GetScrollThumbLength() const
{
if (GetScrollbarDirection() == ScrollDirection::VERTICAL) {
return mLayer->GetVisibleRegion().GetBounds().height;
} else {
return mLayer->GetVisibleRegion().GetBounds().width;
}
}
bool IsScrollbarContainer() const
{
MOZ_ASSERT(IsValid());

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

@ -495,7 +495,6 @@ APZCTreeManager::PrepareNodeForLayer(const LayerMetricsWrapper& aLayer,
GetEventRegionsOverride(aParent, aLayer));
node->SetScrollbarData(aLayer.GetScrollbarTargetContainerId(),
aLayer.GetScrollbarDirection(),
aLayer.GetScrollThumbLength(),
aLayer.IsScrollbarContainer());
node->SetFixedPosData(aLayer.GetFixedPositionScrollContainerId());
return node;
@ -685,7 +684,6 @@ APZCTreeManager::PrepareNodeForLayer(const LayerMetricsWrapper& aLayer,
// when those properties change.
node->SetScrollbarData(aLayer.GetScrollbarTargetContainerId(),
aLayer.GetScrollbarDirection(),
aLayer.GetScrollThumbLength(),
aLayer.IsScrollbarContainer());
node->SetFixedPosData(aLayer.GetFixedPositionScrollContainerId());
return node;

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

@ -28,7 +28,6 @@ HitTestingTreeNode::HitTestingTreeNode(AsyncPanZoomController* aApzc,
, mLayersId(aLayersId)
, mScrollViewId(FrameMetrics::NULL_SCROLL_ID)
, mScrollDir(ScrollDirection::NONE)
, mScrollThumbLength(0)
, mIsScrollbarContainer(false)
, mFixedPosTarget(FrameMetrics::NULL_SCROLL_ID)
, mOverride(EventRegionsOverride::NoOverride)
@ -97,12 +96,10 @@ HitTestingTreeNode::SetLastChild(HitTestingTreeNode* aChild)
void
HitTestingTreeNode::SetScrollbarData(FrameMetrics::ViewID aScrollViewId,
ScrollDirection aDir,
int32_t aScrollThumbLength,
bool aIsScrollContainer)
{
mScrollViewId = aScrollViewId;
mScrollDir = aDir;
mScrollThumbLength = aScrollThumbLength;
mIsScrollbarContainer = aIsScrollContainer;
}
@ -116,12 +113,6 @@ HitTestingTreeNode::MatchesScrollDragMetrics(const AsyncDragMetrics& aDragMetric
mScrollViewId == aDragMetrics.mViewId;
}
LayerIntCoord
HitTestingTreeNode::GetScrollThumbLength() const
{
return mScrollThumbLength;
}
bool
HitTestingTreeNode::IsScrollbarNode() const
{

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

@ -93,7 +93,6 @@ public:
void SetScrollbarData(FrameMetrics::ViewID aScrollViewId,
ScrollDirection aDir,
int32_t aScrollThumbLength,
bool aIsScrollContainer);
bool MatchesScrollDragMetrics(const AsyncDragMetrics& aDragMetrics) const;
LayerIntCoord GetScrollThumbLength() const;
@ -135,7 +134,6 @@ private:
// This is set for scroll thumb Container layers only.
ScrollDirection mScrollDir;
int32_t mScrollThumbLength;
// This is set for scroll track Container layers only.
bool mIsScrollbarContainer;