summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--dom/ipc/ContentParent.cpp2
-rw-r--r--dom/ipc/StructuredCloneData.cpp1
-rw-r--r--dom/ipc/TabChild.cpp1
-rw-r--r--dom/ipc/moz.build13
-rw-r--r--dom/ipc/nsIContentParent.cpp1
5 files changed, 9 insertions, 9 deletions
diff --git a/dom/ipc/ContentParent.cpp b/dom/ipc/ContentParent.cpp
index 0d11fb889..deea691f3 100644
--- a/dom/ipc/ContentParent.cpp
+++ b/dom/ipc/ContentParent.cpp
@@ -109,6 +109,7 @@
#include "nsIDOMWindow.h"
#include "nsIExternalProtocolService.h"
#include "nsIFormProcessor.h"
+#include "nsIFrameLoader.h"
#include "nsIGfxInfo.h"
#include "nsIIdleService.h"
#include "nsIInterfaceRequestorUtils.h"
@@ -229,6 +230,7 @@ static NS_DEFINE_CID(kCClipboardCID, NS_CLIPBOARD_CID);
using base::ChildPrivileges;
using base::KillProcess;
+using namespace mozilla::dom;
using namespace mozilla::dom::power;
using namespace mozilla::media;
using namespace mozilla::embedding;
diff --git a/dom/ipc/StructuredCloneData.cpp b/dom/ipc/StructuredCloneData.cpp
index 2c1fff2ac..6b3ee0cd1 100644
--- a/dom/ipc/StructuredCloneData.cpp
+++ b/dom/ipc/StructuredCloneData.cpp
@@ -13,6 +13,7 @@
#include "ipc/IPCMessageUtils.h"
#include "mozilla/dom/BindingUtils.h"
#include "mozilla/dom/BlobBinding.h"
+#include "mozilla/dom/DOMTypes.h"
#include "mozilla/dom/File.h"
#include "mozilla/dom/ToJSValue.h"
#include "nsContentUtils.h"
diff --git a/dom/ipc/TabChild.cpp b/dom/ipc/TabChild.cpp
index e1355adee..aac95ae02 100644
--- a/dom/ipc/TabChild.cpp
+++ b/dom/ipc/TabChild.cpp
@@ -71,6 +71,7 @@
#include "nsIURI.h"
#include "nsIURIFixup.h"
#include "nsCDefaultURIFixup.h"
+#include "nsISupportsPrimitives.h"
#include "nsIWebBrowser.h"
#include "nsIWebBrowserFocus.h"
#include "nsIWebBrowserSetup.h"
diff --git a/dom/ipc/moz.build b/dom/ipc/moz.build
index 5629ab2c6..455d0eff7 100644
--- a/dom/ipc/moz.build
+++ b/dom/ipc/moz.build
@@ -44,11 +44,13 @@ EXPORTS.mozilla += [
'ProcessPriorityManager.h',
]
-UNIFIED_SOURCES += [
+SOURCES += [
'AppProcessChecker.cpp',
+ 'Blob.cpp',
'ColorPickerParent.cpp',
'ContentBridgeChild.cpp',
'ContentBridgeParent.cpp',
+ 'ContentChild.cpp',
'ContentParent.cpp',
'ContentProcess.cpp',
'ContentProcessManager.cpp',
@@ -57,6 +59,7 @@ UNIFIED_SOURCES += [
'nsIContentParent.cpp',
'PermissionMessageUtils.cpp',
'PreallocatedProcessManager.cpp',
+ 'ProcessHangMonitor.cpp',
'ProcessPriorityManager.cpp',
'ScreenManagerParent.cpp',
'StructuredCloneData.cpp',
@@ -66,14 +69,6 @@ UNIFIED_SOURCES += [
'TabParent.cpp',
]
-# Blob.cpp cannot be compiled in unified mode because it triggers a fatal gcc warning.
-# ContentChild.cpp cannot be compiled in unified mode on linux due to Time conflict
-SOURCES += [
- 'Blob.cpp',
- 'ContentChild.cpp',
- 'ProcessHangMonitor.cpp',
-]
-
IPDL_SOURCES += [
'BlobTypes.ipdlh',
'DOMTypes.ipdlh',
diff --git a/dom/ipc/nsIContentParent.cpp b/dom/ipc/nsIContentParent.cpp
index 0ef1abdf7..77bfae4c7 100644
--- a/dom/ipc/nsIContentParent.cpp
+++ b/dom/ipc/nsIContentParent.cpp
@@ -27,6 +27,7 @@
#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.