Bug 1159320: disable-webrtc builds fail after bug 1100502 applied. r=rjesup

dom/ipc/ContentChild.cpp

@@ -54,7 +54,6 @@
 #include "mozilla/net/NeckoChild.h"
 #include "mozilla/plugins/PluginInstanceParent.h"
 #include "mozilla/plugins/PluginModuleParent.h"
-#include "mozilla/media/webrtc/WebrtcGlobalChild.h"
 #include "mozilla/widget/WidgetMessageUtils.h"
 
 #if defined(MOZ_CONTENT_SANDBOX)
@@ -121,6 +120,10 @@
 
 #include "nsIScriptSecurityManager.h"
 
+#ifdef MOZ_WEBRTC
+#include "signaling/src/peerconnection/WebrtcGlobalChild.h"
+#endif
+
 #ifdef MOZ_PERMISSIONS
 #include "nsPermission.h"
 #include "nsPermissionManager.h"
@@ -1821,15 +1824,23 @@ ContentChild::DeallocPSpeechSynthesisChild(PSpeechSynthesisChild* aActor)
 PWebrtcGlobalChild *
 ContentChild::AllocPWebrtcGlobalChild()
 {
+#ifdef MOZ_WEBRTC
     WebrtcGlobalChild *child = new WebrtcGlobalChild();
     return child;
+#else
+    return nullptr;
+#endif
 }
 
 bool
 ContentChild::DeallocPWebrtcGlobalChild(PWebrtcGlobalChild *aActor)
 {
+#ifdef MOZ_WEBRTC
     delete static_cast<WebrtcGlobalChild*>(aActor);
     return true;
+#else
+    return false;
+#endif
 }
 
 

dom/ipc/ContentParent.cpp

@@ -87,7 +87,6 @@
 #include "mozilla/StaticPtr.h"
 #include "mozilla/Telemetry.h"
 #include "mozilla/unused.h"
-#include "mozilla/media/webrtc/WebrtcGlobalParent.h"
 #include "nsAnonymousTemporaryFile.h"
 #include "nsAppRunner.h"
 #include "nsAutoPtr.h"
@@ -167,6 +166,10 @@
 
 #include "nsIBidiKeyboard.h"
 
+#ifdef MOZ_WEBRTC
+#include "signaling/src/peerconnection/WebrtcGlobalParent.h"
+#endif
+
 #if defined(ANDROID) || defined(LINUX)
 #include "nsSystemInfo.h"
 #endif
@@ -5019,14 +5022,22 @@ ContentParent::DeallocPOfflineCacheUpdateParent(POfflineCacheUpdateParent* aActo
 PWebrtcGlobalParent *
 ContentParent::AllocPWebrtcGlobalParent()
 {
+#ifdef MOZ_WEBRTC
     return WebrtcGlobalParent::Alloc();
+#else
+    return nullptr;
+#endif
 }
 
 bool
 ContentParent::DeallocPWebrtcGlobalParent(PWebrtcGlobalParent *aActor)
 {
+#ifdef MOZ_WEBRTC
     WebrtcGlobalParent::Dealloc(static_cast<WebrtcGlobalParent*>(aActor));
     return true;
+#else
+    return false;
+#endif
 }
 
 bool

dom/ipc/moz.build

@@ -139,6 +139,7 @@ LOCAL_INCLUDES += [
     '/gfx/2d',
     '/hal/sandbox',
     '/layout/base',
+    '/media/webrtc',
     '/netwerk/base',
     '/toolkit/xre',
     '/uriloader/exthandler',

dom/media/moz.build

@@ -156,6 +156,14 @@ EXPORTS.mozilla += [
     'MediaManager.h',
 ]
 
+EXPORTS.mozilla.media.webrtc += [
+    'webrtc/WebrtcGlobal.h',
+]
+
+IPDL_SOURCES += [
+    'webrtc/PWebrtcGlobal.ipdl'
+]
+
 if CONFIG['MOZ_B2G']:
     EXPORTS.mozilla += [
         'MediaPermissionGonk.h',

media/webrtc/moz.build

@@ -36,16 +36,6 @@ webrtc_non_unified_sources = [
     'trunk/webrtc/modules/video_capture/windows/sink_filter_ds.cc',              # Because of the MEDIASUBTYPE_HDYC variable and initguid.h
 ]
 
-IPDL_SOURCES += [
-    'signaling/src/peerconnection/PWebrtcGlobal.ipdl',
-]
-
-EXPORTS.mozilla.media.webrtc += [
-    'signaling/src/peerconnection/WebrtcGlobal.h',
-    'signaling/src/peerconnection/WebrtcGlobalChild.h',
-    'signaling/src/peerconnection/WebrtcGlobalParent.h'
-]
-
 GYP_DIRS += ['trunk']
 
 GYP_DIRS['trunk'].input = 'trunk/peerconnection.gyp'

media/webrtc/signaling/src/peerconnection/PeerConnectionCtx.h

@@ -8,7 +8,7 @@
 #include <string>
 
 #if !defined(MOZILLA_EXTERNAL_LINKAGE)
-#include "mozilla/media/webrtc/WebrtcGlobalChild.h"
+#include "WebrtcGlobalChild.h"
 #endif
 
 #include "mozilla/Attributes.h"

media/webrtc/signaling/src/peerconnection/WebrtcGlobalInformation.cpp

@@ -3,6 +3,7 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "WebrtcGlobalInformation.h"
+#include "mozilla/media/webrtc/WebrtcGlobal.h"
 #include "WebrtcGlobalChild.h"
 #include "WebrtcGlobalParent.h"
 
@@ -16,7 +17,6 @@
 #include "CSFLog.h"
 #include "WebRtcLog.h"
 #include "mozilla/dom/WebrtcGlobalInformationBinding.h"
-#include "WebrtcGlobal.h"
 #include "mozilla/dom/ContentChild.h"
 
 #include "nsAutoPtr.h"