Backed out 3 changesets (bug 1491574) for build bustage at builds/worker/workspace/build/src/netwerk/base/nsNetUtil.cpp on a CLOSED TREE

Backed out changeset 5390b485f7e4 (bug 1491574)
Backed out changeset 3d11b69de826 (bug 1491574)
Backed out changeset e7e8f3f70f8b (bug 1491574)

accessible/generic/Accessible.cpp

@@ -65,7 +65,6 @@
 #include "nsIServiceManager.h"
 #include "nsWhitespaceTokenizer.h"
 #include "nsAttrName.h"
-#include "nsPersistentProperties.h"
 
 #include "mozilla/Assertions.h"
 #include "mozilla/BasicEvents.h"
@@ -1020,7 +1019,8 @@ Accessible::Attributes()
 already_AddRefed<nsIPersistentProperties>
 Accessible::NativeAttributes()
 {
-  RefPtr<nsPersistentProperties> attributes = new nsPersistentProperties();
+  nsCOMPtr<nsIPersistentProperties> attributes =
+    do_CreateInstance(NS_PERSISTENTPROPERTIES_CONTRACTID);
 
   nsAutoString unused;
 

accessible/generic/HyperTextAccessible.cpp

@@ -25,7 +25,7 @@
 #include "nsFrameSelection.h"
 #include "nsILineIterator.h"
 #include "nsIInterfaceRequestorUtils.h"
-#include "nsPersistentProperties.h"
+#include "nsIPersistentProperties2.h"
 #include "nsIScrollableFrame.h"
 #include "nsIServiceManager.h"
 #include "nsITextControlElement.h"
@@ -880,7 +880,8 @@ HyperTextAccessible::TextAttributes(bool aIncludeDefAttrs, int32_t aOffset,
     return nullptr;
   }
 
-  RefPtr<nsPersistentProperties> attributes = new nsPersistentProperties();
+  nsCOMPtr<nsIPersistentProperties> attributes =
+    do_CreateInstance(NS_PERSISTENTPROPERTIES_CONTRACTID);
 
   Accessible* accAtOffset = GetChildAtOffset(offset);
   if (!accAtOffset) {
@@ -924,7 +925,8 @@ HyperTextAccessible::TextAttributes(bool aIncludeDefAttrs, int32_t aOffset,
 already_AddRefed<nsIPersistentProperties>
 HyperTextAccessible::DefaultTextAttributes()
 {
-  RefPtr<nsPersistentProperties> attributes = new nsPersistentProperties();
+  nsCOMPtr<nsIPersistentProperties> attributes =
+    do_CreateInstance(NS_PERSISTENTPROPERTIES_CONTRACTID);
 
   TextAttrsMgr textAttrsMgr(this);
   textAttrsMgr.GetAttributes(attributes);

accessible/windows/msaa/ApplicationAccessibleWrap.cpp

@@ -11,7 +11,7 @@
 #include "IUnknownImpl.h"
 
 #include "nsIGfxInfo.h"
-#include "nsPersistentProperties.h"
+#include "nsIPersistentProperties2.h"
 #include "nsServiceManagerUtils.h"
 #include "mozilla/Services.h"
 
@@ -26,7 +26,8 @@ NS_IMPL_ISUPPORTS_INHERITED0(ApplicationAccessibleWrap,
 already_AddRefed<nsIPersistentProperties>
 ApplicationAccessibleWrap::NativeAttributes()
 {
-  RefPtr<nsPersistentProperties> attributes = new nsPersistentProperties();
+  nsCOMPtr<nsIPersistentProperties> attributes =
+    do_CreateInstance(NS_PERSISTENTPROPERTIES_CONTRACTID);
 
   nsCOMPtr<nsIGfxInfo> gfxInfo = services::GetGfxInfo();
   if (gfxInfo) {

accessible/xpcom/xpcAccessible.cpp

@@ -16,7 +16,7 @@
 #include "xpcAccessibleDocument.h"
 
 #include "nsIMutableArray.h"
-#include "nsPersistentProperties.h"
+#include "nsIPersistentProperties2.h"
 
 using namespace mozilla::a11y;
 
@@ -416,7 +416,8 @@ xpcAccessible::GetAttributes(nsIPersistentProperties** aAttributes)
   AutoTArray<Attribute, 10> attrs;
   proxy->Attributes(&attrs);
 
-  RefPtr<nsPersistentProperties> props = new nsPersistentProperties();
+  nsCOMPtr<nsIPersistentProperties> props =
+    do_CreateInstance(NS_PERSISTENTPROPERTIES_CONTRACTID);
   uint32_t attrCount = attrs.Length();
   nsAutoString unused;
   for (uint32_t i = 0; i < attrCount; i++) {

accessible/xul/XULTreeGridAccessible.cpp

@@ -18,7 +18,7 @@
 
 #include "nsIBoxObject.h"
 #include "nsIMutableArray.h"
-#include "nsPersistentProperties.h"
+#include "nsIPersistentProperties2.h"
 #include "nsITreeSelection.h"
 #include "nsComponentManagerUtils.h"
 #include "mozilla/dom/Element.h"
@@ -646,7 +646,8 @@ XULTreeGridCellAccessible::Selected()
 already_AddRefed<nsIPersistentProperties>
 XULTreeGridCellAccessible::NativeAttributes()
 {
-  RefPtr<nsPersistentProperties> attributes = new nsPersistentProperties();
+  nsCOMPtr<nsIPersistentProperties> attributes =
+    do_CreateInstance(NS_PERSISTENTPROPERTIES_CONTRACTID);
 
   // "table-cell-index" attribute
   TableAccessible* table = Table();

image/RasterImage.cpp

@@ -50,7 +50,6 @@
 #include "GeckoProfiler.h"
 #include "gfx2DGlue.h"
 #include "gfxPrefs.h"
-#include "nsProperties.h"
 #include <algorithm>
 
 namespace mozilla {
@@ -1057,7 +1056,10 @@ NS_IMETHODIMP
 RasterImage::Set(const char* prop, nsISupports* value)
 {
   if (!mProperties) {
-    mProperties = new nsProperties();
+    mProperties = do_CreateInstance("@mozilla.org/properties;1");
+  }
+  if (!mProperties) {
+    return NS_ERROR_OUT_OF_MEMORY;
   }
   return mProperties->Set(prop, value);
 }

image/imgRequest.cpp

@@ -37,7 +37,6 @@
 #include "nsNetUtil.h"
 #include "nsIProtocolHandler.h"
 #include "imgIRequest.h"
-#include "nsProperties.h"
 
 #include "mozilla/IntegerPrintfMacros.h"
 #include "mozilla/Telemetry.h"
@@ -109,7 +108,7 @@ imgRequest::Init(nsIURI *aURI,
   MOZ_ASSERT(aRequest, "No request");
   MOZ_ASSERT(aChannel, "No channel");
 
-  mProperties = new nsProperties();
+  mProperties = do_CreateInstance("@mozilla.org/properties;1");
   mURI = aURI;
   mFinalURI = aFinalURI;
   mRequest = aRequest;

js/xpconnect/idl/xpccomponents.idl

@@ -17,7 +17,6 @@ interface nsICycleCollectorListener;
 interface nsIEditorSpellCheck;
 interface nsIFile;
 interface nsILoadContext;
-interface nsIPersistentProperties;
 interface nsIURI;
 interface nsIJSCID;
 interface nsIJSIID;
@@ -732,9 +731,6 @@ interface nsIXPCComponents_Utils : nsISupports
 
     /* Create a private loadcontext object. */
     nsILoadContext createPrivateLoadContext();
-
-    /* Create a persistent property object. */
-    nsIPersistentProperties createPersistentProperties();
 };
 
 /**

js/xpconnect/src/XPCComponents.cpp

@@ -44,7 +44,7 @@
 #include "GeckoProfiler.h"
 #include "mozilla/EditorSpellCheck.h"
 #include "nsCommandLine.h"
-#include "nsPersistentProperties.h"
+#include "nsCommandParams.h"
 
 using namespace mozilla;
 using namespace JS;
@@ -3251,15 +3251,6 @@ nsXPCComponents_Utils::CreatePrivateLoadContext(nsILoadContext** aLoadContext)
     return NS_OK;
 }
 
-NS_IMETHODIMP
-nsXPCComponents_Utils::CreatePersistentProperties(nsIPersistentProperties** aPersistentProperties)
-{
-    NS_ENSURE_ARG_POINTER(aPersistentProperties);
-    nsCOMPtr<nsIPersistentProperties> props = new nsPersistentProperties();
-    props.forget(aPersistentProperties);
-    return NS_OK;
-}
-
 /***************************************************************************/
 /***************************************************************************/
 /***************************************************************************/

netwerk/base/nsNetUtil.cpp

@@ -44,7 +44,7 @@
 #include "nsINode.h"
 #include "nsIObjectLoadingContent.h"
 #include "nsIOfflineCacheUpdate.h"
-#include "nsPersistentProperties.h"
+#include "nsIPersistentProperties2.h"
 #include "nsIPrivateBrowsingChannel.h"
 #include "nsIPropertyBag2.h"
 #include "nsIProtocolProxyService.h"
@@ -2029,7 +2029,9 @@ NS_LoadPersistentPropertiesFromURISpec(nsIPersistentProperties **outResult,
     rv = channel->Open2(getter_AddRefs(in));
     NS_ENSURE_SUCCESS(rv, rv);
 
-    RefPtr<nsPersistentProperties> properties = new nsPersistentProperties();
+    nsCOMPtr<nsIPersistentProperties> properties =
+      do_CreateInstance(NS_PERSISTENTPROPERTIES_CONTRACTID, &rv);
+    NS_ENSURE_SUCCESS(rv, rv);
     rv = properties->Load(in);
     NS_ENSURE_SUCCESS(rv, rv);
 

xpcom/build/XPCOMInit.cpp

@@ -28,6 +28,8 @@
 #include "nsCycleCollector.h"
 #include "nsObserverList.h"
 #include "nsObserverService.h"
+#include "nsProperties.h"
+#include "nsPersistentProperties.h"
 #include "nsScriptableInputStream.h"
 #include "nsBinaryStream.h"
 #include "nsStorageStream.h"
@@ -209,6 +211,8 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsVariantCC)
 
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsHashPropertyBagCC)
 
+NS_GENERIC_AGGREGATED_CONSTRUCTOR(nsProperties)
+
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsUUIDGenerator, Init)
 
 #ifdef MOZ_WIDGET_COCOA
@@ -255,6 +259,8 @@ NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(nsChromeRegistry,
                                          nsChromeRegistry::GetSingleton)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsChromeProtocolHandler)
 
+#define NS_PERSISTENTPROPERTIES_CID NS_IPERSISTENTPROPERTIES_CID /* sigh */
+
 static already_AddRefed<nsIFactory>
 CreateINIParserFactory(const mozilla::Module& aModule,
                        const mozilla::Module::CIDEntry& aEntry)

xpcom/build/XPCOMModule.inc

@@ -12,6 +12,10 @@
     COMPONENT(SCRIPTABLEBASE64ENCODER, nsScriptableBase64EncoderConstructor)
     COMPONENT(PIPE, nsPipeConstructor)
 
+    COMPONENT(PROPERTIES, nsPropertiesConstructor)
+
+    COMPONENT(PERSISTENTPROPERTIES, nsPersistentProperties::Create)
+
     COMPONENT(ARRAY, nsArrayBase::XPCOMConstructor)
     COMPONENT(CONSOLESERVICE, nsConsoleServiceConstructor)
     COMPONENT_M(OBSERVERSERVICE, nsObserverService::Create, Module::ALLOW_IN_GPU_PROCESS)

xpcom/ds/moz.build

@@ -61,9 +61,7 @@ EXPORTS += [
     'nsInterfaceHashtable.h',
     'nsJSThingHashtable.h',
     'nsMathUtils.h',
-    'nsPersistentProperties.h',
     'nsPointerHashKeys.h',
-    'nsProperties.h',
     'nsQuickSort.h',
     'nsRefPtrHashtable.h',
     'nsSimpleEnumerator.h',

xpcom/ds/nsIPersistentProperties2.idl

@@ -58,3 +58,13 @@ interface nsIPersistentProperties : nsIProperties
 %}
 };
 
+
+%{C++
+
+#define NS_IPERSISTENTPROPERTIES_CID \
+{ 0x2245e573, 0x9464, 0x11d2, \
+  { 0x9b, 0x8b, 0x0, 0x80, 0x5f, 0x8a, 0x16, 0xd9 } }
+
+#define NS_PERSISTENTPROPERTIES_CONTRACTID "@mozilla.org/persistent-properties;1"
+
+%}

xpcom/ds/nsPersistentProperties.cpp

@@ -459,6 +459,17 @@ nsPersistentProperties::SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf)
   return aMallocSizeOf(this) + n;
 }
 
+nsresult
+nsPersistentProperties::Create(nsISupports* aOuter, REFNSIID aIID,
+                               void** aResult)
+{
+  if (aOuter) {
+    return NS_ERROR_NO_AGGREGATION;
+  }
+  RefPtr<nsPersistentProperties> props = new nsPersistentProperties();
+  return props->QueryInterface(aIID, aResult);
+}
+
 NS_IMPL_ISUPPORTS(nsPersistentProperties, nsIPersistentProperties, nsIProperties)
 
 NS_IMETHODIMP

xpcom/ds/nsPersistentProperties.h

@@ -25,6 +25,9 @@ public:
   NS_DECL_NSIPROPERTIES
   NS_DECL_NSIPERSISTENTPROPERTIES
 
+  static MOZ_MUST_USE nsresult
+  Create(nsISupports* aOuter, REFNSIID aIID, void** aResult);
+
   size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const override;
 
 private:

xpcom/ds/nsProperties.h

@@ -13,6 +13,14 @@
 #include "nsAgg.h"
 #include "mozilla/Attributes.h"
 
+#define NS_PROPERTIES_CID                            \
+{ /* 4de2bc90-b1bf-11d3-93b6-00104ba0fd40 */         \
+    0x4de2bc90,                                      \
+    0xb1bf,                                          \
+    0x11d3,                                          \
+    {0x93, 0xb6, 0x00, 0x10, 0x4b, 0xa0, 0xfd, 0x40} \
+}
+
 typedef nsInterfaceHashtable<nsCharPtrHashKey,
                              nsISupports> nsProperties_HashBase;
 
@@ -24,7 +32,7 @@ public:
   NS_DECL_AGGREGATED
   NS_DECL_NSIPROPERTIES
 
-  nsProperties() { NS_INIT_AGGREGATED(nullptr); }
+  explicit nsProperties(nsISupports *aOuter) { NS_INIT_AGGREGATED(aOuter); }
   ~nsProperties() {}
 };
 

xpcom/tests/unit/test_bug121341.js

@@ -9,7 +9,8 @@ function run_test() {
   });
   var inp = channel.open2();
 
-  var properties = Cu.createPersistentProperties();
+  var properties = Cc["@mozilla.org/persistent-properties;1"].
+                   createInstance(Ci.nsIPersistentProperties);
   properties.load(inp);
 
   var value;
@@ -55,7 +56,8 @@ function run_test() {
   });
   inp = channel2.open2();
 
-  var properties2 = Cu.createPersistentProperties();
+  var properties2 = Cc["@mozilla.org/persistent-properties;1"].
+                    createInstance(Ci.nsIPersistentProperties);
   try {
     properties2.load(inp);
     do_throw("load() didn't fail");