Bug 1500257 part 1 - Fix unified build bustage. r=qdot
authorRyan Hunt <rhunt@eqrion.net>
Wed, 23 Jan 2019 11:08:24 -0600
changeset 458618 08617d9d95cc2ca88c35c6387436b22dbdc82530
parent 458617 738860a7d63307eee5ce83a7e066b7faa224cd16
child 458619 ea9fcc2f47f332eba8f0c22c37f5857b69df2a52
push id35539
push userbtara@mozilla.com
push dateTue, 12 Feb 2019 05:27:54 +0000
treeherdermozilla-central@c0d540e06ce3 [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 {