Bug 1515376 - remove aggregation support from nsProperties; r=mccr8
authorNathan Froyd <froydnj@mozilla.com>
Wed, 19 Dec 2018 13:16:43 -0500
changeset 451430 3106fe4aaaa37cbae83afed9e4682fe3bf7ae848
parent 451376 f9c4061c4ca3970c568f4c9ca81d6b8aa524bc4c
child 451431 d12d9b5335afa64868625901aafe368afe79f595
push id35238
push userrmaries@mozilla.com
push dateThu, 20 Dec 2018 05:04:43 +0000
treeherdermozilla-central@f42265a0fe6f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmccr8
bugs1515376
milestone66.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1515376 - remove aggregation support from nsProperties; r=mccr8 This support is currently unused.
xpcom/ds/nsProperties.cpp
xpcom/ds/nsProperties.h
--- a/xpcom/ds/nsProperties.cpp
+++ b/xpcom/ds/nsProperties.cpp
@@ -3,20 +3,17 @@
 /* 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 "nsProperties.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 
-NS_IMPL_AGGREGATED(nsProperties)
-NS_INTERFACE_MAP_BEGIN_AGGREGATED(nsProperties)
-  NS_INTERFACE_MAP_ENTRY(nsIProperties)
-NS_INTERFACE_MAP_END
+NS_IMPL_ISUPPORTS(nsProperties, nsIProperties)
 
 NS_IMETHODIMP
 nsProperties::Get(const char* prop, const nsIID& uuid, void** result) {
   if (NS_WARN_IF(!prop)) {
     return NS_ERROR_INVALID_ARG;
   }
 
   nsCOMPtr<nsISupports> value;
--- a/xpcom/ds/nsProperties.h
+++ b/xpcom/ds/nsProperties.h
@@ -5,24 +5,25 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef nsProperties_h___
 #define nsProperties_h___
 
 #include "nsIProperties.h"
 #include "nsInterfaceHashtable.h"
 #include "nsHashKeys.h"
-#include "nsAgg.h"
 #include "mozilla/Attributes.h"
 
 typedef nsInterfaceHashtable<nsCharPtrHashKey, nsISupports>
     nsProperties_HashBase;
 
 class nsProperties final : public nsIProperties, public nsProperties_HashBase {
  public:
-  NS_DECL_AGGREGATED
+  NS_DECL_ISUPPORTS
   NS_DECL_NSIPROPERTIES
 
-  nsProperties() { NS_INIT_AGGREGATED(nullptr); }
-  ~nsProperties() {}
+  nsProperties() = default;
+
+ private:
+  ~nsProperties() = default;
 };
 
 #endif /* nsProperties_h___ */