Bug 1591438 - Move DEFINE_IPC_SERIALIZER_WITH_FIELDS into IPCMessageUtils header r=bwc

Differential Revision: https://phabricator.services.mozilla.com/D51558

--HG--
extra : moz-landing-system : lando

dom/media/webrtc/WebrtcIPCTraits.h

@@ -103,55 +103,6 @@ template <>
 struct ParamTraits<mozilla::dom::RTCIceTransportPolicy>
     : public WebidlEnumSerializer<mozilla::dom::RTCIceTransportPolicy> {};
 
-// A couple of recursive helper functions, allows syntax like:
-// WriteParams(aMsg, aParam.foo, aParam.bar, aParam.baz)
-// ReadParams(aMsg, aIter, aParam.foo, aParam.bar, aParam.baz)
-
-// Base case
-static void WriteParams(Message* aMsg) {}
-
-template <typename T0, typename... Tn>
-static void WriteParams(Message* aMsg, const T0& aArg,
-                        const Tn&... aRemainingArgs) {
-  WriteParam(aMsg, aArg);                // Write first arg
-  WriteParams(aMsg, aRemainingArgs...);  // Recurse for the rest
-}
-
-// Base case
-static bool ReadParams(const Message* aMsg, PickleIterator* aIter) {
-  return true;
-}
-
-template <typename T0, typename... Tn>
-static bool ReadParams(const Message* aMsg, PickleIterator* aIter, T0& aArg,
-                       Tn&... aRemainingArgs) {
-  return ReadParam(aMsg, aIter, &aArg) &&             // Read first arg
-         ReadParams(aMsg, aIter, aRemainingArgs...);  // Recurse for the rest
-}
-
-// Macros that allow syntax like:
-// DEFINE_IPC_SERIALIZER_WITH_FIELDS(SomeType, member1, member2, member3)
-// Makes sure that serialize/deserialize code do the same members in the same
-// order.
-#define ACCESS_PARAM_FIELD(Field) aParam.Field
-
-#define DEFINE_IPC_SERIALIZER_WITH_FIELDS(Type, ...)                         \
-  template <>                                                                \
-  struct ParamTraits<Type> {                                                 \
-    typedef Type paramType;                                                  \
-    static void Write(Message* aMsg, const paramType& aParam) {              \
-      WriteParams(aMsg, MOZ_FOR_EACH_SEPARATED(ACCESS_PARAM_FIELD, (, ), (), \
-                                               (__VA_ARGS__)));              \
-    }                                                                        \
-                                                                             \
-    static bool Read(const Message* aMsg, PickleIterator* aIter,             \
-                     paramType* aResult) {                                   \
-      paramType& aParam = *aResult;                                          \
-      return ReadParams(aMsg, aIter,                                         \
-                        MOZ_FOR_EACH_SEPARATED(ACCESS_PARAM_FIELD, (, ), (), \
-                                               (__VA_ARGS__)));              \
-    }                                                                        \
-  };
 
 DEFINE_IPC_SERIALIZER_WITH_FIELDS(mozilla::dom::RTCIceServer, mCredential,
                                   mCredentialType, mUrl, mUrls, mUsername)

ipc/glue/IPCMessageUtils.cpp

@@ -19,4 +19,8 @@ bool ByteLengthIsValid(uint32_t aNumElements, size_t aElementSize,
   return true;
 }
 
+void WriteParams(Message* aMsg) {}
+
+bool ReadParams(const Message* aMsg, PickleIterator* aIter) { return true; }
+
 }  // namespace IPC

ipc/glue/IPCMessageUtils.h

@@ -1106,6 +1106,54 @@ struct BitfieldHelper {
   }
 };
 
+// A couple of recursive helper functions, allows syntax like:
+// WriteParams(aMsg, aParam.foo, aParam.bar, aParam.baz)
+// ReadParams(aMsg, aIter, aParam.foo, aParam.bar, aParam.baz)
+
+// Base case
+void WriteParams(Message* aMsg);
+
+template <typename T0, typename... Tn>
+static void WriteParams(Message* aMsg, const T0& aArg,
+                        const Tn&... aRemainingArgs) {
+  WriteParam(aMsg, aArg);                // Write first arg
+  WriteParams(aMsg, aRemainingArgs...);  // Recurse for the rest
+}
+
+// Base case
+bool ReadParams(const Message* aMsg, PickleIterator* aIter);
+
+template <typename T0, typename... Tn>
+static bool ReadParams(const Message* aMsg, PickleIterator* aIter, T0& aArg,
+                       Tn&... aRemainingArgs) {
+  return ReadParam(aMsg, aIter, &aArg) &&             // Read first arg
+         ReadParams(aMsg, aIter, aRemainingArgs...);  // Recurse for the rest
+}
+
+// Macros that allow syntax like:
+// DEFINE_IPC_SERIALIZER_WITH_FIELDS(SomeType, member1, member2, member3)
+// Makes sure that serialize/deserialize code do the same members in the same
+// order.
+#define ACCESS_PARAM_FIELD(Field) aParam.Field
+
+#define DEFINE_IPC_SERIALIZER_WITH_FIELDS(Type, ...)                         \
+  template <>                                                                \
+  struct ParamTraits<Type> {                                                 \
+    typedef Type paramType;                                                  \
+    static void Write(Message* aMsg, const paramType& aParam) {              \
+      WriteParams(aMsg, MOZ_FOR_EACH_SEPARATED(ACCESS_PARAM_FIELD, (, ), (), \
+                                               (__VA_ARGS__)));              \
+    }                                                                        \
+                                                                             \
+    static bool Read(const Message* aMsg, PickleIterator* aIter,             \
+                     paramType* aResult) {                                   \
+      paramType& aParam = *aResult;                                          \
+      return ReadParams(aMsg, aIter,                                         \
+                        MOZ_FOR_EACH_SEPARATED(ACCESS_PARAM_FIELD, (, ), (), \
+                                               (__VA_ARGS__)));              \
+    }                                                                        \
+  };
+
 } /* namespace IPC */
 
 #endif /* __IPC_GLUE_IPCMESSAGEUTILS_H__ */