Bug 1456911 - Prelude: Fix unified build breakage exposed by the next patch. r?froydnj draft
authorJed Davis <jld@mozilla.com>
Fri, 11 May 2018 20:25:19 -0600
changeset 805567 5301fb85eba9408b30aa0bb14f170026b407a050
parent 804493 da28b92efe6f6acaf79545697415b82038143338
child 805568 31dd18d60d87a6b7623578073ef2e2fcd10cf35f
push id112698
push userbmo:jld@mozilla.com
push dateFri, 08 Jun 2018 00:17:21 +0000
reviewersfroydnj
bugs1456911
milestone62.0a1
Bug 1456911 - Prelude: Fix unified build breakage exposed by the next patch. r?froydnj This directory has a number of places where files unintentionally depend on `#include`s and `using` directives and forward declarations in other files in the same unified build group. Adding a file shifts the group boundaries and exposes some of those bugs; this patch fixes them (but there are others). MozReview-Commit-ID: AqAOdnXniTn
ipc/glue/IPCStreamSource.cpp
ipc/glue/IPCStreamSource.h
modules/libjar/nsJARURI.h
--- a/ipc/glue/IPCStreamSource.cpp
+++ b/ipc/glue/IPCStreamSource.cpp
@@ -1,15 +1,16 @@
 /* -*- 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/. */
 
 #include "IPCStreamSource.h"
+#include "BackgroundParent.h" // for AssertIsOnBackgroundThread
 #include "mozilla/webrender/WebRenderTypes.h"
 #include "nsIAsyncInputStream.h"
 #include "nsICancelableRunnable.h"
 #include "nsIRunnable.h"
 #include "nsISerialEventTarget.h"
 #include "nsStreamUtils.h"
 #include "nsThreadUtils.h"
 
--- a/ipc/glue/IPCStreamSource.h
+++ b/ipc/glue/IPCStreamSource.h
@@ -23,16 +23,18 @@ class nsIContentParent;
 namespace wr {
 struct ByteBuffer;
 } // wr namespace
 
 namespace ipc {
 
 class PBackgroundChild;
 class PBackgroundParent;
+class PChildToParentStreamChild;
+class PParentToChildStreamParent;
 
 // The IPCStream IPC actor is designed to push an nsIInputStream from child to
 // parent or parent to child incrementally.  This is mainly needed for streams
 // such as nsPipe that may not yet have all their data available when the
 // stream must be sent across an IPC boundary.  While many streams are handled
 // by SerializeInputStream(), these streams cannot be serialized and must be
 // sent using this actor.
 //
--- a/modules/libjar/nsJARURI.h
+++ b/modules/libjar/nsJARURI.h
@@ -106,17 +106,17 @@ private:
     nsresult SetPassword(const nsACString &input);
     nsresult SetHostPort(const nsACString &aValue);
     nsresult SetHost(const nsACString &input);
     nsresult SetPort(int32_t port);
     nsresult SetPathQueryRef(const nsACString &input);
     nsresult SetRef(const nsACString &input);
     nsresult SetFilePath(const nsACString &input);
     nsresult SetQuery(const nsACString &input);
-    nsresult SetQueryWithEncoding(const nsACString &input, const Encoding* encoding);
+    nsresult SetQueryWithEncoding(const nsACString &input, const mozilla::Encoding* encoding);
     bool Deserialize(const mozilla::ipc::URIParams&);
     nsresult ReadPrivate(nsIObjectInputStream *aStream);
 
     nsresult SetFileNameInternal(const nsACString& fileName);
     nsresult SetFileBaseNameInternal(const nsACString& fileBaseName);
     nsresult SetFileExtensionInternal(const nsACString& fileExtension);
 
 public: