Backed out changeset 2be475352375 (bug 1689191) for causing build bus…

…tages on RemoteLazyInputStreamThread.cpp. CLOSED TREE
dothq · Jun 24, 2021 · dc35ffd · dc35ffd
1 parent 7a2e51e
commit dc35ffd
Show file tree

Hide file tree

Showing 23 changed files with 566 additions and 90 deletions.
diff --git a/dom/ipc/ContentChild.cpp b/dom/ipc/ContentChild.cpp
@@ -1389,6 +1389,8 @@ void ContentChild::InitXPCOM(
 
   GfxInfoBase::SetFeatureStatus(std::move(aXPCOMInit.gfxFeatureStatus()));
 
+  DataStorage::SetCachedStorageEntries(aXPCOMInit.dataStorage());
+
   // Initialize the RemoteDecoderManager thread and its associated PBackground
   // channel.
   RemoteDecoderManagerChild::Init();
@@ -2261,6 +2263,34 @@ mozilla::ipc::IPCResult ContentChild::RecvCollectPerfStatsJSON(
   return IPC_OK();
 }
 
+mozilla::ipc::IPCResult ContentChild::RecvDataStoragePut(
+    const nsString& aFilename, const DataStorageItem& aItem) {
+  RefPtr<DataStorage> storage = DataStorage::GetFromRawFileName(aFilename);
+  if (storage) {
+    storage->Put(aItem.key(), aItem.value(), aItem.type());
+  }
+  return IPC_OK();
+}
+
+mozilla::ipc::IPCResult ContentChild::RecvDataStorageRemove(
+    const nsString& aFilename, const nsCString& aKey,
+    const DataStorageType& aType) {
+  RefPtr<DataStorage> storage = DataStorage::GetFromRawFileName(aFilename);
+  if (storage) {
+    storage->Remove(aKey, aType);
+  }
+  return IPC_OK();
+}
+
+mozilla::ipc::IPCResult ContentChild::RecvDataStorageClear(
+    const nsString& aFilename) {
+  RefPtr<DataStorage> storage = DataStorage::GetFromRawFileName(aFilename);
+  if (storage) {
+    storage->Clear();
+  }
+  return IPC_OK();
+}
+
 mozilla::ipc::IPCResult ContentChild::RecvNotifyAlertsObserver(
     const nsCString& aType, const nsString& aData) {
   nsTArray<nsCOMPtr<nsIObserver>> observersToNotify;

diff --git a/dom/ipc/ContentChild.h b/dom/ipc/ContentChild.h
@@ -320,6 +320,15 @@ class ContentChild final : public PContentChild,
   mozilla::ipc::IPCResult RecvCollectPerfStatsJSON(
       CollectPerfStatsJSONResolver&& aResolver);
 
+  mozilla::ipc::IPCResult RecvDataStoragePut(const nsString& aFilename,
+                                             const DataStorageItem& aItem);
+
+  mozilla::ipc::IPCResult RecvDataStorageRemove(const nsString& aFilename,
+                                                const nsCString& aKey,
+                                                const DataStorageType& aType);
+
+  mozilla::ipc::IPCResult RecvDataStorageClear(const nsString& aFilename);
+
   mozilla::ipc::IPCResult RecvNotifyAlertsObserver(const nsCString& aType,
                                                    const nsString& aData);
 

diff --git a/dom/ipc/ContentParent.cpp b/dom/ipc/ContentParent.cpp
@@ -54,6 +54,7 @@
 #include "mozilla/BenchmarkStorageParent.h"
 #include "mozilla/ContentBlockingUserInteraction.h"
 #include "mozilla/ClearOnShutdown.h"
+#include "mozilla/DataStorage.h"
 #include "mozilla/FOGIPC.h"
 #include "mozilla/GlobalStyleSheetCache.h"
 #include "mozilla/HangDetails.h"
@@ -2931,6 +2932,8 @@ bool ContentParent::InitInternal(ProcessPriority aInitialPriority) {
       widget::WinContentSystemParameters::GetSingleton()->GetParentValues();
 #endif
 
+  DataStorage::GetAllChildProcessData(xpcomInit.dataStorage());
+
   // Send the dynamic scalar definitions to the new process.
   TelemetryIPC::GetDynamicScalarDefinitions(xpcomInit.dynamicScalarDefs());
 

diff --git a/dom/ipc/PContent.ipdl b/dom/ipc/PContent.ipdl
@@ -67,6 +67,7 @@ include LookAndFeelTypes;
 include protocol PSandboxTesting;
 #endif
 
+include "ipc/DataStorageIPCUtils.h";
 include "ipc/MediaControlIPC.h";
 include "mozilla/AntiTrackingIPCUtils.h";
 include "mozilla/GfxMessageUtils.h";
@@ -339,6 +340,7 @@ struct XPCOMInitData
     GfxVarUpdate[] gfxNonDefaultVarUpdates;
     ContentDeviceData contentDeviceData;
     GfxInfoFeatureStatus[] gfxFeatureStatus;
+    DataStorageEntry[] dataStorage;
     nsCString[] appLocales;
     nsCString[] requestedLocales;
     DynamicScalarDefinition[] dynamicScalarDefs;
@@ -613,6 +615,10 @@ child:
     async UpdatePerfStatsCollectionMask(uint64_t aMask);
     async CollectPerfStatsJSON() returns (nsCString aStats);
 
+    async DataStoragePut(nsString aFilename, DataStorageItem aItem);
+    async DataStorageRemove(nsString aFilename, nsCString aKey, DataStorageType aType);
+    async DataStorageClear(nsString aFilename);
+
     async NotifyAlertsObserver(nsCString topic, nsString data);
 
     async GeolocationUpdate(nsIDOMGeoPosition aPosition);

diff --git a/netwerk/base/nsNetUtil.cpp b/netwerk/base/nsNetUtil.cpp
@@ -10,11 +10,11 @@
 #include "nsNetUtil.h"
 
 #include "mozilla/Atomics.h"
-#include "mozilla/BasePrincipal.h"
 #include "mozilla/Components.h"
 #include "mozilla/Encoding.h"
 #include "mozilla/LoadContext.h"
 #include "mozilla/LoadInfo.h"
+#include "mozilla/BasePrincipal.h"
 #include "mozilla/Monitor.h"
 #include "mozilla/StaticPrefs_network.h"
 #include "mozilla/StaticPrefs_privacy.h"
@@ -2833,11 +2833,6 @@ nsresult NS_ShouldSecureUpgrade(
     const OriginAttributes& aOriginAttributes, bool& aShouldUpgrade,
     std::function<void(bool, nsresult)>&& aResultCallback,
     bool& aWillCallback) {
-  MOZ_ASSERT(XRE_IsParentProcess());
-  if (!XRE_IsParentProcess()) {
-    return NS_ERROR_NOT_AVAILABLE;
-  }
-
   aWillCallback = false;
 
   // Even if we're in private browsing mode, we still enforce existing STS

diff --git a/netwerk/protocol/http/AlternateServices.cpp b/netwerk/protocol/http/AlternateServices.cpp
@@ -878,7 +878,7 @@ void AltSvcCache::EnsureStorageInited() {
       return;
     }
 
-    if (NS_FAILED(mStorage->Init())) {
+    if (NS_FAILED(mStorage->Init(nullptr))) {
       mStorage = nullptr;
     } else {
       initialized = true;
@@ -1251,11 +1251,11 @@ void AltSvcCache::ClearAltServiceMappings() {
 nsresult AltSvcCache::GetAltSvcCacheKeys(nsTArray<nsCString>& value) {
   MOZ_ASSERT(NS_IsMainThread());
   if (gHttpHandler->AllowAltSvc() && mStorage) {
-    nsTArray<DataStorageItem> items;
+    nsTArray<mozilla::psm::DataStorageItem> items;
     mStorage->GetAll(&items);
 
     for (const auto& item : items) {
-      value.AppendElement(item.key);
+      value.AppendElement(item.key());
     }
   }
   return NS_OK;