Bug 1425340 - Remove unused DisplayItemScrollClip files. r=mattwoodrow
authorMarkus Stange <mstange@themasta.com>
Thu, 14 Dec 2017 15:59:35 -0600
changeset 749083 2afca7ece7b741ef5a1ef51c355d3ef44b943469
parent 749082 17a0e7ddfb483356fb7caaee66fb2170b7d45dfe
child 749084 53fa60c5e8b41f30e410f8cb5e7611fb08c8fc6f
push id97316
push userbmo:continuation@gmail.com
push dateTue, 30 Jan 2018 22:53:01 +0000
reviewersmattwoodrow
bugs1425340
milestone60.0a1
Bug 1425340 - Remove unused DisplayItemScrollClip files. r=mattwoodrow MozReview-Commit-ID: 2GLI4KVoBiI
layout/painting/DisplayItemScrollClip.cpp
layout/painting/DisplayItemScrollClip.h
layout/painting/moz.build
deleted file mode 100644
--- a/layout/painting/DisplayItemScrollClip.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "DisplayItemScrollClip.h"
-
-#include "DisplayItemClip.h"
-
-namespace mozilla {
-
-/* static */ bool
-DisplayItemScrollClip::IsAncestor(const DisplayItemScrollClip* aAncestor,
-                                  const DisplayItemScrollClip* aDescendant)
-{
-  if (!aAncestor) {
-    // null means root.
-    return true;
-  }
-
-  for (const DisplayItemScrollClip* sc = aDescendant; sc; sc = sc->mParent) {
-    if (sc == aAncestor) {
-      return true;
-    }
-  }
-
-  return false;
-}
-
-bool
-DisplayItemScrollClip::HasRoundedCorners() const
-{
-  for (const DisplayItemScrollClip* scrollClip = this;
-       scrollClip; scrollClip = scrollClip->mParent) {
-    if (scrollClip->mClip->GetRoundedRectCount() > 0) {
-      return true;
-    }
-  }
-  return false;
-}
-
-/* static */ nsCString
-DisplayItemScrollClip::ToString(const DisplayItemScrollClip* aScrollClip)
-{
-  nsAutoCString str;
-  for (const DisplayItemScrollClip* scrollClip = aScrollClip;
-       scrollClip; scrollClip = scrollClip->mParent) {
-    str.AppendPrintf("<%s>%s", scrollClip->mClip ? scrollClip->mClip->ToString().get() : "null",
-                     scrollClip->mIsAsyncScrollable ? " [async-scrollable]" : "");
-    if (scrollClip->mParent) {
-      str.AppendLiteral(", ");
-    }
-  }
-  return str;
-}
-
-} // namespace mozilla
deleted file mode 100644
--- a/layout/painting/DisplayItemScrollClip.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef DISPLAYITEMSCROLLCLIP_H_
-#define DISPLAYITEMSCROLLCLIP_H_
-
-#include "mozilla/Assertions.h"
-#include "nsString.h"
-
-class nsIScrollableFrame;
-
-namespace mozilla {
-
-class DisplayItemClip;
-
-/**
- * A DisplayItemScrollClip represents a DisplayItemClip from a scrollable
- * frame. This clip is stored on a display item separately from the item's
- * regular DisplayItemClip for async scrolling purposes: The item's regular
- * clip can be fused to the item's contents when drawing layer contents, but
- * scroll clips need to be kept separate so that they can be applied at
- * composition time, after any async scroll offsets have been applied.
- * Scroll clips are created during display list construction when
- * async-scrollable scroll frames are entered. At that point, the current
- * regular clip is cleared on the display list clip state. They are also
- * created for scroll frames that are inactivate and not async scrollable;
- * in that case, mIsAsyncScrollable on the scroll clip will be false.
- * When async-scrollable scroll frames are nested, the inner display items
- * can walk the whole chain of scroll clips via the DisplayItemScrollClip's
- * mParent pointer.
- * Storing scroll clips on display items allows easy access of all scroll
- * frames that affect a certain display item, and it allows some display list
- * operations to compute more accurate clips, for example when computing the
- * bounds of a container item for a frame that contains an async-scrollable
- * scroll frame.
- */
-class DisplayItemScrollClip {
-public:
-  DisplayItemScrollClip(const DisplayItemScrollClip* aParent,
-                        nsIScrollableFrame* aScrollableFrame,
-                        const DisplayItemClip* aClip,
-                        bool aIsAsyncScrollable)
-    : mParent(aParent)
-    , mScrollableFrame(aScrollableFrame)
-    , mClip(aClip)
-    , mIsAsyncScrollable(aIsAsyncScrollable)
-    , mDepth(aParent ? aParent->mDepth + 1 : 1)
-  {
-    MOZ_ASSERT(mScrollableFrame);
-  }
-
-  /**
-   * "Pick descendant" is analogous to the intersection operation on regular
-   * clips: In some cases, there are multiple candidate clips that can apply to
-   * an item, one of them being the ancestor of the other. This method picks
-   * the descendant.
-   * Both aClip1 and aClip2 are allowed to be null.
-   */
-  static const DisplayItemScrollClip*
-  PickDescendant(const DisplayItemScrollClip* aClip1,
-                const DisplayItemScrollClip* aClip2)
-  {
-    MOZ_ASSERT(IsAncestor(aClip1, aClip2) || IsAncestor(aClip2, aClip1),
-               "one of the scroll clips must be an ancestor of the other");
-    return Depth(aClip1) > Depth(aClip2) ? aClip1 : aClip2;
-  }
-
-  static const DisplayItemScrollClip*
-  PickAncestor(const DisplayItemScrollClip* aClip1,
-                const DisplayItemScrollClip* aClip2)
-  {
-    MOZ_ASSERT(IsAncestor(aClip1, aClip2) || IsAncestor(aClip2, aClip1),
-               "one of the scroll clips must be an ancestor of the other");
-    return Depth(aClip1) < Depth(aClip2) ? aClip1 : aClip2;
-  }
-
-
-  /**
-   * Returns whether aAncestor is an ancestor scroll clip of aDescendant.
-   * A scroll clip that's null is considered the root scroll clip.
-   */
-  static bool IsAncestor(const DisplayItemScrollClip* aAncestor,
-                         const DisplayItemScrollClip* aDescendant);
-
-  /**
-   * Return a string which contains the list of stringified clips for this
-   * scroll clip and its ancestors. aScrollClip can be null.
-   */
-  static nsCString ToString(const DisplayItemScrollClip* aScrollClip);
-
-  bool HasRoundedCorners() const;
-
-  /**
-   * The previous (outer) scroll clip, or null.
-   */
-  const DisplayItemScrollClip* mParent;
-
-  /**
-   * The scrollable frame that this scroll clip is for. Always non-null.
-   */
-  nsIScrollableFrame* mScrollableFrame;
-
-  /**
-   * The clip represented by this scroll clip, relative to mScrollableFrame's
-   * reference frame. Can be null.
-   */
-  const DisplayItemClip* mClip;
-
-  /**
-   * Whether this scroll clip is for an async-scrollable scroll frame.
-   * Can change during display list construction.
-   */
-  bool mIsAsyncScrollable;
-
-private:
-  static uint32_t Depth(const DisplayItemScrollClip* aSC)
-  { return aSC ? aSC->mDepth : 0; }
-
-  const uint32_t mDepth;
-};
-
-} // namespace mozilla
-
-#endif /* DISPLAYITEMSCROLLCLIP_H_ */
--- a/layout/painting/moz.build
+++ b/layout/painting/moz.build
@@ -6,17 +6,16 @@
 
 with Files('**'):
     BUG_COMPONENT = ('Core', 'Layout: View Rendering')
 
 EXPORTS += [
     'ActiveLayerTracker.h',
     'DisplayItemClip.h',
     'DisplayItemClipChain.h',
-    'DisplayItemScrollClip.h',
     'DisplayListClipState.h',
     'FrameLayerBuilder.h',
     'LayerState.h',
     'nsCSSRenderingBorders.h',
     'nsCSSRenderingGradients.h',
     'nsDisplayItemTypes.h',
     'nsDisplayItemTypesList.h',
     'nsDisplayList.h',
@@ -29,17 +28,16 @@ EXPORTS.mozilla += [
     'PaintTracker.h',
 ]
 
 UNIFIED_SOURCES += [
     'ActiveLayerTracker.cpp',
     'DashedCornerFinder.cpp',
     'DisplayItemClip.cpp',
     'DisplayItemClipChain.cpp',
-    'DisplayItemScrollClip.cpp',
     'DisplayListChecker.cpp',
     'DisplayListClipState.cpp',
     'DottedCornerFinder.cpp',
     'FrameLayerBuilder.cpp',
     'MaskLayerImageCache.cpp',
     'nsCSSRendering.cpp',
     'nsCSSRenderingBorders.cpp',
     'nsCSSRenderingGradients.cpp',