Bug 1409446 - Remove old code that is now unused. r=mstange

MozReview-Commit-ID: KEtcbIGTrn3

--HG--
extra : rebase_source : dd2a435cab15930b7d5277d1764eddefd4cca298

gfx/layers/wr/ScrollingLayersHelper.cpp

@@ -23,14 +23,6 @@ ScrollingLayersHelper::ScrollingLayersHelper(nsDisplayItem* aItem,
 {
   int32_t auPerDevPixel = aItem->Frame()->PresContext()->AppUnitsPerDevPixel();
 
-  if (!aApzEnabled) {
-    // If APZ is not enabled, we can ignore all the stuff with ASRs; we just
-    // need to define the clip chain on the item and that's it.
-    DefineAndPushChain(aItem->GetClipChain(), aBuilder, aStackingContext,
-        auPerDevPixel, aCache);
-    return;
-  }
-
   // There are two ASR chains here that we need to be fully defined. One is the
   // ASR chain pointed to by aItem->GetActiveScrolledRoot(). The other is the
   // ASR chain pointed to by aItem->GetClipChain()->mASR. We pick the leafmost
@@ -362,135 +354,6 @@ ScrollingLayersHelper::RecurseAndDefineAsr(nsDisplayItem* aItem,
   return ids;
 }
 
-void
-ScrollingLayersHelper::DefineAndPushScrollLayers(nsDisplayItem* aItem,
-                                                 const ActiveScrolledRoot* aAsr,
-                                                 const DisplayItemClipChain* aChain,
-                                                 wr::DisplayListBuilder& aBuilder,
-                                                 int32_t aAppUnitsPerDevPixel,
-                                                 const StackingContextHelper& aStackingContext,
-                                                 WebRenderCommandBuilder::ClipIdMap& aCache)
-{
-  if (!aAsr) {
-    return;
-  }
-  FrameMetrics::ViewID scrollId = nsLayoutUtils::ViewIDForASR(aAsr);
-  if (aBuilder.TopmostScrollId() == scrollId) {
-    // it's already been pushed, so we don't need to recurse any further.
-    return;
-  }
-
-  // Find the first clip up the chain that's "outside" aAsr. Any clips
-  // that are "inside" aAsr (i.e. that are scrolled by aAsr) will need to be
-  // pushed onto the stack after aAsr has been pushed. On the recursive call
-  // we need to skip up the clip chain past these clips.
-  const DisplayItemClipChain* asrClippedBy = aChain;
-  while (asrClippedBy &&
-         ActiveScrolledRoot::PickAncestor(asrClippedBy->mASR, aAsr) == aAsr) {
-    asrClippedBy = asrClippedBy->mParent;
-  }
-
-  // Recurse up the ASR chain to make sure all ancestor scroll layers and their
-  // enclosing clips are defined and pushed onto the WR stack.
-  DefineAndPushScrollLayers(aItem, aAsr->mParent, asrClippedBy, aBuilder,
-      aAppUnitsPerDevPixel, aStackingContext, aCache);
-
-  // Once the ancestors are dealt with, we want to make sure all the clips
-  // enclosing aAsr are pushed. All the clips enclosing aAsr->mParent were
-  // already taken care of in the recursive call, so DefineAndPushChain will
-  // push exactly what we want.
-  DefineAndPushChain(asrClippedBy, aBuilder, aStackingContext,
-      aAppUnitsPerDevPixel, aCache);
-  // Finally, push the ASR itself as a scroll layer. If it's already defined
-  // we can skip the expensive step of computing the ScrollMetadata.
-  bool pushed = false;
-  if (mBuilder->IsScrollLayerDefined(scrollId)) {
-    mBuilder->PushScrollLayer(scrollId);
-    pushed = true;
-  } else {
-    Maybe<ScrollMetadata> metadata = aAsr->mScrollableFrame->ComputeScrollMetadata(
-        nullptr, aItem->ReferenceFrame(), ContainerLayerParameters(), nullptr);
-    MOZ_ASSERT(metadata);
-    pushed = DefineAndPushScrollLayer(metadata->GetMetrics(), aStackingContext);
-  }
-  if (pushed) {
-    mPushedClips.push_back(wr::ScrollOrClipId(scrollId));
-  }
-}
-
-void
-ScrollingLayersHelper::DefineAndPushChain(const DisplayItemClipChain* aChain,
-                                          wr::DisplayListBuilder& aBuilder,
-                                          const StackingContextHelper& aStackingContext,
-                                          int32_t aAppUnitsPerDevPixel,
-                                          WebRenderCommandBuilder::ClipIdMap& aCache)
-{
-  if (!aChain) {
-    return;
-  }
-  auto it = aCache.find(aChain);
-  Maybe<wr::WrClipId> clipId = (it != aCache.end() ? Some(it->second) : Nothing());
-  if (clipId && clipId == aBuilder.TopmostClipId()) {
-    // it was already in the cache and pushed on the WR clip stack, so we don't
-    // need to recurse any further.
-    return;
-  }
-  // Recurse up the clip chain to make sure all ancestor clips are defined and
-  // pushed onto the WR clip stack. Note that the recursion can invalidate the
-  // iterator `it`.
-  DefineAndPushChain(aChain->mParent, aBuilder, aStackingContext, aAppUnitsPerDevPixel, aCache);
-
-  if (!aChain->mClip.HasClip()) {
-    // This item in the chain is a no-op, skip over it
-    return;
-  }
-  if (!clipId || aBuilder.HasExtraClip()) {
-    // If we don't have a clip id for this chain item yet, define the clip in WR
-    // and save the id
-    LayoutDeviceRect clip = LayoutDeviceRect::FromAppUnits(
-        aChain->mClip.GetClipRect(), aAppUnitsPerDevPixel);
-    nsTArray<wr::ComplexClipRegion> wrRoundedRects;
-    aChain->mClip.ToComplexClipRegions(aAppUnitsPerDevPixel, aStackingContext, wrRoundedRects);
-    clipId = Some(aBuilder.DefineClip(Nothing(), Nothing(), aStackingContext.ToRelativeLayoutRect(clip), &wrRoundedRects));
-    if (!aBuilder.HasExtraClip()) {
-      aCache[aChain] = clipId.value();
-    }
-  }
-  // Finally, push the clip onto the WR stack
-  MOZ_ASSERT(clipId);
-  aBuilder.PushClip(clipId.value());
-  mPushedClips.push_back(wr::ScrollOrClipId(clipId.value()));
-}
-
-bool
-ScrollingLayersHelper::DefineAndPushScrollLayer(const FrameMetrics& aMetrics,
-                                                const StackingContextHelper& aStackingContext)
-{
-  if (!aMetrics.IsScrollable()) {
-    return false;
-  }
-  LayoutDeviceRect contentRect =
-      aMetrics.GetExpandedScrollableRect() * aMetrics.GetDevPixelsPerCSSPixel();
-  // TODO: check coordinate systems are sane here
-  LayoutDeviceRect clipBounds =
-      LayoutDeviceRect::FromUnknownRect(aMetrics.GetCompositionBounds().ToUnknownRect());
-  // The content rect that we hand to PushScrollLayer should be relative to
-  // the same origin as the clipBounds that we hand to PushScrollLayer - that
-  // is, both of them should be relative to the stacking context `aStackingContext`.
-  // However, when we get the scrollable rect from the FrameMetrics, the origin
-  // has nothing to do with the position of the frame but instead represents
-  // the minimum allowed scroll offset of the scrollable content. While APZ
-  // uses this to clamp the scroll position, we don't need to send this to
-  // WebRender at all. Instead, we take the position from the composition
-  // bounds.
-  contentRect.MoveTo(clipBounds.TopLeft());
-  mBuilder->DefineScrollLayer(aMetrics.GetScrollId(), Nothing(), Nothing(),
-      aStackingContext.ToRelativeLayoutRect(contentRect),
-      aStackingContext.ToRelativeLayoutRect(clipBounds));
-  mBuilder->PushScrollLayer(aMetrics.GetScrollId());
-  return true;
-}
-
 ScrollingLayersHelper::~ScrollingLayersHelper()
 {
   if (mPushedClipAndScroll) {
@@ -506,7 +369,6 @@ ScrollingLayersHelper::~ScrollingLayersHelper()
     }
     mPushedClips.pop_back();
   }
-  return;
 }
 
 } // namespace layers

gfx/layers/wr/ScrollingLayersHelper.h

@@ -57,21 +57,6 @@ private:
                       const StackingContextHelper& aSc,
                       WebRenderCommandBuilder::ClipIdMap& aCache);
 
-  void DefineAndPushScrollLayers(nsDisplayItem* aItem,
-                                 const ActiveScrolledRoot* aAsr,
-                                 const DisplayItemClipChain* aChain,
-                                 wr::DisplayListBuilder& aBuilder,
-                                 int32_t aAppUnitsPerDevPixel,
-                                 const StackingContextHelper& aStackingContext,
-                                 WebRenderCommandBuilder::ClipIdMap& aCache);
-  void DefineAndPushChain(const DisplayItemClipChain* aChain,
-                          wr::DisplayListBuilder& aBuilder,
-                          const StackingContextHelper& aStackingContext,
-                          int32_t aAppUnitsPerDevPixel,
-                          WebRenderCommandBuilder::ClipIdMap& aCache);
-  bool DefineAndPushScrollLayer(const FrameMetrics& aMetrics,
-                                const StackingContextHelper& aStackingContext);
-
   wr::DisplayListBuilder* mBuilder;
   bool mPushedClipAndScroll;
   std::vector<wr::ScrollOrClipId> mPushedClips;