Backed out 5 changesets (bug 806819) for WinXP test failures on a CLOSED TREE

Backed out changeset 009ae35b0c67 (bug 806819)
Backed out changeset 5a57f87f5061 (bug 806819)
Backed out changeset f06cd735b5b3 (bug 806819)
Backed out changeset e25a2a8d4af4 (bug 806819)
Backed out changeset 70a167982c3f (bug 806819)

configure.in

@@ -6911,7 +6911,6 @@ if test "$NS_DISABLE_LOGGING"; then
     AC_DEFINE(NS_DISABLE_LOGGING)
 else
     AC_DEFINE(MOZ_LOGGING)
-    AC_DEFINE(FORCE_PR_LOG)
 fi
 
 dnl ========================================================

content/base/src/moz.build

@@ -42,7 +42,7 @@ if CONFIG['MOZ_WEBRTC']:
         'nsDOMDataChannel.h',
         'nsDOMDataChannelDeclarations.h',
     ]
-    UNIFIED_SOURCES += [
+    SOURCES += [
         'nsDOMDataChannel.cpp',
     ]
     LOCAL_INCLUDES += [
@@ -122,7 +122,6 @@ UNIFIED_SOURCES += [
     'nsCSPService.cpp',
     'nsCSPUtils.cpp',
     'nsDataDocumentContentPolicy.cpp',
-    'nsDocument.cpp',
     'nsDocumentEncoder.cpp',
     'nsDOMAttributeMap.cpp',
     'nsDOMBlobBuilder.cpp',
@@ -151,7 +150,6 @@ UNIFIED_SOURCES += [
     'nsMixedContentBlocker.cpp',
     'nsNameSpaceManager.cpp',
     'nsNoDataProtocolContentPolicy.cpp',
-    'nsNodeInfoManager.cpp',
     'nsNodeUtils.cpp',
     'nsPlainTextSerializer.cpp',
     'nsPropertyTable.cpp',
@@ -186,6 +184,12 @@ SOURCES += [
     'nsImageLoadingContent.cpp',
 ]
 
+# These files cannot be built in unified mode because they use FORCE_PR_LOG
+SOURCES += [
+    'nsDocument.cpp',
+    'nsNodeInfoManager.cpp',
+]
+
 # These files cannot be built in unified mode because of OS X headers.
 SOURCES += [
     'nsContentUtils.cpp',

content/base/src/nsDOMDataChannel.cpp

@@ -6,6 +6,10 @@
 
 #include "nsDOMDataChannel.h"
 
+#ifdef MOZ_LOGGING
+#define FORCE_PR_LOG
+#endif
+
 #include "base/basictypes.h"
 #include "prlog.h"
 

content/base/src/nsDocument.cpp

@@ -18,6 +18,10 @@
 #include "mozilla/Likely.h"
 #include <algorithm>
 
+#ifdef MOZ_LOGGING
+// so we can get logging even in release builds
+#define FORCE_PR_LOG 1
+#endif
 #include "prlog.h"
 #include "plstr.h"
 #include "prprf.h"

content/base/src/nsNodeInfoManager.cpp

@@ -32,6 +32,10 @@
 using namespace mozilla;
 using mozilla::dom::NodeInfo;
 
+#ifdef MOZ_LOGGING
+// so we can get logging even in release builds
+#define FORCE_PR_LOG 1
+#endif
 #include "prlog.h"
 
 #ifdef PR_LOGGING

content/media/Latency.cpp

@@ -4,6 +4,9 @@
  * 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/. */
 
+// We want this available in opt builds
+#define FORCE_PR_LOG
+
 #include "Latency.h"
 #include "nsThreadUtils.h"
 #include "prlog.h"

content/media/moz.build

@@ -140,7 +140,6 @@ UNIFIED_SOURCES += [
     'EncodedBufferCache.cpp',
     'FileBlockCache.cpp',
     "GraphDriver.cpp",
-    'Latency.cpp',
     'MediaCache.cpp',
     'MediaData.cpp',
     'MediaDecoder.cpp',
@@ -178,8 +177,10 @@ if CONFIG['OS_TARGET'] == 'WINNT':
   SOURCES += [ 'ThreadPoolCOMListener.cpp' ]
 
 # DecoderTraits.cpp needs to be built separately because of Mac OS X headers.
+# Latency.cpp needs to be built separately because it forces NSPR logging.
 SOURCES += [
     'DecoderTraits.cpp',
+    'Latency.cpp',
 ]
 
 FAIL_ON_WARNINGS = True

content/media/webrtc/MediaEngineWebRTC.cpp

@@ -2,6 +2,14 @@
  * 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/. */
 
+#ifdef MOZ_LOGGING
+#define FORCE_PR_LOG
+#endif
+
+#if defined(PR_LOG)
+#error "This file must be #included before any IPDL-generated files or other files that #include prlog.h"
+#endif
+
 #include "nsIPrefService.h"
 #include "nsIPrefBranch.h"
 

docshell/base/moz.build

@@ -53,7 +53,6 @@ UNIFIED_SOURCES += [
     'LoadInfo.cpp',
     'nsAboutRedirector.cpp',
     'nsDefaultURIFixup.cpp',
-    'nsDocShell.cpp',
     'nsDocShellEditorData.cpp',
     'nsDocShellEnumerator.cpp',
     'nsDocShellLoadInfo.cpp',
@@ -64,6 +63,11 @@ UNIFIED_SOURCES += [
     'SerializedLoadContext.cpp',
 ]
 
+# nsDocShell.cpp cannot be built in unified mode because it forces NSPR logging.
+SOURCES += [
+    'nsDocShell.cpp',
+]
+
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True

docshell/base/nsDocShell.cpp

@@ -26,6 +26,11 @@
 #include "mozilla/VisualEventTracer.h"
 #include "URIUtils.h"
 
+#ifdef MOZ_LOGGING
+// so we can get logging even in release builds (but only for some things)
+#define FORCE_PR_LOG 1
+#endif
+
 #include "nsIContent.h"
 #include "nsIContentInlines.h"
 #include "nsIDocument.h"

dom/base/moz.build

@@ -94,7 +94,6 @@ UNIFIED_SOURCES += [
     'nsGlobalWindowCommands.cpp',
     'nsHistory.cpp',
     'nsIGlobalObject.cpp',
-    'nsJSEnvironment.cpp',
     'nsJSTimeoutHandler.cpp',
     'nsJSUtils.cpp',
     'nsLocation.cpp',
@@ -124,6 +123,8 @@ SOURCES += [
     'nsDOMWindowUtils.cpp',
     # This file has a #error "Never include windows.h in this file!"
     'nsGlobalWindow.cpp',
+    # This file forces NSPR logging.
+    'nsJSEnvironment.cpp',
     # nsPluginArray.cpp includes npapi.h indirectly, and that includes a lot of system headers
     'nsPluginArray.cpp',
 ]

dom/base/nsGlobalWindow.cpp

@@ -175,6 +175,10 @@
 #include "nsISupportsPrimitives.h"
 #include "nsXPCOMCID.h"
 #include "mozIThirdPartyUtil.h"
+#ifdef MOZ_LOGGING
+// so we can get logging even in release builds
+#define FORCE_PR_LOG 1
+#endif
 #include "prlog.h"
 #include "prenv.h"
 #include "prprf.h"

dom/base/nsJSEnvironment.cpp

@@ -73,6 +73,10 @@
 #endif
 #include "AccessCheck.h"
 
+#ifdef MOZ_LOGGING
+// Force PR_LOGGING so we can get JS strict warnings even in release builds
+#define FORCE_PR_LOG 1
+#endif
 #include "prlog.h"
 #include "prthread.h"
 

dom/ipc/moz.build

@@ -63,9 +63,9 @@ UNIFIED_SOURCES += [
 ]
 
 # Blob.cpp cannot be compiled in unified mode because it triggers a fatal gcc warning.
+# ContentChild.cpp cannot be compiled in unified mode because it forces NSPR logging.
 # CrashReporterChild.cpp cannot be compiled in unified mode because of name clashes
 # in OS X headers.
-# ContentChild.cpp cannot be compiled in unified mode on  linux due to Time conflict
 SOURCES += [
     'Blob.cpp',
     'ContentChild.cpp',

dom/plugins/base/moz.build

@@ -43,19 +43,20 @@ EXPORTS.mozilla += [
 
 UNIFIED_SOURCES += [
     'nsJSNPRuntime.cpp',
-    'nsNPAPIPluginInstance.cpp',
-    'nsNPAPIPluginStreamListener.cpp',
     'nsPluginInstanceOwner.cpp',
     'nsPluginModule.cpp',
     'nsPluginPlayPreviewInfo.cpp',
-    'nsPluginStreamListenerPeer.cpp',
-    'nsPluginTags.cpp',
     'PluginPRLibrary.cpp',
 ]
 
+# These files cannot be built in unified mode because they force NSPR logging.
 SOURCES += [
-    'nsNPAPIPlugin.cpp', # Conflict with X11 headers
-    'nsPluginHost.cpp',  # Conflict with NS_NPAPIPLUGIN_CALLBACK
+    'nsNPAPIPlugin.cpp',
+    'nsNPAPIPluginInstance.cpp',
+    'nsNPAPIPluginStreamListener.cpp',
+    'nsPluginHost.cpp',
+    'nsPluginStreamListenerPeer.cpp',
+    'nsPluginTags.cpp',
 ]
 
 if CONFIG['OS_ARCH'] == 'WINNT':

dom/plugins/base/nsPluginLogging.h

@@ -8,9 +8,11 @@
 #ifndef nsPluginLogging_h__
 #define nsPluginLogging_h__
 
-#include "prlog.h"
+#define FORCE_PR_LOG /* Allow logging in the release build */
+#define PR_LOGGING 1
 
 #ifdef PR_LOGGING
+#include "prlog.h"
 
 #ifndef PLUGIN_LOGGING    // allow external override
 #define PLUGIN_LOGGING 1  // master compile-time switch for pluging logging

dom/plugins/ipc/moz.build

@@ -46,14 +46,13 @@ if CONFIG['OS_ARCH'] == 'WINNT':
     EXPORTS.mozilla.plugins += [
         'PluginSurfaceParent.h',
     ]
-    UNIFIED_SOURCES += [
+    # These files cannot be built in unified mode because they force NSPR logging.
+    SOURCES += [
         'COMMessageFilter.cpp',
+        'MiniShmParent.cpp',
         'PluginHangUIParent.cpp',
         'PluginSurfaceParent.cpp',
     ]
-    SOURCES += [
-        'MiniShmParent.cpp', # Issues with CreateEvent
-    ]
     DEFINES['MOZ_HANGUI_PROCESS_NAME'] = '"plugin-hang-ui%s"' % CONFIG['BIN_SUFFIX']
     LOCAL_INCLUDES += [
         '/widget/shared',
@@ -69,11 +68,13 @@ if CONFIG['MOZ_ENABLE_QT']:
     GENERATED_SOURCES += [
         'moc_NestedLoopTimer.cpp',
     ]
-    UNIFIED_SOURCES += [
+    # These files cannot be built in unified mode because they force NSPR logging.
+    SOURCES += [
         'NestedLoopTimer.cpp',
     ]
 
-UNIFIED_SOURCES += [
+# These files cannot be built in unified mode because they force NSPR logging.
+SOURCES += [
     'BrowserStreamChild.cpp',
     'BrowserStreamParent.cpp',
     'ChildAsyncCall.cpp',
@@ -81,8 +82,10 @@ UNIFIED_SOURCES += [
     'PluginBackgroundDestroyer.cpp',
     'PluginIdentifierChild.cpp',
     'PluginIdentifierParent.cpp',
+    'PluginInstanceChild.cpp',
     'PluginInstanceParent.cpp',
     'PluginMessageUtils.cpp',
+    'PluginModuleChild.cpp',
     'PluginModuleParent.cpp',
     'PluginProcessChild.cpp',
     'PluginProcessParent.cpp',
@@ -92,13 +95,9 @@ UNIFIED_SOURCES += [
     'PluginStreamParent.cpp',
 ]
 
-SOURCES += [
-    'PluginInstanceChild.cpp', # 'PluginThreadCallback' : ambiguous symbol
-    'PluginModuleChild.cpp',   # Redefinition of mozilla::WindowsDllInterceptor sUser32Intercept
-]
-
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-    UNIFIED_SOURCES += [
+    # These files cannot be built in unified mode because they force NSPR logging.
+    SOURCES += [
         'PluginInterposeOSX.mm',
         'PluginUtilsOSX.mm',
     ]

extensions/auth/moz.build

@@ -4,12 +4,9 @@
 # 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/.
 
-UNIFIED_SOURCES += [
-    'nsAuthFactory.cpp',
-    'nsAuthGSSAPI.cpp',
-]
-
 SOURCES += [
+    'nsAuthFactory.cpp',       # forces NSPR logging
+    'nsAuthGSSAPI.cpp',        # forces NSPR logging
     'nsAuthSASL.cpp',
     'nsHttpNegotiateAuth.cpp', # contains constants whose names conflict with constants in other files
 ]
@@ -20,8 +17,8 @@ if CONFIG['OS_ARCH'] == 'WINNT':
     ]
     DEFINES['USE_SSPI'] = True
 else:
-    UNIFIED_SOURCES += [
-        'nsAuthSambaNTLM.cpp',
+    SOURCES += [
+        'nsAuthSambaNTLM.cpp', # forces NSPR logging
     ]
 
 FINAL_LIBRARY = 'xul'

extensions/auth/nsAuth.h

@@ -12,6 +12,10 @@ enum pType {
      PACKAGE_TYPE_NTLM
 };
 
+#if defined(MOZ_LOGGING)
+#define FORCE_PR_LOG
+#endif
+
 #include "prlog.h"
 
 #if defined( PR_LOGGING )

extensions/pref/autoconfig/src/moz.build

@@ -4,7 +4,8 @@
 # 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/.
 
-UNIFIED_SOURCES += [
+# These files cannot be built in unified mode because they force NSPR logging.
+SOURCES += [
     'nsAutoConfig.cpp',
     'nsConfigFactory.cpp',
     'nsJSConfigTriggers.cpp',

extensions/pref/autoconfig/src/nsAutoConfig.cpp

@@ -3,6 +3,10 @@
  * 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/. */
 
+#ifdef MOZ_LOGGING
+// sorry, this has to be before the pre-compiled header
+#define FORCE_PR_LOG /* Allow logging in the release build */
+#endif
 #include "nsAutoConfig.h"
 #include "nsIURI.h"
 #include "nsIHttpChannel.h"

extensions/pref/autoconfig/src/nsJSConfigTriggers.cpp

@@ -3,6 +3,10 @@
  * 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/. */
 
+#ifdef MOZ_LOGGING
+// sorry, this has to be before the pre-compiled header
+#define FORCE_PR_LOG /* Allow logging in the release build */
+#endif
 #include "jsapi.h"
 #include "nsIXPConnect.h"
 #include "nsIJSRuntimeService.h"

extensions/pref/autoconfig/src/nsReadConfig.cpp

@@ -3,6 +3,10 @@
  * 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/. */
 
+#ifdef MOZ_LOGGING
+// sorry, this has to be before the pre-compiled header
+#define FORCE_PR_LOG /* Allow logging in the release build */
+#endif
 #include "nsReadConfig.h"
 #include "nsAppDirectoryServiceDefs.h"
 #include "nsIAppStartup.h"

gfx/thebes/gfxDWriteFontList.cpp

@@ -6,6 +6,10 @@
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/MemoryReporting.h"
 
+#ifdef MOZ_LOGGING
+#define FORCE_PR_LOG /* Allow logging in the release build */
+#endif /* MOZ_LOGGING */
+
 #include "gfxDWriteFontList.h"
 #include "gfxDWriteFonts.h"
 #include "nsUnicharUtils.h"

gfx/thebes/gfxFont.cpp

@@ -7,6 +7,9 @@
 #include "mozilla/DebugOnly.h"
 #include "mozilla/MathAlgorithms.h"
 
+#ifdef MOZ_LOGGING
+#define FORCE_PR_LOG /* Allow logging in the release build */
+#endif
 #include "prlog.h"
 
 #include "nsExpirationTracker.h"

gfx/thebes/gfxFontEntry.cpp

@@ -6,6 +6,9 @@
 #include "mozilla/DebugOnly.h"
 #include "mozilla/MathAlgorithms.h"
 
+#ifdef MOZ_LOGGING
+#define FORCE_PR_LOG /* Allow logging in the release build */
+#endif
 #include "prlog.h"
 
 #include "nsServiceManagerUtils.h"

gfx/thebes/gfxFontUtils.cpp

@@ -3,6 +3,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/. */
 
+#ifdef MOZ_LOGGING
+#define FORCE_PR_LOG /* Allow logging in the release build */
+#include "prlog.h"
+#endif
+
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/BinarySearch.h"
 

gfx/thebes/gfxGDIFontList.cpp

@@ -6,6 +6,9 @@
 #include "mozilla/DebugOnly.h"
 #include <algorithm>
 
+#ifdef MOZ_LOGGING
+#define FORCE_PR_LOG /* Allow logging in the release build */
+#endif
 #include "prlog.h"
 
 #include "gfxGDIFontList.h"

gfx/thebes/gfxMacPlatformFontList.mm

@@ -38,6 +38,9 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+#ifdef MOZ_LOGGING
+#define FORCE_PR_LOG /* Allow logging in the release build */
+#endif
 #include "prlog.h"
 
 #include <algorithm>

gfx/thebes/gfxPlatform.cpp

@@ -3,6 +3,10 @@
  * 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/. */
 
+#ifdef MOZ_LOGGING
+#define FORCE_PR_LOG /* Allow logging in the release build */
+#endif
+
 #include "mozilla/layers/AsyncTransactionTracker.h" // for AsyncTransactionTracker
 #include "mozilla/layers/CompositorChild.h"
 #include "mozilla/layers/CompositorParent.h"

gfx/thebes/gfxPlatformFontList.cpp

@@ -3,6 +3,9 @@
  * 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/. */
 
+#ifdef MOZ_LOGGING
+#define FORCE_PR_LOG /* Allow logging in the release build */
+#endif
 #include "prlog.h"
 
 #include "gfxPlatformFontList.h"

gfx/thebes/gfxUserFontSet.cpp

@@ -3,6 +3,9 @@
  * 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/. */
 
+#ifdef MOZ_LOGGING
+#define FORCE_PR_LOG /* Allow logging in the release build */
+#endif /* MOZ_LOGGING */
 #include "prlog.h"
 
 #include "gfxUserFontSet.h"

gfx/thebes/moz.build

@@ -169,6 +169,7 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
         'gfxWindowsPlatform.h',
         'gfxWindowsSurface.h',
     ]
+    # gfxGDIFontList.cpp forces NSPR logging, so it cannot be built in unified mode.
     SOURCES += [
         'gfxGDIFont.cpp',
         'gfxGDIFontList.cpp',
@@ -178,12 +179,11 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
         'gfxWindowsSurface.cpp',
     ]
     if CONFIG['MOZ_ENABLE_DWRITE_FONT']:
-        UNIFIED_SOURCES += [
-            'gfxDWriteFontList.cpp',
-        ]
+        # gfxDWriteFontList.cpp forces NSPR logging, so it cannot be built in unified mode.
         SOURCES += [
             'gfxD2DSurface.cpp',
             'gfxDWriteCommon.cpp',
+            'gfxDWriteFontList.cpp',
             'gfxDWriteFonts.cpp',
         ]
     if CONFIG['MOZ_ENABLE_DIRECT2D1_1']:
@@ -204,9 +204,19 @@ SOURCES += [
     # we could consider removing soon (affects Ubuntus older than 10.04 LTS)
     # which currently prevent it from joining UNIFIED_SOURCES.
     'gfxDrawable.cpp',
-    # gfxPlatform.cpp includes mac system header conflicting with point/size
+    # Uses FORCE_PR_LOG
+    'gfxFont.cpp',
+    # Uses FORCE_PR_LOG
+    'gfxFontEntry.cpp',
+    # Uses FORCE_PR_LOG
+    'gfxFontUtils.cpp',
+    # Includes mac system header conflicting with point/size, and also uses FORCE_PR_LOG
     'gfxPlatform.cpp',
+    # Uses FORCE_PR_LOG
+    'gfxPlatformFontList.cpp',
     'gfxPrefs.cpp',
+    # Uses FORCE_PR_LOG
+    'gfxUserFontSet.cpp',
 ]
 
 UNIFIED_SOURCES += [
@@ -216,13 +226,10 @@ UNIFIED_SOURCES += [
     'gfxBaseSharedMemorySurface.cpp',
     'gfxBlur.cpp',
     'gfxContext.cpp',
-    'gfxFont.cpp',
-    'gfxFontEntry.cpp',
     'gfxFontFeatures.cpp',
     'gfxFontInfoLoader.cpp',
     'gfxFontMissingGlyphs.cpp',
     'gfxFontTest.cpp',
-    'gfxFontUtils.cpp',
     'gfxGlyphExtents.cpp',
     'gfxGradientCache.cpp',
     'gfxGraphiteShaper.cpp',
@@ -231,7 +238,6 @@ UNIFIED_SOURCES += [
     'gfxMathTable.cpp',
     'gfxMatrix.cpp',
     'gfxPattern.cpp',
-    'gfxPlatformFontList.cpp',
     'gfxRect.cpp',
     'gfxReusableImageSurfaceWrapper.cpp',
     'gfxReusableSharedImageSurfaceWrapper.cpp',
@@ -240,14 +246,14 @@ UNIFIED_SOURCES += [
     'gfxSVGGlyphs.cpp',
     'gfxTeeSurface.cpp',
     'gfxTextRun.cpp',
-    'gfxUserFontSet.cpp',
     'gfxUtils.cpp',
     'nsSurfaceTexture.cpp',
     'nsUnicodeRange.cpp',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-    UNIFIED_SOURCES += [
+    # gfxMacPlatformFontList.mm forces NSPR logging so it cannot be built in unified mode.
+    SOURCES += [
         'gfxMacPlatformFontList.mm',
     ]
 

image/public/ImageLogging.h

@@ -7,6 +7,16 @@
 #ifndef ImageLogging_h
 #define ImageLogging_h
 
+// In order for FORCE_PR_LOG below to work, we have to define it before the
+// first time prlog is #included.
+#if defined(PR_LOG)
+#error "Must #include ImageLogging.h before before any IPDL-generated files or other files that #include prlog.h."
+#endif
+
+#if defined(MOZ_LOGGING)
+#define FORCE_PR_LOG
+#endif
+
 #include "prlog.h"
 #include "prinrval.h"
 #include "nsString.h"

js/xpconnect/loader/moz.build

@@ -5,6 +5,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # These files cannot be built in unified mode because they rely on plarena.h
+# and they want to force NSPR logging.
 SOURCES += [
     'mozJSComponentLoader.cpp',
     'mozJSLoaderUtils.cpp',

js/xpconnect/loader/mozJSComponentLoader.cpp

@@ -6,6 +6,10 @@
 
 #include "mozilla/Attributes.h"
 
+#ifdef MOZ_LOGGING
+#define FORCE_PR_LOG
+#endif
+
 #include <cstdarg>
 
 #include "prlog.h"

layout/base/moz.build

@@ -80,7 +80,6 @@ UNIFIED_SOURCES += [
     'nsCSSRenderingBorders.cpp',
     'nsDisplayList.cpp',
     'nsDisplayListInvalidation.cpp',
-    'nsDocumentViewer.cpp',
     'nsFrameManager.cpp',
     'nsFrameTraversal.cpp',
     'nsGenConList.cpp',
@@ -88,7 +87,6 @@ UNIFIED_SOURCES += [
     'nsLayoutHistoryState.cpp',
     'nsLayoutUtils.cpp',
     'nsPresContext.cpp',
-    'nsPresShell.cpp',
     'nsQuoteList.cpp',
     'nsStyleChangeList.cpp',
     'nsStyleSheetService.cpp',
@@ -101,10 +99,14 @@ UNIFIED_SOURCES += [
     'TouchCaret.cpp',
 ]
 
+# nsDocumentViewer.cpp and nsPresShell.cpp need to be built separately
+# because they force NSPR logging.
 # nsPresArena.cpp needs to be built separately because it uses plarena.h.
 # nsRefreshDriver.cpp needs to be built separately because of name clashes in the OS X headers
 SOURCES += [
+    'nsDocumentViewer.cpp',
     'nsPresArena.cpp',
+    'nsPresShell.cpp',
     'nsRefreshDriver.cpp',
 ]
 

layout/base/nsDocumentViewer.cpp

@@ -130,6 +130,10 @@ using namespace mozilla::dom;
 
 //-----------------------------------------------------
 // PR LOGGING
+#ifdef MOZ_LOGGING
+#define FORCE_PR_LOG /* Allow logging in the release build */
+#endif
+
 #include "prlog.h"
 
 #ifdef PR_LOGGING

layout/base/nsPresShell.cpp

@@ -18,6 +18,9 @@
 
 /* a presentation of a document, part 2 */
 
+#ifdef MOZ_LOGGING
+#define FORCE_PR_LOG /* Allow logging in the release build */
+#endif
 #include "prlog.h"
 
 #include "mozilla/ArrayUtils.h"

layout/printing/moz.build

@@ -14,12 +14,16 @@ XPIDL_MODULE = 'layout_printing'
 
 UNIFIED_SOURCES += [
     'nsPagePrintTimer.cpp',
-    'nsPrintData.cpp',
-    'nsPrintEngine.cpp',
     'nsPrintObject.cpp',
     'nsPrintPreviewListener.cpp',
 ]
 
+# These files cannot be built in unified mode because they force NSPR logging.
+SOURCES += [
+    'nsPrintData.cpp',
+    'nsPrintEngine.cpp',
+]
+
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'xul'

layout/printing/nsPrintData.cpp

@@ -14,6 +14,10 @@
 
 //-----------------------------------------------------
 // PR LOGGING
+#ifdef MOZ_LOGGING
+#define FORCE_PR_LOG /* Allow logging in the release build */
+#endif
+
 #include "prlog.h"
 
 #ifdef PR_LOGGING

layout/printing/nsPrintEngine.cpp

@@ -127,6 +127,10 @@ using namespace mozilla::dom;
 
 //-----------------------------------------------------
 // PR LOGGING
+#ifdef MOZ_LOGGING
+#define FORCE_PR_LOG /* Allow logging in the release build */
+#endif
+
 #include "prlog.h"
 
 #ifdef PR_LOGGING

layout/style/FontFaceSet.cpp

@@ -6,6 +6,9 @@
 
 #include "FontFaceSet.h"
 
+#ifdef MOZ_LOGGING
+#define FORCE_PR_LOG /* Allow logging in the release build */
+#endif /* MOZ_LOGGING */
 #include "prlog.h"
 
 #include "mozilla/css/Loader.h"

layout/style/Loader.cpp

@@ -254,6 +254,9 @@ private:
   void FireLoadEvent(nsIThreadInternal* aThread);
 };
 
+#ifdef MOZ_LOGGING
+// #define FORCE_PR_LOG /* Allow logging in the release build */
+#endif /* MOZ_LOGGING */
 #include "prlog.h"
 
 #ifdef PR_LOGGING

layout/style/moz.build

@@ -117,7 +117,6 @@ UNIFIED_SOURCES += [
     'nsDOMCSSRect.cpp',
     'nsDOMCSSRGBColor.cpp',
     'nsDOMCSSValueList.cpp',
-    'nsFontFaceLoader.cpp',
     'nsHTMLCSSStyleSheet.cpp',
     'nsHTMLStyleSheet.cpp',
     'nsLayoutStylesheetCache.cpp',
@@ -138,11 +137,13 @@ UNIFIED_SOURCES += [
     'SVGAttrAnimationRuleProcessor.cpp',
 ]
 
-# FontFaceSet.cpp needs to be built separately because it redefines LOG.
 # nsCSSRuleProcessor.cpp needs to be built separately because it uses plarena.h.
+# FontFaceSet.cpp and nsFontFaceLoader.cpp need to be built separately because
+# they force NSPR logging.
 SOURCES += [
     'FontFaceSet.cpp',
     'nsCSSRuleProcessor.cpp',
+    'nsFontFaceLoader.cpp',
 ]
 
 FAIL_ON_WARNINGS = True

layout/style/nsFontFaceLoader.cpp

@@ -6,6 +6,9 @@
 
 /* code for loading in @font-face defined font data */
 
+#ifdef MOZ_LOGGING
+#define FORCE_PR_LOG /* Allow logging in the release build */
+#endif /* MOZ_LOGGING */
 #include "prlog.h"
 
 #include "nsFontFaceLoader.h"

media/mtransport/build/moz.build

@@ -27,9 +27,7 @@ EXPORTS.mtransport += [
 
 include('../objs.mozbuild')
 
-# These files cannot be built in unified mode because of the redefinition of
-# getLogModule, UNIMPLEMENTED, nr_socket_long_term_violation_time,
-# nr_socket_short_term_violation_time.
+# These files cannot be built in unified mode because they force NSPR logging.
 SOURCES += mtransport_cppsrcs
 
 FAIL_ON_WARNINGS = True

media/mtransport/logging.h

@@ -9,6 +9,15 @@
 #ifndef logging_h__
 #define logging_h__
 
+#if defined(PR_LOG)
+#error "Must #include logging.h before any IPDL-generated files or other files that #include prlog.h."
+#endif
+
+// Enforce logging under production builds for MOZ_MTLOG friends.
+#ifndef PR_LOGGING
+#define FORCE_PR_LOG 1
+#endif
+
 #include <sstream>
 #include <prlog.h>
 

media/mtransport/standalone/moz.build

@@ -6,9 +6,7 @@
 
 include('../objs.mozbuild')
 
-# These files cannot be built in unified mode because of the redefinition of
-# getLogModule, UNIMPLEMENTED, nr_socket_long_term_violation_time,
-# nr_socket_short_term_violation_time.
+# These files cannot be built in unified mode because they force NSPR logging.
 SOURCES += mtransport_cppsrcs
 
 Library('mtransport_s')

media/webrtc/moz.build

@@ -51,54 +51,153 @@ if CONFIG['MOZ_WEBRTC_SIGNALING']:
         build_for_test=0
     )
     GYP_DIRS['signaling'].sandbox_vars['FINAL_LIBRARY'] = 'xul'
-    # Excluded because of name clash in the logTag variable
     signaling_non_unified_sources = [
+        'signaling/src/sipcc/core/gsm/fim.c',        # Because of name clash in the logTag variable
+        'signaling/src/sipcc/core/gsm/gsm_sdp.c',    # Because of name clash in the logTag variable
+        'signaling/src/sipcc/core/gsm/lsm.c',        # Because of name clash in the logTag variable
+        'signaling/src/sipcc/core/sdp/sdp_base64.c', # Because of name clash with the macro PADDING
+    ]
+    # These files cannot be built in unified mode because they force NSPR logging.
+    signaling_non_unified_sources_2 = [
+        'signaling/src/callcontrol/CallControlManagerImpl.cpp',
+        'signaling/src/common/browser_logging/CSFLog.cpp',
         'signaling/src/media-conduit/AudioConduit.cpp',
         'signaling/src/media-conduit/CodecStatistics.cpp',
         'signaling/src/media-conduit/VideoConduit.cpp',
+        'signaling/src/media-conduit/WebrtcOMXH264VideoCodec.cpp',
         'signaling/src/media/CSFAudioControlWrapper.cpp',
         'signaling/src/media/CSFVideoControlWrapper.cpp',
         'signaling/src/media/VcmSIPCCBinding.cpp',
+        'signaling/src/mediapipeline/MediaPipeline.cpp',
+        'signaling/src/mediapipeline/MediaPipelineFilter.cpp',
+        'signaling/src/mediapipeline/SrtpFlow.cpp',
+        'signaling/src/peerconnection/MediaStreamList.cpp',
         'signaling/src/peerconnection/PeerConnectionCtx.cpp',
         'signaling/src/peerconnection/PeerConnectionImpl.cpp',
         'signaling/src/peerconnection/PeerConnectionMedia.cpp',
         'signaling/src/peerconnection/WebrtcGlobalInformation.cpp',
+        'signaling/src/sipcc/core/ccapp/call_logger.c',
+        'signaling/src/sipcc/core/ccapp/capability_set.c',
+        'signaling/src/sipcc/core/ccapp/cc_call_feature.c',
+        'signaling/src/sipcc/core/ccapp/cc_config.c',
+        'signaling/src/sipcc/core/ccapp/cc_device_feature.c',
+        'signaling/src/sipcc/core/ccapp/cc_device_manager.c',
+        'signaling/src/sipcc/core/ccapp/cc_info.c',
+        'signaling/src/sipcc/core/ccapp/cc_service.c',
+        'signaling/src/sipcc/core/ccapp/ccapi_call.c',
+        'signaling/src/sipcc/core/ccapp/ccapi_call_info.c',
+        'signaling/src/sipcc/core/ccapp/ccapi_config.c',
+        'signaling/src/sipcc/core/ccapp/ccapi_device.c',
         'signaling/src/sipcc/core/ccapp/ccapi_device_info.c',
-        'signaling/src/sipcc/core/gsm/fim.c',
-        'signaling/src/sipcc/core/gsm/gsm_sdp.c',
-        'signaling/src/sipcc/core/gsm/lsm.c',
+        'signaling/src/sipcc/core/ccapp/ccapi_feature_info.c',
+        'signaling/src/sipcc/core/ccapp/ccapi_line_info.c',
+        'signaling/src/sipcc/core/ccapp/ccapi_service.c',
+        'signaling/src/sipcc/core/ccapp/ccapi_snapshot.c',
+        'signaling/src/sipcc/core/ccapp/ccapp_task.c',
+        'signaling/src/sipcc/core/ccapp/ccprovider.c',
+        'signaling/src/sipcc/core/ccapp/conf_roster.c',
+        'signaling/src/sipcc/core/common/cfgfile_utils.c',
+        'signaling/src/sipcc/core/common/config_api.c',
+        'signaling/src/sipcc/core/common/config_parser.c',
+        'signaling/src/sipcc/core/common/init.c',
+        'signaling/src/sipcc/core/common/logger.c',
+        'signaling/src/sipcc/core/common/misc.c',
+        'signaling/src/sipcc/core/common/plat.c',
+        'signaling/src/sipcc/core/common/platform_api.c',
+        'signaling/src/sipcc/core/common/prot_configmgr.c',
+        'signaling/src/sipcc/core/common/resource_manager.c',
+        'signaling/src/sipcc/core/common/subscription_handler.c',
+        'signaling/src/sipcc/core/common/ui.c',
+        'signaling/src/sipcc/core/gsm/ccapi.c',
+        'signaling/src/sipcc/core/gsm/ccapi_strings.c',
+        'signaling/src/sipcc/core/gsm/dcsm.c',
+        'signaling/src/sipcc/core/gsm/fsm.c',
+        'signaling/src/sipcc/core/gsm/fsmb2bcnf.c',
+        'signaling/src/sipcc/core/gsm/fsmcac.c',
+        'signaling/src/sipcc/core/gsm/fsmcnf.c',
+        'signaling/src/sipcc/core/gsm/fsmdef.c',
+        'signaling/src/sipcc/core/gsm/fsmxfr.c',
+        'signaling/src/sipcc/core/gsm/gsm.c',
+        'signaling/src/sipcc/core/gsm/gsm_sdp_crypto.c',
+        'signaling/src/sipcc/core/gsm/media_cap_tbl.c',
+        'signaling/src/sipcc/core/gsm/sm.c',
+        'signaling/src/sipcc/core/gsm/subapi.c',
+        'signaling/src/sipcc/core/sdp/ccsdp.c',
         'signaling/src/sipcc/core/sdp/sdp_access.c',
         'signaling/src/sipcc/core/sdp/sdp_attr.c',
         'signaling/src/sipcc/core/sdp/sdp_attr_access.c',
         'signaling/src/sipcc/core/sdp/sdp_config.c',
         'signaling/src/sipcc/core/sdp/sdp_main.c',
+        'signaling/src/sipcc/core/sdp/sdp_services_unix.c',
         'signaling/src/sipcc/core/sdp/sdp_token.c',
         'signaling/src/sipcc/core/sdp/sdp_utils.c',
+        'signaling/src/sipcc/core/sipstack/ccsip_callinfo.c',
+        'signaling/src/sipcc/core/sipstack/ccsip_cc.c',
+        'signaling/src/sipcc/core/sipstack/ccsip_common_util.c',
+        'signaling/src/sipcc/core/sipstack/ccsip_core.c',
+        'signaling/src/sipcc/core/sipstack/ccsip_debug.c',
+        'signaling/src/sipcc/core/sipstack/ccsip_info.c',
+        'signaling/src/sipcc/core/sipstack/ccsip_messaging.c',
+        'signaling/src/sipcc/core/sipstack/ccsip_platform.c',
+        'signaling/src/sipcc/core/sipstack/ccsip_platform_tcp.c',
+        'signaling/src/sipcc/core/sipstack/ccsip_platform_timers.c',
+        'signaling/src/sipcc/core/sipstack/ccsip_platform_tls.c',
+        'signaling/src/sipcc/core/sipstack/ccsip_platform_udp.c',
+        'signaling/src/sipcc/core/sipstack/ccsip_pmh.c',
+        'signaling/src/sipcc/core/sipstack/ccsip_publish.c',
+        'signaling/src/sipcc/core/sipstack/ccsip_register.c',
+        'signaling/src/sipcc/core/sipstack/ccsip_reldev.c',
+        'signaling/src/sipcc/core/sipstack/ccsip_sdp.c',
+        'signaling/src/sipcc/core/sipstack/ccsip_spi_utils.c',
+        'signaling/src/sipcc/core/sipstack/ccsip_subsmanager.c',
+        'signaling/src/sipcc/core/sipstack/ccsip_task.c',
+        'signaling/src/sipcc/core/sipstack/httpish.c',
+        'signaling/src/sipcc/core/sipstack/sip_common_regmgr.c',
+        'signaling/src/sipcc/core/sipstack/sip_common_transport.c',
+        'signaling/src/sipcc/core/sipstack/sip_csps_transport.c',
+        'signaling/src/sipcc/core/sipstack/sip_interface_regmgr.c',
+        'signaling/src/sipcc/core/sipstack/sip_platform_task.c',
+        'signaling/src/sipcc/core/sipstack/sip_platform_win32_task.c',
+        'signaling/src/sipcc/core/src-common/configapp.c',
+        'signaling/src/sipcc/core/src-common/dialplan.c',
+        'signaling/src/sipcc/core/src-common/dialplanint.c',
+        'signaling/src/sipcc/core/src-common/digcalc.c',
+        'signaling/src/sipcc/core/src-common/kpml_common_util.c',
+        'signaling/src/sipcc/core/src-common/kpmlmap.c',
+        'signaling/src/sipcc/core/src-common/misc_apps_task.c',
+        'signaling/src/sipcc/core/src-common/pres_sub_not_handler.c',
+        'signaling/src/sipcc/core/src-common/publish_int.c',
+        'signaling/src/sipcc/core/src-common/string_lib.c',
+        'signaling/src/sipcc/core/src-common/util_ios_queue.c',
+        'signaling/src/sipcc/cpr/android/cpr_android_init.c',
+        'signaling/src/sipcc/cpr/android/cpr_android_stdio.c',
+        'signaling/src/sipcc/cpr/android/cpr_android_timers_using_select.c',
+        'signaling/src/sipcc/cpr/darwin/cpr_darwin_init.c',
+        'signaling/src/sipcc/cpr/darwin/cpr_darwin_stdio.c',
+        'signaling/src/sipcc/cpr/darwin/cpr_darwin_timers_using_select.c',
+        'signaling/src/sipcc/cpr/linux/cpr_linux_init.c',
+        'signaling/src/sipcc/cpr/linux/cpr_linux_stdio.c',
+        'signaling/src/sipcc/cpr/linux/cpr_linux_timers_using_select.c',
+        'signaling/src/sipcc/cpr/win32/cpr_win_stdio.c',
+        'signaling/src/sipcc/cpr/win32/cpr_win_timers.c',
+        'signaling/src/sipcc/plat/common/dns_utils.c',
+        'signaling/src/sipcc/plat/csf2g/reset_api.c',
+        'signaling/src/sipcc/plat/win32/dns_utils.c',
+        'signaling/src/sipcc/plat/win32/mystub.c',
+        'signaling/src/sipcc/plat/win32/plat_api_stub.c',
+        'signaling/src/sipcc/plat/win32/plat_api_win.c',
         'signaling/src/softphonewrapper/CC_SIPCCCall.cpp',
         'signaling/src/softphonewrapper/CC_SIPCCCallInfo.cpp',
+        'signaling/src/softphonewrapper/CC_SIPCCCallServerInfo.cpp',
+        'signaling/src/softphonewrapper/CC_SIPCCDevice.cpp',
+        'signaling/src/softphonewrapper/CC_SIPCCDeviceInfo.cpp',
+        'signaling/src/softphonewrapper/CC_SIPCCFeatureInfo.cpp',
+        'signaling/src/softphonewrapper/CC_SIPCCLine.cpp',
+        'signaling/src/softphonewrapper/CC_SIPCCLineInfo.cpp',
         'signaling/src/softphonewrapper/CC_SIPCCService.cpp',
         'signaling/src/softphonewrapper/ccapi_plat_api_impl.cpp',
     ]
 
-    # Excluded for various symbol conflicts
-    signaling_non_unified_sources_2 = [
-        'signaling/src/mediapipeline/MediaPipelineFilter.cpp',
-        'signaling/src/mediapipeline/SrtpFlow.cpp',
-        'signaling/src/sipcc/core/ccapp/ccapi_call_info.c',
-        'signaling/src/sipcc/core/ccapp/ccprovider.c',
-        'signaling/src/sipcc/core/common/platform_api.c',
-        'signaling/src/sipcc/core/common/ui.c',
-        'signaling/src/sipcc/core/gsm/ccapi_strings.c',
-        'signaling/src/sipcc/core/gsm/fsm.c',
-        'signaling/src/sipcc/core/gsm/fsmcac.c',
-        'signaling/src/sipcc/core/gsm/fsmdef.c',
-        'signaling/src/sipcc/core/sdp/sdp_base64.c',      # Because of name clash with the macro PADDING
-        'signaling/src/sipcc/core/sipstack/ccsip_cc.c',
-        'signaling/src/sipcc/core/sipstack/sip_common_transport.c',
-        'signaling/src/sipcc/core/sipstack/sip_platform_task.c',
-        'signaling/src/sipcc/core/src-common/string_lib.c',
-    ]
-
     GYP_DIRS['signaling'].non_unified_sources += signaling_non_unified_sources
     GYP_DIRS['signaling'].non_unified_sources += signaling_non_unified_sources_2
 

media/webrtc/signaling/src/common/browser_logging/CSFLog.h

@@ -5,6 +5,16 @@
 #ifndef CSFLOG_H
 #define CSFLOG_H
 
+// In order for FORCE_PR_LOG below to work, we have to define it before the
+// first time prlog is #included.
+#if defined(PR_LOG)
+#error "Must #include CSFLog.h before before any IPDL-generated files or other files that #include prlog.h."
+#endif
+
+#if defined(MOZ_LOGGING)
+#define FORCE_PR_LOG
+#endif
+
 #include <stdarg.h>
 #include "prlog.h"
 

netwerk/base/src/moz.build

@@ -28,7 +28,6 @@ UNIFIED_SOURCES += [
     'EventTokenBucket.cpp',
     'LoadContextInfo.cpp',
     'NetworkActivityMonitor.cpp',
-    'nsAsyncRedirectVerifyHelper.cpp',
     'nsAsyncStreamCopier.cpp',
     'nsAuthInformationHolder.cpp',
     'nsBase64Encoder.cpp',
@@ -60,8 +59,6 @@ UNIFIED_SOURCES += [
     'nsSimpleNestedURI.cpp',
     'nsSimpleStreamListener.cpp',
     'nsSimpleURI.cpp',
-    'nsSocketTransport2.cpp',
-    'nsSocketTransportService2.cpp',
     'nsStandardURL.cpp',
     'nsStreamListenerTee.cpp',
     'nsStreamListenerWrapper.cpp',
@@ -83,6 +80,13 @@ UNIFIED_SOURCES += [
     'TLSServerSocket.cpp',
 ]
 
+# These files cannot be built in unified mode because they force NSPR logging.
+SOURCES += [
+    'nsAsyncRedirectVerifyHelper.cpp',
+    'nsSocketTransport2.cpp',
+    'nsSocketTransportService2.cpp',
+]
+
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     SOURCES += [
         'nsAutodialWin.cpp',

netwerk/base/src/nsAsyncRedirectVerifyHelper.cpp

@@ -3,6 +3,10 @@
  * 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/. */
 
+#ifdef MOZ_LOGGING
+#define FORCE_PR_LOG
+#endif
+
 #include "prlog.h"
 #include "nsAsyncRedirectVerifyHelper.h"
 #include "nsThreadUtils.h"

netwerk/base/src/nsSocketTransport2.cpp

@@ -4,6 +4,10 @@
  * 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/. */
 
+#ifdef MOZ_LOGGING
+#define FORCE_PR_LOG
+#endif
+
 #include "nsSocketTransport2.h"
 
 #include "mozilla/Attributes.h"

netwerk/base/src/nsSocketTransportService2.cpp

@@ -3,6 +3,10 @@
  * 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/. */
 
+#ifdef MOZ_LOGGING
+#define FORCE_PR_LOG
+#endif
+
 #include "nsSocketTransportService2.h"
 #include "nsSocketTransport2.h"
 #include "nsError.h"

netwerk/cache/moz.build

@@ -21,7 +21,8 @@ EXPORTS += [
     'nsDeleteDir.h'
 ]
 
-UNIFIED_SOURCES += [
+# These files cannot be built in unified mode because they force NSPR logging.
+SOURCES += [
     'nsApplicationCacheService.cpp',
     'nsCache.cpp',
     'nsCacheEntry.cpp',

netwerk/cache/nsCache.h

@@ -11,6 +11,14 @@
 #ifndef _nsCache_h_
 #define _nsCache_h_
 
+#if defined(MOZ_LOGGING)
+#define FORCE_PR_LOG
+#endif
+
+#if defined(PR_LOG)
+#error "If nsCache.h #included it must come before any files that #include prlog.h"
+#endif
+
 #include "prlog.h"
 #include "nsISupports.h"
 #include "nsIFile.h"

netwerk/cache2/CacheLog.h

@@ -5,6 +5,14 @@
 #ifndef Cache2Log__h__
 #define Cache2Log__h__
 
+#if defined(MOZ_LOGGING)
+#define FORCE_PR_LOG
+#endif
+
+#if defined(PR_LOG)
+#error "If nsCache.h #included it must come before any files that #include prlog.h"
+#endif
+
 #include "prlog.h"
 
 namespace mozilla {

netwerk/cookie/moz.build

@@ -28,7 +28,7 @@ if CONFIG['NECKO_COOKIES']:
         'CookieServiceParent.cpp',
         'nsCookie.cpp',
     ]
-    # nsCookieService.cpp can't be unified because of symbol conflicts
+    # nsCookieService.cpp can't be unified because it forces NSPR logging.
     SOURCES += [
         'nsCookieService.cpp',
     ]

netwerk/cookie/nsCookieService.cpp

@@ -8,6 +8,11 @@
 #include "mozilla/DebugOnly.h"
 #include "mozilla/Likely.h"
 
+#ifdef MOZ_LOGGING
+// this next define has to appear before the include of prlog.h
+#define FORCE_PR_LOG // Allow logging in the release build
+#endif
+
 #include "mozilla/net/CookieServiceChild.h"
 #include "mozilla/net/NeckoCommon.h"
 

netwerk/dns/GetAddrInfo.cpp

@@ -4,6 +4,10 @@
  * 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/. */
 
+#if defined(MOZ_LOGGING)
+#define FORCE_PR_LOG
+#endif
+
 #include "GetAddrInfo.h"
 #include "mozilla/net/DNS.h"
 #include "prnetdb.h"

netwerk/dns/moz.build

@@ -25,8 +25,9 @@ EXPORTS.mozilla.net += [
 ]
 
 SOURCES += [
+    'GetAddrInfo.cpp',           # Excluded from UNIFIED_SOURCES due to NSPR forced logging.
     'nsEffectiveTLDService.cpp', # Excluded from UNIFIED_SOURCES due to special build flags.
-    'nsHostResolver.cpp', # Redefines LOG
+    'nsHostResolver.cpp',        # Excluded from UNIFIED_SOURCES due to NSPR forced logging.
 ]
 
 UNIFIED_SOURCES += [
@@ -35,7 +36,6 @@ UNIFIED_SOURCES += [
     'DNSListenerProxy.cpp',
     'DNSRequestChild.cpp',
     'DNSRequestParent.cpp',
-    'GetAddrInfo.cpp',
     'nameprep.c',
     'nsDNSService2.cpp',
     'nsIDNService.cpp',

netwerk/dns/nsHostResolver.cpp

@@ -3,6 +3,10 @@
  * 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/. */
 
+#if defined(MOZ_LOGGING)
+#define FORCE_PR_LOG
+#endif
+
 #if defined(HAVE_RES_NINIT)
 #include <sys/types.h>
 #include <netinet/in.h>

netwerk/protocol/http/HttpLog.h

@@ -18,6 +18,27 @@
  *  Yes, this is kludgy.
  *******************************************************************************/
 
+
+// e10s mess: IPDL-generated headers include chromium files that both #include
+// prlog.h, and #define LOG in conflict with this file.
+// Solution: (as described in bug 545995)
+// 1) ensure that this file is #included before any IPDL-generated files and
+//    anything else that #includes prlog.h, so that we can make sure prlog.h
+//    sees FORCE_PR_LOG
+// 2) #include IPDL boilerplate, and then undef LOG so our LOG wins.
+// 3) nsNetModule.cpp does its own crazy stuff with #including prlog.h
+//    multiple times; allow it to define ALLOW_LATE_HTTPLOG_H_INCLUDE to bypass
+//    check.
+#if defined(PR_LOG) && !defined(ALLOW_LATE_HTTPLOG_H_INCLUDE)
+#error "If HttpLog.h #included it must come before any IPDL-generated files or other files that #include prlog.h"
+#endif
+
+// NeckoChild.h will include chromium, which will include prlog.h so define
+// PR_FORCE before we do that.
+#if defined(MOZ_LOGGING)
+#define FORCE_PR_LOG
+#endif
+
 #include "mozilla/net/NeckoChild.h"
 
 // Get rid of Chromium's LOG definition

netwerk/protocol/http/moz.build

@@ -39,13 +39,10 @@ EXPORTS.mozilla.net += [
 
 # ASpdySession.cpp and nsHttpAuthCache cannot be built in unified mode because
 # they use plarena.h.
+# The rest of these files cannot be built in unified mode because they want to
+# force NSPR logging.
 SOURCES += [
     'ASpdySession.cpp',
-    'nsHttpAuthCache.cpp',
-    'nsHttpChannelAuthProvider.cpp', # redefines GetAuthType
-]
-
-UNIFIED_SOURCES += [
     'ConnectionDiagnostics.cpp',
     'Http2Compression.cpp',
     'Http2Push.cpp',
@@ -58,9 +55,11 @@ UNIFIED_SOURCES += [
     'HttpInfo.cpp',
     'nsHttp.cpp',
     'nsHttpActivityDistributor.cpp',
+    'nsHttpAuthCache.cpp',
     'nsHttpAuthManager.cpp',
     'nsHttpBasicAuth.cpp',
     'nsHttpChannel.cpp',
+    'nsHttpChannelAuthProvider.cpp',
     'nsHttpChunkedDecoder.cpp',
     'nsHttpConnection.cpp',
     'nsHttpConnectionInfo.cpp',

netwerk/protocol/rtsp/moz.build

@@ -14,7 +14,8 @@ EXPORTS.mozilla.net += [
     'RtspHandler.h',
 ]
 
-UNIFIED_SOURCES += [
+# These files cannot be built in unified mode because they force NSPR logging.
+SOURCES += [
     'controller/RtspController.cpp',
     'controller/RtspControllerChild.cpp',
     'controller/RtspControllerParent.cpp',

netwerk/protocol/websocket/WebSocketLog.h

@@ -7,6 +7,14 @@
 #ifndef WebSocketLog_h
 #define WebSocketLog_h
 
+#ifdef MOZ_LOGGING
+#define FORCE_PR_LOG
+#endif
+
+#if defined(PR_LOG)
+#error "This file must be #included before any IPDL-generated files or other files that #include prlog.h"
+#endif
+
 #include "base/basictypes.h"
 #include "prlog.h"
 #include "mozilla/net/NeckoChild.h"

netwerk/protocol/wyciwyg/nsWyciwyg.h

@@ -5,9 +5,24 @@
 #ifndef nsWyciwyg_h__
 #define nsWyciwyg_h__
 
-#include "mozilla/net/NeckoChild.h"
+#if defined(MOZ_LOGGING)
+#define FORCE_PR_LOG
+#endif
 
-// Get rid of chromium's LOG.
+// e10s mess: IPDL-generatd headers include chromium which both #includes
+// prlog.h, and #defines LOG in conflict with this file.
+// Solution: (as described in bug 545995)
+// 1) ensure that this file is #included before any IPDL-generated files and
+//    anything else that #includes prlog.h, so that we can make sure prlog.h
+//    sees FORCE_PR_LOG if needed.
+// 2) #include IPDL boilerplate, and then undef LOG so our LOG wins.
+// 3) nsNetModule.cpp does its own crazy stuff with #including prlog.h
+//    multiple times; allow it to define ALLOW_LATE_NSHTTP_H_INCLUDE to bypass
+//    check. 
+#if defined(PR_LOG) && !defined(ALLOW_LATE_NSHTTP_H_INCLUDE)
+#error "If nsWyciwyg.h #included it must come before any IPDL-generated files or other files that #include prlog.h"
+#endif
+#include "mozilla/net/NeckoChild.h"
 #undef LOG
 
 #include "prlog.h"

netwerk/sctp/datachannel/DataChannelLog.h

@@ -7,6 +7,14 @@
 #ifndef DataChannelLog_h
 #define DataChannelLog_h
 
+#ifdef MOZ_LOGGING
+#define FORCE_PR_LOG
+#endif
+
+#if defined(PR_LOG)
+#error "This file must be #included before any IPDL-generated files or other files that #include prlog.h"
+#endif
+
 #include "base/basictypes.h"
 #include "prlog.h"
 

netwerk/test/TestProtocols.cpp

@@ -15,6 +15,7 @@
 #include "TestCommon.h"
 #include <algorithm>
 
+#define FORCE_PR_LOG
 #include <stdio.h>
 #ifdef WIN32 
 #include <windows.h>

python/mozbuild/mozbuild/backend/recursivemake.py

@@ -646,6 +646,11 @@ class RecursiveMakeBackend(CommonBackend):
                     'so it cannot be built in unified mode."\n'
                     '#undef PL_ARENA_CONST_ALIGN_MASK\n'
                     '#endif\n'
+                    '#ifdef FORCE_PR_LOG\n'
+                    '#error "%(cppfile)s forces NSPR logging, '
+                    'so it cannot be built in unified mode."\n'
+                    '#undef FORCE_PR_LOG\n'
+                    '#endif\n'
                     '#ifdef INITGUID\n'
                     '#error "%(cppfile)s defines INITGUID, '
                     'so it cannot be built in unified mode."\n'

security/apps/AppSignatureVerification.cpp

@@ -4,6 +4,10 @@
  * 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/. */
 
+#ifdef MOZ_LOGGING
+#define FORCE_PR_LOG 1
+#endif
+
 #include "nsNSSCertificateDB.h"
 
 #include "pkix/pkix.h"

security/apps/AppTrustDomain.cpp

@@ -4,6 +4,10 @@
  * 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/. */
 
+#ifdef MOZ_LOGGING
+#define FORCE_PR_LOG 1
+#endif
+
 #include "AppTrustDomain.h"
 #include "certdb.h"
 #include "pkix/pkixnss.h"

security/apps/moz.build

@@ -4,7 +4,8 @@
 # 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/.
 
-UNIFIED_SOURCES += [
+# These cannot be built in unified mode because they force NSPR logging.
+SOURCES += [
     'AppSignatureVerification.cpp',
     'AppTrustDomain.cpp',
 ]

security/manager/boot/src/moz.build

@@ -12,13 +12,18 @@ UNIFIED_SOURCES += [
     'DataStorage.cpp',
     'nsBOOTModule.cpp',
     'nsEntropyCollector.cpp',
-    'nsSecureBrowserUIImpl.cpp',
     'nsSecurityHeaderParser.cpp',
     'nsSecurityWarningDialogs.cpp',
     'nsSiteSecurityService.cpp',
     'PublicKeyPinningService.cpp',
 ]
 
+# nsSecureBrowserUIImpl.cpp cannot be built in unified mode because it forces NSPR logging.
+SOURCES += [
+    'nsSecureBrowserUIImpl.cpp',
+]
+
+
 LOCAL_INCLUDES += [
     '../../../pkix/include',
 ]

security/manager/boot/src/nsSecureBrowserUIImpl.cpp

@@ -3,6 +3,10 @@
  * 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/. */
 
+#ifdef MOZ_LOGGING
+#define FORCE_PR_LOG
+#endif
+
 #include "nspr.h"
 #include "prlog.h"
 

security/manager/ssl/src/PSMContentListener.cpp

@@ -4,6 +4,10 @@
  * 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/. */
 
+#ifdef MOZ_LOGGING
+#define FORCE_PR_LOG 1
+#endif
+
 #include "PSMContentListener.h"
 
 #include "nsIStreamListener.h"

security/manager/ssl/src/nsCryptoHash.cpp

@@ -4,6 +4,10 @@
  * 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/. */
 
+#ifdef MOZ_LOGGING
+#define FORCE_PR_LOG 1
+#endif
+
 #include <algorithm>
 
 #include "nsCryptoHash.h"

security/manager/ssl/src/nsNSSComponent.cpp

@@ -4,6 +4,10 @@
  * 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/. */
 
+#ifdef MOZ_LOGGING
+#define FORCE_PR_LOG 1
+#endif
+
 #include "nsNSSComponent.h"
 
 #include "ExtendedValidation.h"

uriloader/base/nsURILoader.h

@@ -16,6 +16,10 @@
 #include "nsIWeakReference.h"
 #include "mozilla/Attributes.h"
 
+#ifdef MOZ_LOGGING
+// Uncomment the next line to force logging on in release builds
+// #define FORCE_PR_LOG
+#endif
 #include "prlog.h"
 
 class nsDocumentOpenInfo;

uriloader/exthandler/moz.build

@@ -51,22 +51,29 @@ EXPORTS.mozilla.dom += [
 ]
 
 UNIFIED_SOURCES += [
-    'ExternalHelperAppChild.cpp',
     'ExternalHelperAppParent.cpp',
-    'nsExternalHelperAppService.cpp',
-    'nsExternalProtocolHandler.cpp',
     'nsLocalHandlerApp.cpp',
     'nsMIMEInfoImpl.cpp',
 ]
 
+# These files can't be built in unified mode because they force NSPR logging.
+SOURCES += [
+    'ExternalHelperAppChild.cpp',
+    'nsExternalHelperAppService.cpp',
+    'nsExternalProtocolHandler.cpp',
+]
+
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     UNIFIED_SOURCES += [
         'mac/nsLocalHandlerAppMac.mm',
         'mac/nsMIMEInfoMac.mm',
+    ]
+    # These files can't be built in unified mode because they force NSPR logging.
+    SOURCES += [
         'mac/nsOSHelperAppService.mm',
     ]
 else:
-    # These files can't be built in unified mode because they redefine LOG.
+    # These files can't be built in unified mode because they force NSPR logging.
     SOURCES += [
         osdir + '/nsOSHelperAppService.cpp',
     ]
@@ -89,7 +96,8 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt':
         'unix/nsMIMEInfoUnix.cpp',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
-    UNIFIED_SOURCES += [
+    # These files can't be built in unified mode because they force NSPR logging.
+    SOURCES += [
         'win/nsMIMEInfoWin.cpp',
     ]
 

uriloader/exthandler/nsExternalHelperAppService.cpp

@@ -4,6 +4,10 @@
  * 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/. */
 
+#ifdef MOZ_LOGGING
+#define FORCE_PR_LOG
+#endif
+
 #include "base/basictypes.h"
 
 /* This must occur *after* base/basictypes.h to avoid typedefs conflicts. */

uriloader/exthandler/nsExternalHelperAppService.h

@@ -6,6 +6,9 @@
 #ifndef nsExternalHelperAppService_h__
 #define nsExternalHelperAppService_h__
 
+#ifdef MOZ_LOGGING
+#define FORCE_PR_LOG
+#endif
 #include "prlog.h"
 #include "prtime.h"
 

uriloader/prefetch/moz.build

@@ -21,14 +21,18 @@ EXPORTS.mozilla.docshell += [
 ]
 
 UNIFIED_SOURCES += [
-    'nsOfflineCacheUpdate.cpp',
-    'nsOfflineCacheUpdateService.cpp',
     'nsPrefetchService.cpp',
     'OfflineCacheUpdateChild.cpp',
     'OfflineCacheUpdateGlue.cpp',
     'OfflineCacheUpdateParent.cpp',
 ]
 
+# These files can't be built in unified mode because they force NSPR logging.
+SOURCES += [
+    'nsOfflineCacheUpdate.cpp',
+    'nsOfflineCacheUpdateService.cpp',
+]
+
 IPDL_SOURCES += [
     'POfflineCacheUpdate.ipdl',
 ]

uriloader/prefetch/nsOfflineCacheUpdate.cpp

@@ -3,6 +3,10 @@
  * 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/. */
 
+#if defined(MOZ_LOGGING)
+#define FORCE_PR_LOG
+#endif
+
 #include "nsOfflineCacheUpdate.h"
 
 #include "nsCPrefetchService.h"

uriloader/prefetch/nsOfflineCacheUpdateService.cpp

@@ -3,6 +3,10 @@
  * 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/. */
 
+#if defined(MOZ_LOGGING)
+#define FORCE_PR_LOG
+#endif
+
 #include "OfflineCacheUpdateChild.h"
 #include "OfflineCacheUpdateParent.h"
 #include "nsXULAppAPI.h"

widget/android/nsAppShell.cpp

@@ -51,6 +51,7 @@
 #endif
 
 #ifdef MOZ_LOGGING
+#define FORCE_PR_LOG
 #include "prlog.h"
 #endif
 

widget/cocoa/TextInputHandler.mm

@@ -8,6 +8,9 @@
 
 #include "TextInputHandler.h"
 
+#ifdef MOZ_LOGGING
+#define FORCE_PR_LOG /* Allow logging in the release build */
+#endif // MOZ_LOGGING
 #include "prlog.h"
 
 #include "mozilla/MiscEvents.h"
@@ -27,6 +30,11 @@
 #include <objc/runtime.h>
 #endif // __LP64__
 
+#ifdef MOZ_LOGGING
+#define FORCE_PR_LOG
+#endif
+#include "prlog.h"
+
 #ifndef __LP64__
 enum {
   // Currently focused ChildView (while this TSM document is active).

widget/cocoa/moz.build

@@ -28,7 +28,6 @@ UNIFIED_SOURCES += [
     'nsColorPicker.mm',
     'nsCursorManager.mm',
     'nsDeviceContextSpecX.mm',
-    'nsDragService.mm',
     'nsFilePicker.mm',
     'nsIdleServiceX.mm',
     'nsLookAndFeel.mm',
@@ -54,15 +53,16 @@ UNIFIED_SOURCES += [
     'nsWidgetFactory.mm',
     'nsWindowMap.mm',
     'OSXNotificationCenter.mm',
-    'TextInputHandler.mm',
     'VibrancyManager.mm',
     'WidgetTraceEvent.mm',
 ]
 
-# These files cannot be built in unified mode because they cause symbol conflicts
+# These files cannot be built in unified mode because they force NSPR logging.
 SOURCES += [
     'nsChildView.mm',
     'nsClipboard.mm',
+    'nsDragService.mm',
+    'TextInputHandler.mm',
 ]
 
 if CONFIG['TARGET_CPU'] == 'x86_64':

widget/cocoa/nsChildView.mm

@@ -5,6 +5,9 @@
 
 #include "mozilla/ArrayUtils.h"
 
+#ifdef MOZ_LOGGING
+#define FORCE_PR_LOG
+#endif
 #include "prlog.h"
 
 #include <unistd.h>

widget/cocoa/nsClipboard.mm

@@ -3,6 +3,9 @@
  * 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/. */
 
+#ifdef MOZ_LOGGING
+#define FORCE_PR_LOG
+#endif
 #include "prlog.h"
 
 #include "gfxPlatform.h"

widget/cocoa/nsDragService.mm

@@ -3,6 +3,9 @@
  * 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/. */
 
+#ifdef MOZ_LOGGING
+#define FORCE_PR_LOG
+#endif
 #include "prlog.h"
 
 #include "nsDragService.h"

widget/gtk/moz.build

@@ -16,11 +16,9 @@ EXPORTS += [
 UNIFIED_SOURCES += [
     'mozcontainer.c',
     'NativeKeyBindings.cpp',
-    'nsAppShell.cpp',
     'nsBidiKeyboard.cpp',
     'nsColorPicker.cpp',
     'nsFilePicker.cpp',
-    'nsGtkIMModule.cpp',
     'nsGtkKeyUtils.cpp',
     'nsImageToPixbuf.cpp',
     'nsLookAndFeel.cpp',
@@ -29,13 +27,16 @@ UNIFIED_SOURCES += [
     'nsScreenManagerGtk.cpp',
     'nsSound.cpp',
     'nsToolkit.cpp',
-    'nsWidgetFactory.cpp',
     'WakeLockListener.cpp',
     'WidgetTraceEvent.cpp',
 ]
 
+# These files force-enable NSPR logging and thus cannot be built in unified mode
 SOURCES += [
-    'nsWindow.cpp', # conflicts with X11 headers
+    'nsAppShell.cpp',
+    'nsGtkIMModule.cpp',
+    'nsWidgetFactory.cpp',
+    'nsWindow.cpp',
 ]
 
 if CONFIG['MOZ_X11']:
@@ -46,17 +47,23 @@ if CONFIG['MOZ_X11']:
 if CONFIG['NS_PRINTING']:
     UNIFIED_SOURCES += [
         'nsCUPSShim.cpp',
-        'nsDeviceContextSpecG.cpp',
         'nsPaperPS.cpp',
         'nsPrintDialogGTK.cpp',
         'nsPrintOptionsGTK.cpp',
         'nsPrintSettingsGTK.cpp',
         'nsPSPrinters.cpp',
     ]
+    # This file force-enables NSPR logging and thus cannot be built in unified mode
+    SOURCES += [
+        'nsDeviceContextSpecG.cpp',
+    ]
 
 if CONFIG['MOZ_X11']:
     UNIFIED_SOURCES += [
         'nsClipboard.cpp',
+    ]
+    # This file force-enables NSPR logging and thus cannot be built in unified mode
+    SOURCES += [
         'nsDragService.cpp',
     ]
 

widget/gtk/nsDeviceContextSpecG.cpp

@@ -3,6 +3,9 @@
  * 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/. */
 
+#ifdef MOZ_LOGGING
+#define FORCE_PR_LOG 1 /* Allow logging in the release build */
+#endif /* MOZ_LOGGING */
 #include "prlog.h"
 
 #include "plstr.h"

widget/gtk/nsGtkIMModule.cpp

@@ -4,6 +4,9 @@
  * 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/. */
 
+#ifdef MOZ_LOGGING
+#define FORCE_PR_LOG /* Allow logging in the release build */
+#endif // MOZ_LOGGING
 #include "prlog.h"
 #include "prtime.h"
 

widget/gtk/nsWindow.h

@@ -37,6 +37,9 @@
 #undef LOG
 #ifdef MOZ_LOGGING
 
+// make sure that logging is enabled before including prlog.h
+#define FORCE_PR_LOG
+
 #include "prlog.h"
 #include "nsTArray.h"
 

widget/qt/nsAppShell.cpp

@@ -18,6 +18,7 @@
 #include "nsQAppInstance.h"
 
 #ifdef MOZ_LOGGING
+#define FORCE_PR_LOG
 #include "prlog.h"
 #endif
 

widget/qt/nsDeviceContextSpecQt.cpp

@@ -10,6 +10,9 @@
 #define SET_PRINTER_FEATURES_VIA_PREFS 1
 #define PRINTERFEATURES_PREF "print.tmp.printerfeatures"
 
+#ifdef MOZ_LOGGING
+#define FORCE_PR_LOG 1 /* Allow logging in the release build */
+#endif /* MOZ_LOGGING */
 #include "prlog.h"
 
 #include "plstr.h"

widget/qt/nsWindow.h

@@ -23,6 +23,9 @@
 
 #ifdef MOZ_LOGGING
 
+// make sure that logging is enabled before including prlog.h
+#define FORCE_PR_LOG
+
 #include "prlog.h"
 #include "nsTArray.h"
 

widget/windows/KeyboardLayout.cpp

@@ -3,6 +3,9 @@
  * 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/. */
 
+#ifdef MOZ_LOGGING
+#define FORCE_PR_LOG /* Allow logging in the release build */
+#endif // MOZ_LOGGING
 #include "prlog.h"
 
 #include "mozilla/ArrayUtils.h"