Bug 961049 - Part 3: Move PersistenceType serializer from indexedDB to quota module; r=baku

devtools/shared/heapsnapshot/HeapSnapshot.cpp

@@ -15,6 +15,7 @@
 #include "js/UbiNodeCensus.h"
 #include "js/UbiNodeDominatorTree.h"
 #include "mozilla/Attributes.h"
+#include "mozilla/CycleCollectedJSRuntime.h"
 #include "mozilla/devtools/AutoMemMap.h"
 #include "mozilla/devtools/CoreDump.pb.h"
 #include "mozilla/devtools/DeserializedNode.h"

dom/bluetooth/common/BluetoothService.cpp

@@ -19,6 +19,7 @@
 #include "mozilla/Services.h"
 #include "mozilla/StaticPtr.h"
 #include "mozilla/unused.h"
+#include "mozilla/dom/BindingUtils.h"
 #include "mozilla/dom/ContentParent.h"
 #include "mozilla/dom/bluetooth/BluetoothTypes.h"
 #include "mozilla/dom/ipc/BlobChild.h"

dom/indexedDB/PBackgroundIDBFactory.ipdl

@@ -9,6 +9,8 @@ include protocol PBackgroundIDBFactoryRequest;
 include PBackgroundIDBSharedTypes;
 include PBackgroundSharedTypes;
 
+include "mozilla/dom/quota/SerializationHelpers.h";
+
 using struct mozilla::void_t
   from "ipc/IPCMessageUtils.h";
 

dom/indexedDB/PBackgroundIDBSharedTypes.ipdlh

@@ -9,6 +9,7 @@ include protocol PBlob;
 include DOMTypes;
 
 include "mozilla/dom/indexedDB/SerializationHelpers.h";
+include "mozilla/dom/quota/SerializationHelpers.h";
 
 using struct mozilla::null_t
   from "ipc/IPCMessageUtils.h";

dom/indexedDB/SerializationHelpers.h

@@ -13,18 +13,9 @@
 #include "mozilla/dom/indexedDB/KeyPath.h"
 #include "mozilla/dom/indexedDB/IDBCursor.h"
 #include "mozilla/dom/indexedDB/IDBTransaction.h"
-#include "mozilla/dom/quota/PersistenceType.h"
 
 namespace IPC {
 
-template <>
-struct ParamTraits<mozilla::dom::quota::PersistenceType> :
-  public ContiguousEnumSerializer<
-                               mozilla::dom::quota::PersistenceType,
-                               mozilla::dom::quota::PERSISTENCE_TYPE_PERSISTENT,
-                               mozilla::dom::quota::PERSISTENCE_TYPE_INVALID>
-{ };
-
 template <>
 struct ParamTraits<mozilla::dom::indexedDB::Key>
 {

dom/ipc/PContent.ipdl

@@ -71,7 +71,7 @@ include GraphicsMessages;
 // XXX Remove this once bug 1069073 is fixed
 include "mozilla/dom/PContentBridgeParent.h";
 
-include "mozilla/dom/indexedDB/SerializationHelpers.h";
+include "mozilla/dom/quota/SerializationHelpers.h";
 
 using GeoPosition from "nsGeoPositionIPCSerialiser.h";
 

dom/mobilemessage/ipc/SmsParent.cpp

@@ -20,6 +20,7 @@
 #include "mozilla/dom/ipc/BlobParent.h"
 #include "mozilla/dom/ContentParent.h"
 #include "mozilla/dom/File.h"
+#include "mozilla/dom/ToJSValue.h"
 #include "mozilla/dom/mobilemessage/Constants.h" // For MessageType
 #include "nsContentUtils.h"
 #include "nsTArrayHelpers.h"

dom/quota/SerializationHelpers.h

@@ -0,0 +1,26 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
+/* 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/. */
+
+#ifndef mozilla_dom_quota_SerializationHelpers_h
+#define mozilla_dom_quota_SerializationHelpers_h
+
+#include "ipc/IPCMessageUtils.h"
+
+#include "mozilla/dom/quota/PersistenceType.h"
+
+namespace IPC {
+
+template <>
+struct ParamTraits<mozilla::dom::quota::PersistenceType> :
+  public ContiguousEnumSerializer<
+                               mozilla::dom::quota::PersistenceType,
+                               mozilla::dom::quota::PERSISTENCE_TYPE_PERSISTENT,
+                               mozilla::dom::quota::PERSISTENCE_TYPE_INVALID>
+{ };
+
+} // namespace IPC
+
+#endif // mozilla_dom_quota_SerializationHelpers_h

dom/quota/moz.build

@@ -19,6 +19,7 @@ EXPORTS.mozilla.dom.quota += [
     'QuotaCommon.h',
     'QuotaManager.h',
     'QuotaObject.h',
+    'SerializationHelpers.h',
     'UsageInfo.h',
 ]
 

netwerk/cookie/CookieServiceParent.cpp

@@ -10,6 +10,7 @@
 #include "mozilla/BasePrincipal.h"
 #include "mozilla/ipc/URIUtils.h"
 #include "nsCookieService.h"
+#include "nsIChannel.h"
 #include "nsIScriptSecurityManager.h"
 #include "nsIPrivateBrowsingChannel.h"
 #include "nsNetCID.h"

netwerk/protocol/res/SubstitutingProtocolHandler.cpp

@@ -9,6 +9,7 @@
 #include "mozilla/unused.h"
 
 #include "SubstitutingProtocolHandler.h"
+#include "nsIChannel.h"
 #include "nsIIOService.h"
 #include "nsIFile.h"
 #include "nsNetCID.h"