Bug 1356211 - Part 1: Move PURLClassifierLocal from PContent to PBackground. (interface changes) draft
authorHenry Chang <hchang@mozilla.com>
Tue, 02 May 2017 11:31:34 +0800
changeset 571113 27ed1c69f46cfad681e5b24b43f8b686bc7547b1
parent 569701 2cca333f546f38860f84940d4c72d7470a3410f4
child 571114 cf413b80579442afc202a629ed7cf4305430d7a9
push id56685
push userhchang@mozilla.com
push dateTue, 02 May 2017 03:43:08 +0000
bugs1356211
milestone55.0a1
Bug 1356211 - Part 1: Move PURLClassifierLocal from PContent to PBackground. (interface changes) MozReview-Commit-ID: 9mS4P2d3OKn
dom/ipc/PContent.ipdl
dom/ipc/PURLClassifierLocal.ipdl
ipc/glue/PBackground.ipdl
--- a/dom/ipc/PContent.ipdl
+++ b/dom/ipc/PContent.ipdl
@@ -36,17 +36,16 @@ include protocol PSpeechSynthesis;
 include protocol PStorage;
 include protocol PTestShell;
 include protocol PJavaScript;
 include protocol PRemoteSpellcheckEngine;
 include protocol PWebBrowserPersistDocument;
 include protocol PWebrtcGlobal;
 include protocol PPresentation;
 include protocol PURLClassifier;
-include protocol PURLClassifierLocal;
 include protocol PVRManager;
 include protocol PVideoDecoderManager;
 include protocol PFlyWebPublishedServer;
 include DOMTypes;
 include JavaScriptTypes;
 include IPCBlob;
 include IPCStream;
 include PTabContext;
@@ -307,17 +306,16 @@ nested(upto inside_cpow) sync protocol P
     manages PTestShell;
     manages PJavaScript;
     manages PRemoteSpellcheckEngine;
     manages PWebBrowserPersistDocument;
     manages PWebrtcGlobal;
     manages PPresentation;
     manages PFlyWebPublishedServer;
     manages PURLClassifier;
-    manages PURLClassifierLocal;
 
 both:
     // Depending on exactly how the new browser is being created, it might be
     // created from either the child or parent process!
     //
     // The child creates the PBrowser as part of
     // TabChild::BrowserFrameProvideWindow (which happens when the child's
     // content calls window.open()), and the parent creates the PBrowser as part
@@ -752,18 +750,16 @@ parent:
     async PPresentation();
 
     async PFlyWebPublishedServer(nsString name, FlyWebPublishOptions params);
 
     sync PURLClassifier(Principal principal, bool useTrackingProtection)
         returns (bool success);
     sync ClassifyLocal(URIParams uri, nsCString tables)
         returns (nsresult rv, nsCString[] results);
-    // The async version of ClassifyLocal.
-    async PURLClassifierLocal(URIParams uri, nsCString tables);
 
     // Services remoting
 
     async StartVisitedQuery(URIParams uri);
     async VisitURI(URIParams uri, OptionalURIParams referrer, uint32_t flags);
     async SetURITitle(URIParams uri, nsString title);
 
     async LoadURIExternal(URIParams uri, PBrowser windowContext);
--- a/dom/ipc/PURLClassifierLocal.ipdl
+++ b/dom/ipc/PURLClassifierLocal.ipdl
@@ -1,23 +1,23 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
  * vim: sw=2 ts=8 et :
  */
 /* 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 protocol PContent;
+include protocol PBackground;
 include PURLClassifierInfo;
 
 namespace mozilla {
 namespace dom {
 
 protocol PURLClassifierLocal
 {
-  manager PContent;
+  manager PBackground;
 
 child:
   async __delete__(MaybeInfo info, nsresult errorCode);
 };
 
 } // namespace dom
 } // namespace mozilla
--- a/ipc/glue/PBackground.ipdl
+++ b/ipc/glue/PBackground.ipdl
@@ -20,17 +20,19 @@ include protocol PMemoryStream;
 include protocol PMessagePort;
 include protocol PCameras;
 include protocol PQuota;
 include protocol PChildToParentStream;
 include protocol PParentToChildStream;
 include protocol PServiceWorkerManager;
 include protocol PUDPSocket;
 include protocol PVsync;
+include protocol PURLClassifierLocal;
 
+include URIParams;
 include DOMTypes;
 include PBackgroundSharedTypes;
 include PBackgroundIDBSharedTypes;
 include PFileSystemParams;
 include ProtocolTypes;
 
 include "mozilla/dom/cache/IPCUtils.h";
 
@@ -66,16 +68,17 @@ sync protocol PBackground
   manages PMessagePort;
   manages PCameras;
   manages PQuota;
   manages PChildToParentStream;
   manages PParentToChildStream;
   manages PServiceWorkerManager;
   manages PUDPSocket;
   manages PVsync;
+  manages PURLClassifierLocal;
 
 parent:
   // Only called at startup during mochitests to check the basic infrastructure.
   async PBackgroundTest(nsCString testArg);
 
   async PBackgroundIDBFactory(LoggingInfo loggingInfo);
 
   async PBackgroundIndexedDBUtils();
@@ -111,16 +114,18 @@ parent:
   async PFileSystemRequest(FileSystemParams params);
 
   async PGamepadEventChannel();
 
   async PGamepadTestChannel();
 
   async PMemoryStream(uint64_t aSize);
 
+  async PURLClassifierLocal(URIParams uri, nsCString tables);
+
 child:
   async PCache();
   async PCacheStreamControl();
 
   async PParentToChildStream();
 
   async PIPCBlobInputStream(nsID aID, uint64_t aSize);