Bug 1500257 part 1 - Fix unified build bustage. r=qdot
☠☠ backed out by 2b27038adbe4 ☠ ☠
authorRyan Hunt <rhunt@eqrion.net>
Wed, 23 Jan 2019 11:08:24 -0600
changeset 458336 1615df089ad3b65333f50ac845a69e37c09b529f
parent 458335 e10ebb4af183dbc5c093ec9f72879f8fea7c4e9d
child 458337 e72d9d31a8bc15e0d3e17d3bdae0b5717465c4b9
push id111812
push userrhunt@eqrion.net
push dateSat, 09 Feb 2019 06:41:25 +0000
treeherdermozilla-inbound@335ddf6a213a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersqdot
bugs1500257
milestone67.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 1500257 part 1 - Fix unified build bustage. r=qdot Differential Revision: https://phabricator.services.mozilla.com/D17441
dom/ipc/nsIContentParent.cpp
gfx/vr/ipc/PVR.ipdl
--- a/dom/ipc/nsIContentParent.cpp
+++ b/dom/ipc/nsIContentParent.cpp
@@ -15,26 +15,28 @@
 #include "mozilla/dom/PermissionMessageUtils.h"
 #include "mozilla/dom/ProcessMessageManager.h"
 #include "mozilla/dom/TabParent.h"
 #include "mozilla/dom/ipc/IPCBlobInputStreamParent.h"
 #include "mozilla/dom/ipc/StructuredCloneData.h"
 #include "mozilla/jsipc/CrossProcessObjectWrappers.h"
 #include "mozilla/ipc/FileDescriptorSetParent.h"
 #include "mozilla/ipc/PFileDescriptorSetParent.h"
+#include "mozilla/ipc/PIPCBlobInputStreamParent.h"
 #include "mozilla/ipc/IPCStreamAlloc.h"
 #include "mozilla/ipc/IPCStreamDestination.h"
 #include "mozilla/ipc/IPCStreamSource.h"
 #include "mozilla/Unused.h"
 
 #include "MMPrinter.h"
 #include "nsIWebBrowserChrome.h"
 #include "nsPrintfCString.h"
 #include "xpcpublic.h"
 
+using namespace mozilla::ipc;
 using namespace mozilla::jsipc;
 
 // XXX need another bug to move this to a common header.
 #ifdef DISABLE_ASSERTS_FOR_FUZZING
 #  define ASSERT_UNLESS_FUZZING(...) \
     do {                             \
     } while (0)
 #else
--- a/gfx/vr/ipc/PVR.ipdl
+++ b/gfx/vr/ipc/PVR.ipdl
@@ -1,15 +1,15 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* 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/. */
 
 using mozilla::TimeStamp from "mozilla/TimeStamp.h";
-using mozilla::gfx::OpenVRControllerType from "gfxVR.h";
+using mozilla::gfx::OpenVRControllerType from "VRMessageUtils.h";
 using mozilla::dom::NativeThreadId from "mozilla/dom/TabMessageUtils.h";
 
 include GraphicsMessages;
 include protocol PVRGPU;
 
 include "VRMessageUtils.h";
 
 namespace mozilla {