Bug 1456911 - Prelude: Fix unified build breakage exposed by the next patch. r=froydnj
authorJed Davis <jld@mozilla.com>
Fri, 11 May 2018 20:25:19 -0600
changeset 479068 808a2fe2aaab24a235e619b9030c9b3bfd239158
parent 479067 dce27bbff52b37bc4b4d8717929237832fb89955
child 479069 69ffa8eab9d9a58a4916b6ce3dae1e70ea2ead28
push id1757
push userffxbld-merge
push dateFri, 24 Aug 2018 17:02:43 +0000
treeherdermozilla-release@736023aebdb1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1456911
milestone62.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
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: