Issue #80 - De-unify layout/printing

6 files changed, 11 insertions, 4 deletions

diff --git a/layout/printing/ipc/RemotePrintJobParent.cpp b/layout/printing/ipc/RemotePrintJobParent.cpp
index 2f4dbd56e..d49927da3 100644
--- a/layout/printing/ipc/RemotePrintJobParent.cpp
+++ b/layout/printing/ipc/RemotePrintJobParent.cpp
@@ -18,7 +18,6 @@
 #include "nsIDeviceContextSpec.h"
 #include "nsIPrintSettings.h"
 #include "nsIWebProgressListener.h"
-#include "PrintTranslator.h"
 
 namespace mozilla {
 namespace layout {
diff --git a/layout/printing/ipc/RemotePrintJobParent.h b/layout/printing/ipc/RemotePrintJobParent.h
index a96cc7eaa..752ef601e 100644
--- a/layout/printing/ipc/RemotePrintJobParent.h
+++ b/layout/printing/ipc/RemotePrintJobParent.h
@@ -13,11 +13,11 @@
 #include "nsCOMPtr.h"
 #include "mozilla/RefPtr.h"
 #include "mozilla/UniquePtr.h"
+#include "mozilla/layout/PrintTranslator.h"
 
 class nsDeviceContext;
 class nsIPrintSettings;
 class nsIWebProgressListener;
-class PrintTranslator;
 
 namespace mozilla {
 namespace layout {
diff --git a/layout/printing/moz.build b/layout/printing/moz.build
index 1a82d7cdb..745c45c4b 100644
--- a/layout/printing/moz.build
+++ b/layout/printing/moz.build
@@ -13,11 +13,12 @@ XPIDL_SOURCES += [
 EXPORTS.mozilla.layout += [
     'ipc/RemotePrintJobChild.h',
     'ipc/RemotePrintJobParent.h',
+    'PrintTranslator.h',
 ]
 
 XPIDL_MODULE = 'layout_printing'
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'ipc/RemotePrintJobChild.cpp',
     'ipc/RemotePrintJobParent.cpp',
     'nsPagePrintTimer.cpp',
diff --git a/layout/printing/nsPrintData.cpp b/layout/printing/nsPrintData.cpp
index 1914f779b..d760f7f0a 100644
--- a/layout/printing/nsPrintData.cpp
+++ b/layout/printing/nsPrintData.cpp
@@ -7,9 +7,11 @@
 
 #include "nsIStringBundle.h"
 #include "nsIServiceManager.h"
+#include "nsPIDOMWindow.h"
 #include "nsPrintObject.h"
 #include "nsPrintPreviewListener.h"
 #include "nsIWebProgressListener.h"
+#include "nsIWidget.h"
 #include "mozilla/Services.h"
 
 //-----------------------------------------------------
diff --git a/layout/printing/nsPrintEngine.cpp b/layout/printing/nsPrintEngine.cpp
index f2db53250..67208447a 100644
--- a/layout/printing/nsPrintEngine.cpp
+++ b/layout/printing/nsPrintEngine.cpp
@@ -16,6 +16,7 @@
 #include "nsPIDOMWindow.h"
 #include "nsIDocShell.h"
 #include "nsIURI.h"
+#include "nsIFile.h"
 #include "nsITextToSubURI.h"
 #include "nsError.h"
 
@@ -143,7 +144,7 @@ using namespace mozilla::dom;
 #define DUMP_LAYOUT_LEVEL 9 // this turns on the dumping of each doucment's layout info
 
 #ifndef PR_PL
-static mozilla::LazyLogModule gPrintingLog("printing")
+static mozilla::LazyLogModule gPrintingLog("printing");
 
 #define PR_PL(_p1)  MOZ_LOG(gPrintingLog, mozilla::LogLevel::Debug, _p1);
 #endif
diff --git a/layout/printing/nsPrintObject.cpp b/layout/printing/nsPrintObject.cpp
index 9165374c2..fe9622a1c 100644
--- a/layout/printing/nsPrintObject.cpp
+++ b/layout/printing/nsPrintObject.cpp
@@ -6,6 +6,7 @@
 #include "nsPrintObject.h"
 #include "nsIContentViewer.h"
 #include "nsIDOMDocument.h"
+#include "nsIDOMElement.h"
 #include "nsContentUtils.h" // for nsAutoScriptBlocker
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsPIDOMWindow.h"
@@ -14,6 +15,9 @@
 #include "nsIDocShellTreeItem.h"
 #include "nsIBaseWindow.h"
 #include "nsIDocument.h"
+#include "nsIWidget.h"
+#include "mozilla/Unused.h"
+#include "mozilla/dom/Element.h"
 
 //---------------------------------------------------
 //-- nsPrintObject Class Impl