Backed out 3 changesets (bug 1477579) for build bustages on xpcshell\…

…selftest.py and crashtest failures on /components/nsComponentManager.cpp. CLOSED TREE Backed out changeset aa9a8f18e98f (bug 1477579) Backed out changeset 5fb0b7746a5d (bug 1477579) Backed out changeset 8359f8fe4184 (bug 1477579)
dothq · Jul 24, 2018 · 91a3707 · 91a3707
1 parent 616ee87
commit 91a3707
Show file tree

Hide file tree

Showing 21 changed files with 199 additions and 282 deletions.
diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp
@@ -6952,7 +6952,8 @@ nsContentUtils::FindInternalContentViewer(const nsACString& aType,
 
   nsCString contractID;
   nsresult rv = catMan->GetCategoryEntry("Gecko-Content-Viewers",
-                                         aType, contractID);
+                                         PromiseFlatCString(aType).get(),
+                                         getter_Copies(contractID));
   if (NS_SUCCEEDED(rv)) {
     docFactory = do_GetService(contractID.get());
     if (docFactory && aLoaderType) {

diff --git a/dom/base/nsDocument.cpp b/dom/base/nsDocument.cpp
@@ -1089,8 +1089,8 @@ nsExternalResourceMap::PendingLoad::SetupViewer(nsIRequest* aRequest,
     do_GetService(NS_CATEGORYMANAGER_CONTRACTID);
   NS_ENSURE_TRUE(catMan, NS_ERROR_NOT_AVAILABLE);
   nsCString contractId;
-  nsresult rv = catMan->GetCategoryEntry("Gecko-Content-Viewers", type,
-                                         contractId);
+  nsresult rv = catMan->GetCategoryEntry("Gecko-Content-Viewers", type.get(),
+                                         getter_Copies(contractId));
   NS_ENSURE_SUCCESS(rv, rv);
   nsCOMPtr<nsIDocumentLoaderFactory> docLoaderFactory =
     do_GetService(contractId.get());

diff --git a/dom/plugins/base/nsPluginHost.cpp b/dom/plugins/base/nsPluginHost.cpp
@@ -2771,15 +2771,16 @@ nsPluginHost::RegisterWithCategoryManager(const nsCString& aMimeType,
     return;
   }
 
-  NS_NAMED_LITERAL_CSTRING(contractId,
-                           "@mozilla.org/content/plugin/document-loader-factory;1");
+  const char *contractId =
+    "@mozilla.org/content/plugin/document-loader-factory;1";
 
   if (aType == ePluginRegister) {
     catMan->AddCategoryEntry("Gecko-Content-Viewers",
-                             aMimeType,
+                             aMimeType.get(),
                              contractId,
                              false, /* persist: broken by bug 193031 */
-                             mOverrideInternalTypes);
+                             mOverrideInternalTypes,
+                             nullptr);
   } else {
     if (aType == ePluginMaybeUnregister) {
       // Bail out if this type is still used by an enabled plugin
@@ -2793,10 +2794,12 @@ nsPluginHost::RegisterWithCategoryManager(const nsCString& aMimeType,
     // Only delete the entry if a plugin registered for it
     nsCString value;
     nsresult rv = catMan->GetCategoryEntry("Gecko-Content-Viewers",
-                                           aMimeType, value);
-    if (NS_SUCCEEDED(rv) && value == contractId) {
+                                           aMimeType.get(),
+                                           getter_Copies(value));
+    if (NS_SUCCEEDED(rv) && strcmp(value.get(), contractId) == 0) {
       catMan->DeleteCategoryEntry("Gecko-Content-Viewers",
-                                  aMimeType, true);
+                                  aMimeType.get(),
+                                  true);
     }
   }
 }

diff --git a/dom/push/PushNotifier.cpp b/dom/push/PushNotifier.cpp
@@ -320,7 +320,9 @@ PushDispatcher::DoNotifyObservers(nsISupports *aSubject, const char *aTopic,
     do_GetService(NS_CATEGORYMANAGER_CONTRACTID);
   if (catMan) {
     nsCString contractId;
-    nsresult rv = catMan->GetCategoryEntry("push", mScope, contractId);
+    nsresult rv = catMan->GetCategoryEntry("push",
+                                           mScope.BeginReading(),
+                                           getter_Copies(contractId));
     if (NS_SUCCEEDED(rv)) {
       // Ensure the service is created - we don't need to do anything with
       // it though - we assume the service constructor attaches a listener.

diff --git a/gfx/thebes/gfxSVGGlyphs.cpp b/gfx/thebes/gfxSVGGlyphs.cpp
@@ -137,7 +137,7 @@ gfxSVGGlyphsDocument::SetupPresentation()
 {
     nsCOMPtr<nsICategoryManager> catMan = do_GetService(NS_CATEGORYMANAGER_CONTRACTID);
     nsCString contractId;
-    nsresult rv = catMan->GetCategoryEntry("Gecko-Content-Viewers", "image/svg+xml", contractId);
+    nsresult rv = catMan->GetCategoryEntry("Gecko-Content-Viewers", "image/svg+xml", getter_Copies(contractId));
     NS_ENSURE_SUCCESS(rv, rv);
 
     nsCOMPtr<nsIDocumentLoaderFactory> docLoaderFactory =

diff --git a/image/SVGDocumentWrapper.cpp b/image/SVGDocumentWrapper.cpp
@@ -332,7 +332,7 @@ SVGDocumentWrapper::SetupViewer(nsIRequest* aRequest,
   NS_ENSURE_TRUE(catMan, NS_ERROR_NOT_AVAILABLE);
   nsCString contractId;
   nsresult rv = catMan->GetCategoryEntry("Gecko-Content-Viewers", IMAGE_SVG_XML,
-                                         contractId);
+                                         getter_Copies(contractId));
   NS_ENSURE_SUCCESS(rv, rv);
   nsCOMPtr<nsIDocumentLoaderFactory> docLoaderFactory =
     do_GetService(contractId.get());

diff --git a/layout/base/nsStyleSheetService.cpp b/layout/base/nsStyleSheetService.cpp
@@ -74,7 +74,7 @@ nsStyleSheetService::RegisterFromEnumerator(nsICategoryManager  *aManager,
     icStr->GetData(name);
 
     nsCString spec;
-    aManager->GetCategoryEntry(nsDependentCString(aCategory), name, spec);
+    aManager->GetCategoryEntry(aCategory, name.get(), getter_Copies(spec));
 
     nsCOMPtr<nsIURI> uri;
     NS_NewURI(getter_AddRefs(uri), spec);

diff --git a/toolkit/components/commandlines/nsCommandLine.cpp b/toolkit/components/commandlines/nsCommandLine.cpp
@@ -515,8 +515,9 @@ nsCommandLine::EnumerateHandlers(EnumerateHandlersCallback aCallback, void *aClo
     strenum->GetNext(entry);
 
     nsCString contractID;
-    rv = catman->GetCategoryEntry("command-line-handler", entry,
-				  contractID);
+    rv = catman->GetCategoryEntry("command-line-handler",
+				  entry.get(),
+				  getter_Copies(contractID));
     if (NS_FAILED(rv))
       continue;
 
@@ -561,7 +562,8 @@ nsCommandLine::EnumerateValidators(EnumerateValidatorsCallback aCallback, void *
 
     nsCString contractID;
     rv = catman->GetCategoryEntry("command-line-validator",
-				  entry, contractID);
+				  entry.get(),
+				  getter_Copies(contractID));
     if (contractID.IsVoid())
       continue;
 

diff --git a/toolkit/xre/nsAppStartupNotifier.cpp b/toolkit/xre/nsAppStartupNotifier.cpp
@@ -30,10 +30,8 @@ NS_IMETHODIMP nsAppStartupNotifier::Observe(nsISupports *aSubject, const char *a
                     do_GetService(NS_CATEGORYMANAGER_CONTRACTID, &rv);
     NS_ENSURE_SUCCESS(rv, rv);
 
-    nsDependentCString topic(aTopic);
-
     nsCOMPtr<nsISimpleEnumerator> enumerator;
-    rv = categoryManager->EnumerateCategory(topic,
+    rv = categoryManager->EnumerateCategory(aTopic,
                                getter_AddRefs(enumerator));
     if (NS_FAILED(rv)) return rv;
 
@@ -46,8 +44,9 @@ NS_IMETHODIMP nsAppStartupNotifier::Observe(nsISupports *aSubject, const char *a
             rv = category->GetData(categoryEntry);
 
             nsCString contractId;
-            categoryManager->GetCategoryEntry(topic, categoryEntry,
-                                              contractId);
+            categoryManager->GetCategoryEntry(aTopic,
+                                              categoryEntry.get(),
+                                              getter_Copies(contractId));
 
             if (NS_SUCCEEDED(rv)) {
 

diff --git a/uriloader/base/nsURILoader.cpp b/uriloader/base/nsURILoader.cpp
@@ -465,7 +465,8 @@ nsresult nsDocumentOpenInfo::DispatchContent(nsIRequest *request, nsISupports *
       if (catman) {
         nsCString contractidString;
         rv = catman->GetCategoryEntry(NS_CONTENT_LISTENER_CATEGORYMANAGER_ENTRY,
-                                      mContentType, contractidString);
+                                      mContentType.get(),
+                                      getter_Copies(contractidString));
         if (NS_SUCCEEDED(rv) && !contractidString.IsEmpty()) {
           LOG(("  Listener contractid for '%s' is '%s'",
                mContentType.get(), contractidString.get()));

diff --git a/uriloader/exthandler/nsExternalHelperAppService.cpp b/uriloader/exthandler/nsExternalHelperAppService.cpp
@@ -2693,7 +2693,8 @@ nsExternalHelperAppService::GetTypeFromExtension(const nsACString& aFileExt,
     // Read the MIME type from the category entry, if available
     nsCString type;
     nsresult rv = catMan->GetCategoryEntry("ext-to-type-mapping",
-                                           lowercaseFileExt, type);
+                                           lowercaseFileExt.get(),
+                                           getter_Copies(type));
     if (NS_SUCCEEDED(rv)) {
       aContentType = type;
       return NS_OK;

diff --git a/xpcom/components/nsCategoryCache.cpp b/xpcom/components/nsCategoryCache.cpp
@@ -13,7 +13,7 @@
 
 #include "nsCategoryCache.h"
 
-nsCategoryObserver::nsCategoryObserver(const nsACString& aCategory)
+nsCategoryObserver::nsCategoryObserver(const char* aCategory)
   : mCategory(aCategory)
   , mCallback(nullptr)
   , mClosure(nullptr)
@@ -43,7 +43,9 @@ nsCategoryObserver::nsCategoryObserver(const nsACString& aCategory)
     strings->GetNext(entryName);
 
     nsCString entryValue;
-    rv = catMan->GetCategoryEntry(aCategory, entryName, entryValue);
+    rv = catMan->GetCategoryEntry(aCategory,
+                                  entryName.get(),
+                                  getter_Copies(entryValue));
     if (NS_SUCCEEDED(rv)) {
       nsCOMPtr<nsISupports> service = do_GetService(entryValue.get());
       if (service) {
@@ -149,7 +151,9 @@ nsCategoryObserver::Observe(nsISupports* aSubject, const char* aTopic,
     }
 
     nsCString entryValue;
-    catMan->GetCategoryEntry(mCategory, str, entryValue);
+    catMan->GetCategoryEntry(mCategory.get(),
+                             str.get(),
+                             getter_Copies(entryValue));
 
     nsCOMPtr<nsISupports> service = do_GetService(entryValue.get());
 

diff --git a/xpcom/components/nsCategoryCache.h b/xpcom/components/nsCategoryCache.h
@@ -28,7 +28,7 @@ class nsCategoryObserver final : public nsIObserver
   ~nsCategoryObserver();
 
 public:
-  explicit nsCategoryObserver(const nsACString& aCategory);
+  explicit nsCategoryObserver(const char* aCategory);
 
   void ListenerDied();
   void SetListener(void(aCallback)(void*), void* aClosure);
@@ -104,7 +104,7 @@ class nsCategoryCache final
     // Lazy initialization, so that services in this category can't
     // cause reentrant getService (bug 386376)
     if (!mObserver) {
-      mObserver = new nsCategoryObserver(mCategoryName);
+      mObserver = new nsCategoryObserver(mCategoryName.get());
       mObserver->SetListener(nsCategoryCache<T>::OnCategoryChanged, this);
     }
   }