Bug 1285947 - Rename BrowserConfiguration to ServiceWorkerConfiguration, r=gabor, a=gchang
authorAndrea Marchesini <amarchesini@mozilla.com>
Mon, 11 Jul 2016 16:04:04 +0200
changeset 340013 6392bfa3a579158561cf39c250e42c33f594b5ad
parent 340012 9787933865ee7e1e6031435d4d21d569372ae959
child 340014 9af7cca3f8b600a85ae8afdd0ead3e6e73345642
push id6249
push userjlund@mozilla.com
push dateMon, 01 Aug 2016 13:59:36 +0000
treeherdermozilla-beta@bad9d4f5bf7e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgabor, gchang
bugs1285947
milestone49.0a2
Bug 1285947 - Rename BrowserConfiguration to ServiceWorkerConfiguration, r=gabor, a=gchang
dom/ipc/BrowserConfiguration.ipdlh
dom/ipc/ContentChild.cpp
dom/ipc/ContentParent.cpp
dom/ipc/ContentParent.h
dom/ipc/PContent.ipdl
dom/ipc/ServiceWorkerConfiguration.ipdlh
dom/ipc/moz.build
--- a/dom/ipc/ContentChild.cpp
+++ b/dom/ipc/ContentChild.cpp
@@ -1087,18 +1087,18 @@ ContentChild::InitXPCOM()
   }
 
   // This object is held alive by the observer service.
   RefPtr<SystemMessageHandledObserver> sysMsgObserver =
     new SystemMessageHandledObserver();
   sysMsgObserver->Init();
 
   // Loading the ServiceWorker configuration.
-  BrowserConfiguration configuration;
-  SendGetBrowserConfiguration(&configuration);
+  ServiceWorkerConfiguration configuration;
+  SendGetServiceWorkerConfiguration(&configuration);
 
   RefPtr<ServiceWorkerManager> swm = ServiceWorkerManager::GetInstance();
   MOZ_ASSERT(swm);
   swm->LoadRegistrations(configuration.serviceWorkerRegistrations());
 
   InitOnContentProcessCreated();
 }
 
--- a/dom/ipc/ContentParent.cpp
+++ b/dom/ipc/ContentParent.cpp
@@ -5634,17 +5634,17 @@ ContentParent::PermissionManagerRelease(
   if (appId != nsIScriptSecurityManager::NO_APP_ID && permMgr) {
     permMgr->ReleaseAppId(appId);
     return true;
   }
   return false;
 }
 
 bool
-ContentParent::RecvGetBrowserConfiguration(BrowserConfiguration* aConfig)
+ContentParent::RecvGetServiceWorkerConfiguration(ServiceWorkerConfiguration* aConfig)
 {
   MOZ_ASSERT(XRE_IsParentProcess());
 
   RefPtr<ServiceWorkerRegistrar> swr = ServiceWorkerRegistrar::Get();
   MOZ_ASSERT(swr);
 
   swr->GetRegistrations(aConfig->serviceWorkerRegistrations());
   return true;
--- a/dom/ipc/ContentParent.h
+++ b/dom/ipc/ContentParent.h
@@ -1138,17 +1138,18 @@ private:
 
   virtual PWebrtcGlobalParent* AllocPWebrtcGlobalParent() override;
   virtual bool DeallocPWebrtcGlobalParent(PWebrtcGlobalParent *aActor) override;
 
 
   virtual bool RecvUpdateDropEffect(const uint32_t& aDragAction,
                                     const uint32_t& aDropEffect) override;
 
-  virtual bool RecvGetBrowserConfiguration(BrowserConfiguration* aConfig) override;
+  virtual bool
+  RecvGetServiceWorkerConfiguration(ServiceWorkerConfiguration* aConfig) override;
 
   virtual bool RecvGamepadListenerAdded() override;
 
   virtual bool RecvGamepadListenerRemoved() override;
 
   virtual bool RecvProfile(const nsCString& aProfile) override;
 
   virtual bool RecvGetGraphicsDeviceInitData(DeviceInitData* aOut) override;
--- a/dom/ipc/PContent.ipdl
+++ b/dom/ipc/PContent.ipdl
@@ -62,17 +62,17 @@ include DOMTypes;
 include JavaScriptTypes;
 include InputStreamParams;
 include PTabContext;
 include URIParams;
 include PluginTypes;
 include ProtocolTypes;
 include PBackgroundSharedTypes;
 include PContentPermission;
-include BrowserConfiguration;
+include ServiceWorkerConfiguration;
 include GraphicsMessages;
 include ProfilerTypes;
 
 // Workaround to prevent error if PContentChild.cpp & PContentBridgeParent.cpp
 // are put into different UnifiedProtocolsXX.cpp files.
 // XXX Remove this once bug 1069073 is fixed
 include "mozilla/dom/PContentBridgeParent.h";
 
@@ -1118,18 +1118,18 @@ parent:
      *       provided.
      */
     async PContentPermissionRequest(PermissionRequest[] aRequests, Principal aPrincipal,
                                     TabId tabId);
 
     /**
      * Send ServiceWorkerRegistrationData to child process.
      */
-    sync GetBrowserConfiguration()
-        returns (BrowserConfiguration aConfig);
+    sync GetServiceWorkerConfiguration()
+        returns (ServiceWorkerConfiguration aConfig);
 
     /*
      * Tells the parent to start the gamepad listening service if it hasn't already.
      */
     async GamepadListenerAdded();
 
     /**
      * Tells the parent to stop the gamepad listening service if it hasn't already.
rename from dom/ipc/BrowserConfiguration.ipdlh
rename to dom/ipc/ServiceWorkerConfiguration.ipdlh
--- a/dom/ipc/BrowserConfiguration.ipdlh
+++ b/dom/ipc/ServiceWorkerConfiguration.ipdlh
@@ -4,15 +4,15 @@
  * 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 ServiceWorkerRegistrarTypes;
 
 namespace mozilla {
 namespace dom {
 
-struct BrowserConfiguration
+struct ServiceWorkerConfiguration
 {
   ServiceWorkerRegistrationData[] serviceWorkerRegistrations;
 };
 
 } // namespace dom
 } // namespace mozilla
--- a/dom/ipc/moz.build
+++ b/dom/ipc/moz.build
@@ -84,17 +84,16 @@ UNIFIED_SOURCES += [
 SOURCES += [
     'Blob.cpp',
     'ContentChild.cpp',
     'CrashReporterChild.cpp',
     'ProcessHangMonitor.cpp',
 ]
 
 IPDL_SOURCES += [
-    'BrowserConfiguration.ipdlh',
     'DOMTypes.ipdlh',
     'PBlob.ipdl',
     'PBlobStream.ipdl',
     'PBrowser.ipdl',
     'PBrowserOrId.ipdlh',
     'PColorPicker.ipdl',
     'PContent.ipdl',
     'PContentBridge.ipdl',
@@ -105,16 +104,17 @@ IPDL_SOURCES += [
     'PDocumentRenderer.ipdl',
     'PFilePicker.ipdl',
     'PMemoryReportRequest.ipdl',
     'PNuwa.ipdl',
     'PPluginWidget.ipdl',
     'PProcessHangMonitor.ipdl',
     'PScreenManager.ipdl',
     'PTabContext.ipdlh',
+    'ServiceWorkerConfiguration.ipdlh',
 ]
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 
 if CONFIG['MOZ_SANDBOX'] and CONFIG['OS_TARGET'] == 'Darwin':
     USE_LIBS += [