Bug 1103412 - Gecko does not compile with printing disabled. r=mconley

dom/ipc/ContentParent.cpp

@@ -3233,7 +3233,11 @@ ContentParent::DeallocPNeckoParent(PNeckoParent* necko)
 PPrintingParent*
 ContentParent::AllocPPrintingParent()
 {
+#ifdef NS_PRINTING
     return new PrintingParent();
+#else
+    return nullptr;
+#endif
 }
 
 bool

embedding/components/moz.build

@@ -14,7 +14,7 @@ DIRS += [
     'commandhandler',
 ]
 
-if CONFIG['MOZ_XUL'] and CONFIG['NS_PRINTING']:
+if CONFIG['MOZ_XUL']:
     DIRS += ['printingui']
 
 DIRS += ['build']

embedding/components/printingui/ipc/moz.build

@@ -8,13 +8,14 @@ EXPORTS.mozilla.embedding.printingui += [
     'PrintingParent.h',
 ]
 
-UNIFIED_SOURCES += [
-    'nsPrintingPromptServiceProxy.cpp',
-    'PrintDataUtils.cpp',
-    'PrintingParent.cpp',
-    'PrintProgressDialogChild.cpp',
-    'PrintProgressDialogParent.cpp',
-]
+if CONFIG['NS_PRINTING']:
+    UNIFIED_SOURCES += [
+        'nsPrintingPromptServiceProxy.cpp',
+        'PrintDataUtils.cpp',
+        'PrintingParent.cpp',
+        'PrintProgressDialogChild.cpp',
+        'PrintProgressDialogParent.cpp',
+    ]
 
 IPDL_SOURCES += [
     'PPrinting.ipdl',

embedding/components/printingui/moz.build

@@ -8,9 +8,10 @@ toolkit = CONFIG['MOZ_WIDGET_TOOLKIT']
 
 DIRS += ['ipc']
 
-if toolkit == 'windows':
-    DIRS += ['win']
-elif toolkit == 'cocoa':
-    DIRS += ['mac']
-elif CONFIG['MOZ_PDF_PRINTING']:
-    DIRS += ['unixshared']
+if CONFIG['NS_PRINTING']:
+    if toolkit == 'windows':
+        DIRS += ['win']
+    elif toolkit == 'cocoa':
+        DIRS += ['mac']
+    elif CONFIG['MOZ_PDF_PRINTING']:
+        DIRS += ['unixshared']

widget/moz.build

@@ -105,7 +105,6 @@ EXPORTS += [
     'nsIRollupListener.h',
     'nsIWidget.h',
     'nsIWidgetListener.h',
-    'nsPrintOptionsImpl.h',
     'nsWidgetInitData.h',
     'nsWidgetsCID.h',
     'PluginWidgetProxy.h',
@@ -147,7 +146,6 @@ UNIFIED_SOURCES += [
     'nsIdleService.cpp',
     'nsIWidgetListener.cpp',
     'nsPrimitiveHelpers.cpp',
-    'nsPrintOptionsImpl.cpp',
     'nsPrintSession.cpp',
     'nsPrintSettingsImpl.cpp',
     'nsScreenManagerProxy.cpp',
@@ -163,6 +161,14 @@ UNIFIED_SOURCES += [
     'WidgetUtils.cpp',
 ]
 
+if CONFIG['MOZ_XUL'] and CONFIG['NS_PRINTING']:
+    EXPORTS += [
+        'nsPrintOptionsImpl.h',
+    ]
+    UNIFIED_SOURCES += [
+        'nsPrintOptionsImpl.cpp',
+    ]
+
 # nsBaseWidget.cpp needs to be built separately because of name clashes in the OS X headers
 SOURCES += [
     'nsBaseWidget.cpp',

widget/qt/nsLookAndFeel.cpp

@@ -18,8 +18,6 @@
 #include <QFont>
 #include <QScreen>
 #include <QPalette>
-#include <QStyle>
-#include <QStyleFactory>
 
 #include "nsLookAndFeel.h"
 #include "nsStyleConsts.h"