Attachment #273505 for bug #360163





#ifdef MOZ_WIDGET_QT
#include "nsQAppInstance.h"
#endif

#include "ContentChild.h"
#include "CrashReporterChild.h"
#include "TabChild.h"
#if defined(MOZ_SYDNEYAUDIO)
#include "AudioChild.h"
#endif

#include "mozilla/ipc/TestShellChild.h"
#include "mozilla/net/NeckoChild.h"
#include "mozilla/ipc/XPCShellEnvironment.h"
#include "mozilla/jsipc/PContextWrapperChild.h"
#include "mozilla/dom/ExternalHelperAppChild.h"
#include "mozilla/dom/StorageChild.h"
#include "mozilla/dom/PCrashReporterChild.h"

#if defined(MOZ_SYDNEYAUDIO)
#include "nsAudioStream.h"
#endif
#include "nsIMemoryReporter.h"
#include "nsIObserverService.h"
#include "nsTObserverArray.h"
#include "nsIObserver.h"
#include "nsIPrefService.h"
#include "nsServiceManagerUtils.h"
#include "nsXULAppAPI.h"
#include "nsWeakReference.h"

    return true;
}

PAudioChild*
ContentChild::AllocPAudio(const PRInt32& numChannels,
                          const PRInt32& rate,
                          const PRInt32& format)
{
#if defined(MOZ_SYDNEYAUDIO)
    AudioChild *child = new AudioChild();
    NS_ADDREF(child);
    return child;
#else
    return nsnull;
#endif
}

bool
ContentChild::DeallocPAudio(PAudioChild* doomed)
{
#if defined(MOZ_SYDNEYAUDIO)
    AudioChild *child = static_cast<AudioChild*>(doomed);
    NS_RELEASE(child);
#endif
    return true;
}

PNeckoChild* 
ContentChild::AllocPNecko()
{
    return new NeckoChild();
}




#include "nsCExternalHandlerService.h"
#include "nsFrameMessageManager.h"
#include "nsIAlertsService.h"
#include "nsToolkitCompsCID.h"
#include "nsIDOMGeoGeolocation.h"
#include "nsIConsoleService.h"
#include "nsIScriptError.h"
#include "nsConsoleMessage.h"
#if defined(MOZ_SYDNEYAUDIO)
#include "AudioParent.h"
#endif

#if defined(ANDROID) || defined(LINUX)
#include <sys/time.h>
#include <sys/resource.h>
#endif

#ifdef MOZ_PERMISSIONS
#include "nsPermissionManager.h"

  return true;
}
 
PAudioParent*
ContentParent::AllocPAudio(const PRInt32& numChannels,
                           const PRInt32& rate,
                           const PRInt32& format)
{
#if defined(MOZ_SYDNEYAUDIO)
    AudioParent *parent = new AudioParent(numChannels, rate, format);
    NS_ADDREF(parent);
    return parent;
#else
    return nsnull;
#endif
}

bool
ContentParent::DeallocPAudio(PAudioParent* doomed)
{
#if defined(MOZ_SYDNEYAUDIO)
    AudioParent *parent = static_cast<AudioParent*>(doomed);
    NS_RELEASE(parent);
#endif
    return true;
}

PNeckoParent* 
ContentParent::AllocPNecko()
{
    return new NeckoParent();
}




DIRS = tests
endif

EXPORTS = TabMessageUtils.h PCOMContentPermissionRequestChild.h

EXPORTS_NAMESPACES = mozilla/dom

EXPORTS_mozilla/dom = \
  AudioChild.h \
  AudioParent.h \
  ContentChild.h \
  ContentParent.h \
  ContentProcess.h \
  CrashReporterChild.h \
  CrashReporterParent.h \
  TabParent.h \
  TabChild.h \
  $(NULL)

CPPSRCS = \
  AudioChild.cpp \
  AudioParent.cpp \
  ContentProcess.cpp \
  ContentParent.cpp \
  ContentChild.cpp \
  CrashReporterParent.cpp \
  TabParent.cpp \
  TabChild.cpp \
  TabMessageUtils.cpp \
  $(NULL)

ifdef MOZ_SYDNEYAUDIO
EXPORTS_mozilla/dom += \
  AudioChild.h \
  AudioParent.h \
  $(NULL)
CPPSRCS += \
  AudioChild.cpp \
  AudioParent.cpp \
  $(NULL)
endif

include $(topsrcdir)/config/config.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
include $(topsrcdir)/config/rules.mk

LOCAL_INCLUDES += \
		-I$(srcdir)/../../content/base/src \
		-I$(srcdir)/../../content/events/src \

Return to bug 360163

Lines 43-69 Link Here

(-)a/dom/ipc/ContentChild.cpp (+10 lines)
43		43
44	#ifdef MOZ_WIDGET_QT	44	#ifdef MOZ_WIDGET_QT
45	#include "nsQAppInstance.h"	45	#include "nsQAppInstance.h"
46	#endif	46	#endif
47		47
48	#include "ContentChild.h"	48	#include "ContentChild.h"
49	#include "CrashReporterChild.h"	49	#include "CrashReporterChild.h"
50	#include "TabChild.h"	50	#include "TabChild.h"
		51	#if defined(MOZ_SYDNEYAUDIO)
51	#include "AudioChild.h"	52	#include "AudioChild.h"
		53	#endif
52		54
53	#include "mozilla/ipc/TestShellChild.h"	55	#include "mozilla/ipc/TestShellChild.h"
54	#include "mozilla/net/NeckoChild.h"	56	#include "mozilla/net/NeckoChild.h"
55	#include "mozilla/ipc/XPCShellEnvironment.h"	57	#include "mozilla/ipc/XPCShellEnvironment.h"
56	#include "mozilla/jsipc/PContextWrapperChild.h"	58	#include "mozilla/jsipc/PContextWrapperChild.h"
57	#include "mozilla/dom/ExternalHelperAppChild.h"	59	#include "mozilla/dom/ExternalHelperAppChild.h"
58	#include "mozilla/dom/StorageChild.h"	60	#include "mozilla/dom/StorageChild.h"
59	#include "mozilla/dom/PCrashReporterChild.h"	61	#include "mozilla/dom/PCrashReporterChild.h"
60		62
		63	#if defined(MOZ_SYDNEYAUDIO)
61	#include "nsAudioStream.h"	64	#include "nsAudioStream.h"
		65	#endif
62	#include "nsIMemoryReporter.h"	66	#include "nsIMemoryReporter.h"
63	#include "nsIObserverService.h"	67	#include "nsIObserverService.h"
64	#include "nsTObserverArray.h"	68	#include "nsTObserverArray.h"
65	#include "nsIObserver.h"	69	#include "nsIObserver.h"
66	#include "nsIPrefService.h"	70	#include "nsIPrefService.h"
67	#include "nsServiceManagerUtils.h"	71	#include "nsServiceManagerUtils.h"
68	#include "nsXULAppAPI.h"	72	#include "nsXULAppAPI.h"
69	#include "nsWeakReference.h"	73	#include "nsWeakReference.h"
Lines 379-404 ContentChild::RecvPTestShellConstructor( Link Here
379	return true;	383	return true;
380	}	384	}
381		385
382	PAudioChild*	386	PAudioChild*
383	ContentChild::AllocPAudio(const PRInt32& numChannels,	387	ContentChild::AllocPAudio(const PRInt32& numChannels,
384	const PRInt32& rate,	388	const PRInt32& rate,
385	const PRInt32& format)	389	const PRInt32& format)
386	{	390	{
		391	#if defined(MOZ_SYDNEYAUDIO)
387	AudioChild *child = new AudioChild();	392	AudioChild *child = new AudioChild();
388	NS_ADDREF(child);	393	NS_ADDREF(child);
389	return child;	394	return child;
		395	#else
		396	return nsnull;
		397	#endif
390	}	398	}
391		399
392	bool	400	bool
393	ContentChild::DeallocPAudio(PAudioChild* doomed)	401	ContentChild::DeallocPAudio(PAudioChild* doomed)
394	{	402	{
		403	#if defined(MOZ_SYDNEYAUDIO)
395	AudioChild child = static_cast<AudioChild>(doomed);	404	AudioChild child = static_cast<AudioChild>(doomed);
396	NS_RELEASE(child);	405	NS_RELEASE(child);
		406	#endif
397	return true;	407	return true;
398	}	408	}
399		409
400	PNeckoChild*	410	PNeckoChild*
401	ContentChild::AllocPNecko()	411	ContentChild::AllocPNecko()
402	{	412	{
403	return new NeckoChild();	413	return new NeckoChild();
404	}	414	}

Lines 63-79 Link Here

(-)a/dom/ipc/ContentParent.cpp (+8 lines)
63	#include "nsCExternalHandlerService.h"	63	#include "nsCExternalHandlerService.h"
64	#include "nsFrameMessageManager.h"	64	#include "nsFrameMessageManager.h"
65	#include "nsIAlertsService.h"	65	#include "nsIAlertsService.h"
66	#include "nsToolkitCompsCID.h"	66	#include "nsToolkitCompsCID.h"
67	#include "nsIDOMGeoGeolocation.h"	67	#include "nsIDOMGeoGeolocation.h"
68	#include "nsIConsoleService.h"	68	#include "nsIConsoleService.h"
69	#include "nsIScriptError.h"	69	#include "nsIScriptError.h"
70	#include "nsConsoleMessage.h"	70	#include "nsConsoleMessage.h"
		71	#if defined(MOZ_SYDNEYAUDIO)
71	#include "AudioParent.h"	72	#include "AudioParent.h"
		73	#endif
72		74
73	#if defined(ANDROID) \|\| defined(LINUX)	75	#if defined(ANDROID) \|\| defined(LINUX)
74	#include <sys/time.h>	76	#include <sys/time.h>
75	#include <sys/resource.h>	77	#include <sys/resource.h>
76	#endif	78	#endif
77		79
78	#ifdef MOZ_PERMISSIONS	80	#ifdef MOZ_PERMISSIONS
79	#include "nsPermissionManager.h"	81	#include "nsPermissionManager.h"
Lines 682-707 ContentParent::DeallocPTestShell(PTestSh Link Here
682	return true;	684	return true;
683	}	685	}
684		686
685	PAudioParent*	687	PAudioParent*
686	ContentParent::AllocPAudio(const PRInt32& numChannels,	688	ContentParent::AllocPAudio(const PRInt32& numChannels,
687	const PRInt32& rate,	689	const PRInt32& rate,
688	const PRInt32& format)	690	const PRInt32& format)
689	{	691	{
		692	#if defined(MOZ_SYDNEYAUDIO)
690	AudioParent *parent = new AudioParent(numChannels, rate, format);	693	AudioParent *parent = new AudioParent(numChannels, rate, format);
691	NS_ADDREF(parent);	694	NS_ADDREF(parent);
692	return parent;	695	return parent;
		696	#else
		697	return nsnull;
		698	#endif
693	}	699	}
694		700
695	bool	701	bool
696	ContentParent::DeallocPAudio(PAudioParent* doomed)	702	ContentParent::DeallocPAudio(PAudioParent* doomed)
697	{	703	{
		704	#if defined(MOZ_SYDNEYAUDIO)
698	AudioParent parent = static_cast<AudioParent>(doomed);	705	AudioParent parent = static_cast<AudioParent>(doomed);
699	NS_RELEASE(parent);	706	NS_RELEASE(parent);
		707	#endif
700	return true;	708	return true;
701	}	709	}
702		710
703	PNeckoParent*	711	PNeckoParent*
704	ContentParent::AllocPNecko()	712	ContentParent::AllocPNecko()
705	{	713	{
706	return new NeckoParent();	714	return new NeckoParent();
707	}	715	}

Lines 51-88 DIRS = tests Link Here

(-)a/dom/ipc/Makefile.in (-4 / +11 lines)
51	DIRS = tests	51	DIRS = tests
52	endif	52	endif
53		53
54	EXPORTS = TabMessageUtils.h PCOMContentPermissionRequestChild.h	54	EXPORTS = TabMessageUtils.h PCOMContentPermissionRequestChild.h
55		55
56	EXPORTS_NAMESPACES = mozilla/dom	56	EXPORTS_NAMESPACES = mozilla/dom
57		57
58	EXPORTS_mozilla/dom = \	58	EXPORTS_mozilla/dom = \
59	AudioChild.h \
60	AudioParent.h \
61	ContentChild.h \	59	ContentChild.h \
62	ContentParent.h \	60	ContentParent.h \
63	ContentProcess.h \	61	ContentProcess.h \
64	CrashReporterChild.h \	62	CrashReporterChild.h \
65	CrashReporterParent.h \	63	CrashReporterParent.h \
66	TabParent.h \	64	TabParent.h \
67	TabChild.h \	65	TabChild.h \
68	$(NULL)	66	$(NULL)
69		67
70	CPPSRCS = \	68	CPPSRCS = \
71	AudioChild.cpp \
72	AudioParent.cpp \
73	ContentProcess.cpp \	69	ContentProcess.cpp \
74	ContentParent.cpp \	70	ContentParent.cpp \
75	ContentChild.cpp \	71	ContentChild.cpp \
76	CrashReporterParent.cpp \	72	CrashReporterParent.cpp \
77	TabParent.cpp \	73	TabParent.cpp \
78	TabChild.cpp \	74	TabChild.cpp \
79	TabMessageUtils.cpp \	75	TabMessageUtils.cpp \
80	$(NULL)	76	$(NULL)
		77
		78	ifdef MOZ_SYDNEYAUDIO
		79	EXPORTS_mozilla/dom += \
		80	AudioChild.h \
		81	AudioParent.h \
		82	$(NULL)
		83	CPPSRCS += \
		84	AudioChild.cpp \
		85	AudioParent.cpp \
		86	$(NULL)
		87	endif
81		88
82	include $(topsrcdir)/config/config.mk	89	include $(topsrcdir)/config/config.mk
83	include $(topsrcdir)/ipc/chromium/chromium-config.mk	90	include $(topsrcdir)/ipc/chromium/chromium-config.mk
84	include $(topsrcdir)/config/rules.mk	91	include $(topsrcdir)/config/rules.mk
85		92
86	LOCAL_INCLUDES += \	93	LOCAL_INCLUDES += \
87	-I$(srcdir)/../../content/base/src \	94	-I$(srcdir)/../../content/base/src \
88	-I$(srcdir)/../../content/events/src \	95	-I$(srcdir)/../../content/events/src \