From c3c25a83376a75f919ae9fd67bced2b371b46815 Mon Sep 17 00:00:00 2001
From: Simon Giesecke <sgiesecke@mozilla.com>
Date: Mon, 23 Nov 2020 16:03:38 +0000
Subject: [PATCH] Bug 1660470 - Avoid including GfxMessageUtils.h from header
 files. r=nika

Differential Revision: https://phabricator.services.mozilla.com/D93234

Depends on D93233
---
 accessible/ipc/extension/mac/PDocAccessiblePlatformExt.ipdl | 2 ++
 accessible/ipc/win/PDocAccessible.ipdl                      | 2 ++
 dom/ipc/PContent.ipdl                                       | 3 ++-
 layout/base/PresState.ipdlh                                 | 3 ++-
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/accessible/ipc/extension/mac/PDocAccessiblePlatformExt.ipdl b/accessible/ipc/extension/mac/PDocAccessiblePlatformExt.ipdl
index 643c3b696ccf..59002f815f29 100644
--- a/accessible/ipc/extension/mac/PDocAccessiblePlatformExt.ipdl
+++ b/accessible/ipc/extension/mac/PDocAccessiblePlatformExt.ipdl
@@ -6,6 +6,8 @@
 
 include protocol PDocAccessible;
 
+include "mozilla/GfxMessageUtils.h";
+
 using mozilla::a11y::EWhichRange from "mozilla/a11y/IPCTypes.h";
 using nsIntRect from "nsRect.h";
 
diff --git a/accessible/ipc/win/PDocAccessible.ipdl b/accessible/ipc/win/PDocAccessible.ipdl
index b1b179b451cb..6fbc5857bb42 100644
--- a/accessible/ipc/win/PDocAccessible.ipdl
+++ b/accessible/ipc/win/PDocAccessible.ipdl
@@ -7,6 +7,8 @@
 include protocol PFileDescriptorSet;
 include protocol PBrowser;
 
+include "mozilla/GfxMessageUtils.h";
+
 using mozilla::a11y::role from "mozilla/a11y/IPCTypes.h";
 using mozilla::a11y::IAccessibleHolder from "mozilla/a11y/IPCTypes.h";
 using mozilla::a11y::IDispatchHolder from "mozilla/a11y/IPCTypes.h";
diff --git a/dom/ipc/PContent.ipdl b/dom/ipc/PContent.ipdl
index a22d5c11036d..95925383377f 100644
--- a/dom/ipc/PContent.ipdl
+++ b/dom/ipc/PContent.ipdl
@@ -70,6 +70,7 @@ include protocol PSandboxTesting;
 #endif
 
 include "mozilla/AntiTrackingIPCUtils.h";
+include "mozilla/GfxMessageUtils.h";
 
 using refcounted class nsIDOMGeoPosition from "nsGeoPositionIPCSerialiser.h";
 using refcounted class nsIAlertNotification from "mozilla/AlertNotificationIPCSerializer.h";
@@ -132,7 +133,7 @@ using JSActorMessageMeta from "mozilla/dom/PWindowGlobal.h";
 using mozilla::PermissionDelegateHandler::DelegatedPermissionList from "mozilla/PermissionDelegateIPCUtils.h";
 using refcounted class nsILayoutHistoryState from "nsILayoutHistoryState.h";
 using class mozilla::dom::SessionHistoryInfo from "mozilla/dom/SessionHistoryEntry.h";
-using nsPoint from "mozilla/GfxMessageUtils.h";
+using struct nsPoint from "nsPoint.h";
 using struct mozilla::dom::LoadingSessionHistoryInfo from "mozilla/dom/SessionHistoryEntry.h";
 using mozilla::PDMFactory::MediaCodecsSupported from "PDMFactory.h";
 using mozilla::dom::PerformanceTimingData from "mozilla/dom/PerformanceTiming.h";
diff --git a/layout/base/PresState.ipdlh b/layout/base/PresState.ipdlh
index c300e2e6fc0c..8383abbae97b 100644
--- a/layout/base/PresState.ipdlh
+++ b/layout/base/PresState.ipdlh
@@ -4,10 +4,11 @@
  * 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/GfxMessageUtils.h";
 include "mozilla/dom/IPCBlobUtils.h";
 
 using mozilla::void_t from "ipc/IPCMessageUtils.h";
-using nsPoint from "mozilla/GfxMessageUtils.h";
+using struct nsPoint from "nsPoint.h";
 using refcounted class mozilla::dom::BlobImpl from "mozilla/dom/BlobImpl.h";
 
 namespace mozilla {