From 93dd261db8947d59abf9d179a146bfdf64722811 Mon Sep 17 00:00:00 2001 From: Simon Giesecke Date: Mon, 23 Nov 2020 16:03:32 +0000 Subject: [PATCH] Bug 1660470 - Include C++ header files only from cpp file. r=nika Differential Revision: https://phabricator.services.mozilla.com/D93233 Depends on D87865 --- dom/ipc/PContent.ipdl | 2 ++ dom/media/ipc/PRemoteDecoderManager.ipdl | 1 + gfx/ipc/PGPU.ipdl | 2 ++ gfx/layers/ipc/PCanvas.ipdl | 2 ++ gfx/layers/ipc/WebRenderMessages.ipdlh | 1 + ipc/glue/PBackground.ipdl | 1 + ipc/ipdl/ipdl/lower.py | 2 +- 7 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dom/ipc/PContent.ipdl b/dom/ipc/PContent.ipdl index 7178b5fc5e9a..a22d5c11036d 100644 --- a/dom/ipc/PContent.ipdl +++ b/dom/ipc/PContent.ipdl @@ -69,6 +69,8 @@ include LookAndFeelTypes; include protocol PSandboxTesting; #endif +include "mozilla/AntiTrackingIPCUtils.h"; + using refcounted class nsIDOMGeoPosition from "nsGeoPositionIPCSerialiser.h"; using refcounted class nsIAlertNotification from "mozilla/AlertNotificationIPCSerializer.h"; diff --git a/dom/media/ipc/PRemoteDecoderManager.ipdl b/dom/media/ipc/PRemoteDecoderManager.ipdl index 9f5e67499a12..1e8f4eafe976 100644 --- a/dom/media/ipc/PRemoteDecoderManager.ipdl +++ b/dom/media/ipc/PRemoteDecoderManager.ipdl @@ -7,6 +7,7 @@ include protocol PTexture; include protocol PRemoteDecoder; include LayersSurfaces; include "mozilla/dom/MediaIPCUtils.h"; +include "mozilla/layers/LayersMessageUtils.h"; using VideoInfo from "MediaInfo.h"; using AudioInfo from "MediaInfo.h"; diff --git a/gfx/ipc/PGPU.ipdl b/gfx/ipc/PGPU.ipdl index 02eae560c801..fea0231ca287 100644 --- a/gfx/ipc/PGPU.ipdl +++ b/gfx/ipc/PGPU.ipdl @@ -22,6 +22,8 @@ include protocol PRemoteDecoderManager; include protocol PSandboxTesting; #endif +include "mozilla/layers/LayersMessageUtils.h"; + using base::ProcessId from "base/process.h"; using mozilla::dom::NativeThreadId from "mozilla/dom/NativeThreadId.h"; using mozilla::Telemetry::HistogramAccumulation from "mozilla/TelemetryComms.h"; diff --git a/gfx/layers/ipc/PCanvas.ipdl b/gfx/layers/ipc/PCanvas.ipdl index 7d9784bdeb2b..2be61bd14217 100644 --- a/gfx/layers/ipc/PCanvas.ipdl +++ b/gfx/layers/ipc/PCanvas.ipdl @@ -4,6 +4,8 @@ * 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 "mozilla/layers/LayersMessageUtils.h"; + using mozilla::CrossProcessSemaphoreHandle from "mozilla/ipc/CrossProcessSemaphore.h"; using mozilla::layers::TextureType from "mozilla/layers/LayersTypes.h"; using mozilla::ipc::SharedMemoryBasic::Handle from "mozilla/ipc/SharedMemoryBasic.h"; diff --git a/gfx/layers/ipc/WebRenderMessages.ipdlh b/gfx/layers/ipc/WebRenderMessages.ipdlh index f40a81e5c383..da6465d933b8 100644 --- a/gfx/layers/ipc/WebRenderMessages.ipdlh +++ b/gfx/layers/ipc/WebRenderMessages.ipdlh @@ -5,6 +5,7 @@ * 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 "mozilla/layers/LayersMessageUtils.h"; include "mozilla/layers/WebRenderMessageUtils.h"; include LayersSurfaces; diff --git a/ipc/glue/PBackground.ipdl b/ipc/glue/PBackground.ipdl index c15b6ef7ee6c..5e726d1abab4 100644 --- a/ipc/glue/PBackground.ipdl +++ b/ipc/glue/PBackground.ipdl @@ -65,6 +65,7 @@ include RemoteWorkerTypes; include MIDITypes; include "mozilla/dom/cache/IPCUtils.h"; +include "mozilla/dom/quota/SerializationHelpers.h"; include "mozilla/layers/LayersMessageUtils.h"; using mozilla::dom::cache::Namespace diff --git a/ipc/ipdl/ipdl/lower.py b/ipc/ipdl/ipdl/lower.py index f49cf412f66f..36046091cf09 100644 --- a/ipc/ipdl/ipdl/lower.py +++ b/ipc/ipdl/ipdl/lower.py @@ -3591,7 +3591,7 @@ class _GenerateProtocolActorCode(ipdl.ast.Visitor): self.nonForwardDeclaredHeaders.add(using.header) def visitCxxInclude(self, inc): - self.nonForwardDeclaredHeaders.add(inc.file) + self.externalIncludes.add(inc.file) def visitInclude(self, inc): ip = inc.tu.protocol