Bug 1273998 - Proper export of printing IPDL with --disable-printing r=bobowen,glandium,?glandium
authorAlexandre Lissy <lissyx@lissyx.dyndns.org>
Thu, 19 May 2016 12:25:22 +0200
changeset 298301 63cfc2bd51fab69b6d4f3803af86c4b5a3a0eb01
parent 298300 9145f902d54fe189169db465e6e8be9c7eba21e3
child 298302 fdccec38636a68423966a49bbb4b3e3bba095ea2
push id30281
push usercbook@mozilla.com
push dateTue, 24 May 2016 12:54:02 +0000
treeherdermozilla-central@829d3be6ba64 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbobowen, glandium
bugs1273998
milestone49.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1273998 - Proper export of printing IPDL with --disable-printing r=bobowen,glandium,?glandium MozReview-Commit-ID: GNUrl6LKcMm
dom/ipc/ContentChild.cpp
layout/moz.build
layout/printing/moz.build
widget/moz.build
--- a/dom/ipc/ContentChild.cpp
+++ b/dom/ipc/ContentChild.cpp
@@ -106,17 +106,19 @@
 #include "nsAnonymousTemporaryFile.h"
 #include "nsISpellChecker.h"
 #include "nsClipboardProxy.h"
 #include "nsISystemMessageCache.h"
 #include "nsDirectoryService.h"
 #include "nsDirectoryServiceUtils.h"
 #include "nsDirectoryServiceDefs.h"
 #include "nsContentPermissionHelper.h"
+#ifdef NS_PRINTING
 #include "nsPrintingProxy.h"
+#endif
 
 #include "IHistory.h"
 #include "nsNetUtil.h"
 
 #include "base/message_loop.h"
 #include "base/process_util.h"
 #include "base/task.h"
 
--- a/layout/moz.build
+++ b/layout/moz.build
@@ -17,16 +17,21 @@ DIRS += [
     'xul',
     'ipc',
     'mathml',
     'inspector',
     'tools/recording',
     'reftests',
 ]
 
+
+IPDL_SOURCES = [
+    'printing/ipc/PRemotePrintJob.ipdl',
+]
+
 if CONFIG['NS_PRINTING']:
     DIRS += ['printing']
 
 TEST_DIRS += [
     'tools/reftest',
 ]
 
 DIRS += ['build', 'media']
--- a/layout/printing/moz.build
+++ b/layout/printing/moz.build
@@ -23,19 +23,15 @@ UNIFIED_SOURCES += [
     'nsPagePrintTimer.cpp',
     'nsPrintData.cpp',
     'nsPrintEngine.cpp',
     'nsPrintObject.cpp',
     'nsPrintPreviewListener.cpp',
     'PrintTranslator.cpp',
 ]
 
-IPDL_SOURCES = [
-    'ipc/PRemotePrintJob.ipdl',
-]
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '../base',
     '/dom/base',
 ]
--- a/widget/moz.build
+++ b/widget/moz.build
@@ -90,17 +90,16 @@ EXPORTS += [
     'CompositorWidgetProxy.h',
     'ContentHelper.h',
     'GfxDriverInfo.h',
     'GfxInfoBase.h',
     'GfxInfoCollector.h',
     'InputData.h',
     'nsBaseScreen.h',
     'nsBaseWidget.h',
-    'nsDeviceContextSpecProxy.h',
     'nsIDeviceContextSpec.h',
     'nsIKeyEventInPluginCallback.h',
     'nsIPluginWidget.h',
     'nsIRollupListener.h',
     'nsIWidget.h',
     'nsIWidgetListener.h',
     'nsWidgetInitData.h',
     'nsWidgetsCID.h',
@@ -146,24 +145,22 @@ UNIFIED_SOURCES += [
     'InputData.cpp',
     'nsBaseAppShell.cpp',
     'nsBaseDragService.cpp',
     'nsBaseScreen.cpp',
     'nsClipboardHelper.cpp',
     'nsClipboardProxy.cpp',
     'nsColorPickerProxy.cpp',
     'nsContentProcessWidgetFactory.cpp',
-    'nsDeviceContextSpecProxy.cpp',
     'nsDragServiceProxy.cpp',
     'nsFilePickerProxy.cpp',
     'nsHTMLFormatConverter.cpp',
     'nsIdleService.cpp',
     'nsIWidgetListener.cpp',
     'nsPrimitiveHelpers.cpp',
-    'nsPrintSession.cpp',
     'nsPrintSettingsImpl.cpp',
     'nsScreenManagerProxy.cpp',
     'nsTransferable.cpp',
     'nsXPLookAndFeel.cpp',
     'PluginWidgetProxy.cpp',
     'PuppetBidiKeyboard.cpp',
     'PuppetWidget.cpp',
     'ScreenProxy.cpp',
@@ -171,20 +168,23 @@ UNIFIED_SOURCES += [
     'TextEventDispatcher.cpp',
     'VsyncDispatcher.cpp',
     'WidgetEventImpl.cpp',
     'WidgetUtils.cpp',
 ]
 
 if CONFIG['MOZ_XUL'] and CONFIG['NS_PRINTING']:
     EXPORTS += [
+        'nsDeviceContextSpecProxy.h',
         'nsPrintOptionsImpl.h',
     ]
     UNIFIED_SOURCES += [
+        'nsDeviceContextSpecProxy.cpp',
         'nsPrintOptionsImpl.cpp',
+        'nsPrintSession.cpp',
     ]
 
 # nsBaseWidget.cpp needs to be built separately because of name clashes in the OS X headers
 SOURCES += [
     'nsBaseWidget.cpp',
 ]
 
 if CONFIG['MOZ_INSTRUMENT_EVENT_LOOP']: