Bug 1419652 - Remove HandleRefPtr. r=TYLin
authorCameron McCormack <cam@mcc.id.au>
Wed, 22 Nov 2017 13:11:12 +0800
changeset 701868 de1df00a5bba7c3d1d5e325d88e40cbd12bcb734
parent 701867 00a08154f505461f6424fd6f5254bffd997b3db4
child 701869 1a65a4910d55709c1aae372279084d38aea638b1
push id90298
push userbmo:bpostelnicu@mozilla.com
push dateWed, 22 Nov 2017 10:54:01 +0000
reviewersTYLin
bugs1419652
milestone59.0a1
Bug 1419652 - Remove HandleRefPtr. r=TYLin This class was used back when we didn't have a base class for CSSStyleSheet and ServoStyleSheet. Now it's unused. MozReview-Commit-ID: 8xaMAA3Opf7
layout/style/HandleRefPtr.h
layout/style/moz.build
deleted file mode 100644
--- a/layout/style/HandleRefPtr.h
+++ /dev/null
@@ -1,133 +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/.
- */
-
-/* smart pointer for strong references to objects through pointer-like
- * "handle" objects */
-
-#include <algorithm>
-#include "mozilla/Assertions.h"
-
-#ifndef mozilla_HandleRefPtr_h
-#define mozilla_HandleRefPtr_h
-
-namespace mozilla {
-
-/**
- * A class for holding strong references to handle-managed objects.
- *
- * This is intended for use with objects like StyleSheetHandle,
- * where the handle type is not a pointer but which can still have
- * ->AddRef() and ->Release() called on it.
- */
-template<typename T>
-class HandleRefPtr
-{
-public:
-  HandleRefPtr() {}
-
-  HandleRefPtr(HandleRefPtr<T>& aRhs)
-  {
-    assign(aRhs.mHandle);
-  }
-
-  HandleRefPtr(HandleRefPtr<T>&& aRhs)
-  {
-    std::swap(mHandle, aRhs.mHandle);
-  }
-
-  MOZ_IMPLICIT HandleRefPtr(T aRhs)
-  {
-    assign(aRhs);
-  }
-
-  HandleRefPtr<T>& operator=(HandleRefPtr<T>& aRhs)
-  {
-    assign(aRhs.mHandle);
-    return *this;
-  }
-
-  HandleRefPtr<T>& operator=(T aRhs)
-  {
-    assign(aRhs);
-    return *this;
-  }
-
-  ~HandleRefPtr() { assign(nullptr); }
-
-  explicit operator bool() const { return !!mHandle; }
-  bool operator!() const { return !mHandle; }
-
-  operator T() const { return mHandle; }
-  T operator->() const { return mHandle; }
-
-  void swap(HandleRefPtr<T>& aOther)
-  {
-    std::swap(mHandle, aOther.mHandle);
-  }
-
-private:
-  void assign(T aPtr)
-  {
-    // AddRef early so |aPtr| can't disappear underneath us.
-    if (aPtr) {
-      aPtr->AddRef();
-    }
-
-    // Don't release |mHandle| yet: if |mHandle| indirectly owns |this|,
-    // releasing would invalidate |this|.  Swap |aPtr| for |mHandle| so that
-    // |aPtr| lives as long as |this|, then release the new |aPtr| (really the
-    // original |mHandle|) so that if |this| is invalidated, we're not using it
-    // any more.
-    std::swap(mHandle, aPtr);
-
-    if (aPtr) {
-      aPtr->Release();
-    }
-  }
-
-  T mHandle;
-};
-
-template<typename T>
-inline bool operator==(const HandleRefPtr<T>& aLHS, const HandleRefPtr<T>& aRHS)
-{
-  return static_cast<T>(aLHS) == static_cast<T>(aRHS);
-}
-
-template<typename T>
-inline bool operator==(const HandleRefPtr<T>& aLHS, T aRHS)
-{
-  return static_cast<T>(aLHS) == aRHS;
-}
-
-template<typename T>
-inline bool operator==(T aLHS, const HandleRefPtr<T>& aRHS)
-{
-  return aLHS == static_cast<T>(aRHS);
-}
-
-template<typename T>
-inline bool operator!=(const HandleRefPtr<T>& aLHS, const HandleRefPtr<T>& aRHS)
-{
-  return !(aLHS == aRHS);
-}
-
-template<typename T>
-inline bool operator!=(const HandleRefPtr<T>& aLHS, T aRHS)
-{
-  return !(aLHS == aRHS);
-}
-
-template<typename T>
-inline bool operator!=(T aLHS, const HandleRefPtr<T>& aRHS)
-{
-  return !(aLHS == aRHS);
-}
-
-} // namespace mozilla
-
-#endif // mozilla_HandleRefPtr_h
--- a/layout/style/moz.build
+++ b/layout/style/moz.build
@@ -87,17 +87,16 @@ EXPORTS.mozilla += [
     'CSSVariableResolver.h',
     'CSSVariableValues.h',
     'DeclarationBlock.h',
     'DeclarationBlockInlines.h',
     'DocumentStyleRootIterator.h',
     'GeckoStyleContext.h',
     'GenericSpecifiedValues.h',
     'GenericSpecifiedValuesInlines.h',
-    'HandleRefPtr.h',
     'IncrementalClearCOMRuleArray.h',
     'LayerAnimationInfo.h',
     'PostTraversalTask.h',
     'PreloadedStyleSheet.h',
     'RuleNodeCacheConditions.h',
     'RuleProcessorCache.h',
     'ServoArcTypeList.h',
     'ServoBindingList.h',