From 1f8112298280604349bc0936b1fdd778a4fb8e96 Mon Sep 17 00:00:00 2001 From: Matheus Kerschbaum Date: Thu, 31 Mar 2011 07:22:55 -0400 Subject: [PATCH] Bug 639754 - Remove MOZ_IPC checks since IPC is always built now. r=bsmedberg --- browser/app/profile/firefox.js | 4 +- browser/installer/Makefile.in | 1 - browser/installer/package-manifest.in | 2 - chrome/src/Makefile.in | 5 +- chrome/src/nsChromeRegistry.cpp | 4 - chrome/src/nsChromeRegistryChrome.cpp | 4 - chrome/src/nsChromeRegistryChrome.h | 4 - chrome/test/Makefile.in | 2 - config/autoconf.mk.in | 1 - configure.in | 16 ---- content/base/src/Makefile.in | 5 -- content/base/src/nsDocument.cpp | 2 - content/base/src/nsFrameLoader.cpp | 80 +------------------ content/base/src/nsFrameLoader.h | 12 --- content/base/src/nsFrameMessageManager.cpp | 13 --- content/canvas/src/Makefile.in | 5 -- .../canvas/src/nsCanvasRenderingContext2D.cpp | 17 ---- content/events/src/nsDOMEvent.cpp | 8 -- content/events/src/nsDOMNotifyPaintEvent.cpp | 4 - content/events/src/nsDOMNotifyPaintEvent.h | 2 - content/events/src/nsDOMScrollAreaEvent.cpp | 4 - content/events/src/nsDOMScrollAreaEvent.h | 2 - content/events/src/nsDOMUIEvent.cpp | 4 - content/events/src/nsDOMUIEvent.h | 2 - content/events/src/nsEventStateManager.cpp | 14 ---- content/events/src/nsEventStateManager.h | 2 - content/html/content/src/Makefile.in | 7 +- .../html/content/src/nsHTMLCanvasElement.cpp | 4 - .../html/content/src/nsHTMLDNSPrefetch.cpp | 8 -- content/html/content/src/nsHTMLDNSPrefetch.h | 2 - content/media/nsAudioStream.cpp | 10 +-- content/media/nsAudioStream.h | 7 +- docshell/base/IHistory.h | 2 +- docshell/base/nsDocShell.cpp | 6 -- dom/Makefile.in | 5 -- dom/base/Makefile.in | 13 +-- dom/base/nsGlobalWindow.cpp | 2 - dom/plugins/Makefile.in | 3 - dom/src/geolocation/Makefile.in | 2 - dom/src/geolocation/nsGeolocation.cpp | 10 --- dom/src/geolocation/nsGeolocation.h | 8 -- .../notification/nsDesktopNotification.cpp | 4 - dom/src/notification/nsDesktopNotification.h | 12 +-- dom/src/offline/nsDOMOfflineResourceList.cpp | 5 -- dom/src/storage/Makefile.in | 2 - dom/src/storage/nsDOMStorage.cpp | 13 +-- embedding/browser/webBrowser/nsWebBrowser.cpp | 5 +- extensions/cookie/nsPermissionManager.cpp | 26 ------ extensions/cookie/nsPermissionManager.h | 2 - extensions/cookie/test/Makefile.in | 2 - gfx/Makefile.in | 6 +- gfx/ipc/Makefile.in | 4 - gfx/layers/Layers.cpp | 21 +---- gfx/layers/Makefile.in | 10 +-- gfx/layers/basic/BasicLayers.cpp | 15 ++-- gfx/layers/basic/BasicLayers.h | 8 -- gfx/layers/opengl/CanvasLayerOGL.cpp | 6 -- gfx/layers/opengl/CanvasLayerOGL.h | 4 - gfx/layers/opengl/ColorLayerOGL.cpp | 2 - gfx/layers/opengl/ColorLayerOGL.h | 4 - gfx/layers/opengl/ContainerLayerOGL.cpp | 4 - gfx/layers/opengl/ContainerLayerOGL.h | 4 - gfx/layers/opengl/ImageLayerOGL.cpp | 6 -- gfx/layers/opengl/ImageLayerOGL.h | 4 - gfx/layers/opengl/LayerManagerOGL.cpp | 18 ----- gfx/layers/opengl/LayerManagerOGL.h | 6 -- gfx/layers/opengl/ThebesLayerOGL.cpp | 6 -- gfx/layers/opengl/ThebesLayerOGL.h | 8 +- gfx/thebes/Makefile.in | 12 +-- gfx/thebes/gfxAndroidPlatform.cpp | 4 - ipc/chromium/chromium-config.mk | 3 - js/src/xpconnect/shell/xpcshell.cpp | 8 -- layout/Makefile.in | 5 +- layout/base/Makefile.in | 2 - layout/base/nsDisplayList.cpp | 4 - layout/base/nsDisplayList.h | 2 - layout/build/Makefile.in | 10 +-- layout/build/nsLayoutModule.cpp | 2 - layout/generic/nsObjectFrame.cpp | 6 -- layout/generic/nsSubDocumentFrame.cpp | 4 - modules/libpref/src/nsPrefBranch.cpp | 26 ------ modules/libpref/src/nsPrefService.cpp | 14 ---- modules/libpref/test/Makefile.in | 2 - modules/plugin/base/src/Makefile.in | 2 - modules/plugin/base/src/nsJSNPRuntime.cpp | 10 --- modules/plugin/base/src/nsNPAPIPlugin.cpp | 12 --- modules/plugin/base/src/nsNPAPIPlugin.h | 2 - modules/plugin/base/src/nsPluginHost.cpp | 6 -- modules/plugin/base/src/nsPluginHost.h | 2 - .../base/src/nsPluginNativeWindowWin.cpp | 4 - .../plugin/base/src/nsPluginsDirDarwin.cpp | 6 -- netwerk/Makefile.in | 14 +--- netwerk/base/public/Makefile.in | 8 +- netwerk/base/public/nsNetUtil.h | 4 - netwerk/base/src/Makefile.in | 9 +-- netwerk/base/src/nsBufferedStreams.cpp | 8 -- netwerk/base/src/nsFileStreams.cpp | 8 -- netwerk/base/src/nsIOService.cpp | 4 - netwerk/base/src/nsMIMEInputStream.cpp | 8 -- netwerk/base/src/nsSimpleNestedURI.cpp | 7 -- netwerk/base/src/nsSimpleURI.cpp | 8 -- netwerk/base/src/nsStandardURL.cpp | 10 --- netwerk/base/src/nsStandardURL.h | 2 - netwerk/build/Makefile.in | 5 +- netwerk/build/nsNetModule.cpp | 10 --- netwerk/cache/nsCacheService.cpp | 4 - netwerk/cookie/Makefile.in | 2 - netwerk/cookie/nsCookieService.cpp | 6 -- netwerk/cookie/nsCookieService.h | 4 - .../protocol/about/nsAboutProtocolHandler.cpp | 7 -- netwerk/protocol/ftp/Makefile.in | 7 -- netwerk/protocol/ftp/nsFtpProtocolHandler.cpp | 6 -- netwerk/protocol/http/HttpBaseChannel.cpp | 4 - netwerk/protocol/http/Makefile.in | 7 -- netwerk/protocol/http/nsHttp.h | 2 - netwerk/protocol/http/nsHttpChannel.cpp | 2 - netwerk/protocol/http/nsHttpHandler.cpp | 16 +--- netwerk/protocol/http/nsHttpResponseHead.h | 2 - netwerk/protocol/http/nsHttpTransaction.cpp | 2 - netwerk/protocol/res/nsResProtocolHandler.cpp | 4 - netwerk/protocol/res/nsResProtocolHandler.h | 2 - netwerk/protocol/wyciwyg/Makefile.in | 13 +-- netwerk/protocol/wyciwyg/nsWyciwyg.h | 2 - netwerk/protocol/wyciwyg/nsWyciwygChannel.cpp | 8 -- .../wyciwyg/nsWyciwygProtocolHandler.cpp | 8 -- netwerk/test/Makefile.in | 2 - security/manager/ssl/src/Makefile.in | 5 +- security/manager/ssl/src/nsNSSCertificate.cpp | 10 +-- security/manager/ssl/src/nsNSSComponent.cpp | 4 - security/manager/ssl/src/nsNSSIOLayer.cpp | 2 - security/manager/ssl/src/nsNSSModule.cpp | 9 --- .../components/contentprefs/tests/Makefile.in | 2 - .../places/tests/cpp/test_IHistory.cpp | 4 - toolkit/crashreporter/nsExceptionHandler.cpp | 31 ++----- toolkit/crashreporter/nsExceptionHandler.h | 4 - toolkit/library/dlldeps-xul.cpp | 2 - toolkit/library/libxul-config.mk | 12 +-- toolkit/library/nsStaticXULComponents.cpp | 2 +- toolkit/mozapps/installer/packager.mk | 2 - toolkit/toolkit-tiers.mk | 2 - toolkit/xre/nsAppRunner.cpp | 17 ---- toolkit/xre/nsAppRunner.h | 2 - toolkit/xre/nsEmbedFunctions.cpp | 8 -- toolkit/xre/nsSigHandlers.cpp | 10 +-- toolkit/xre/nsX11ErrorHandler.cpp | 4 - uriloader/exthandler/Makefile.in | 10 +-- .../exthandler/nsExternalHelperAppService.cpp | 15 +--- uriloader/exthandler/tests/Makefile.in | 2 - uriloader/prefetch/Makefile.in | 10 +-- .../prefetch/OfflineCacheUpdateChild.cpp | 2 - uriloader/prefetch/nsOfflineCacheUpdate.cpp | 4 - .../prefetch/nsOfflineCacheUpdateService.cpp | 9 +-- widget/public/nsGUIEvent.h | 16 ---- widget/public/nsIWidget.h | 10 --- widget/src/android/AndroidBridge.cpp | 2 - widget/src/android/nsWidgetFactory.cpp | 16 ++-- widget/src/android/nsWindow.cpp | 8 -- widget/src/gtk2/nsWindow.h | 4 +- widget/src/qt/nsWidgetFactory.cpp | 4 - widget/src/shared/nsShmImage.h | 4 +- widget/src/windows/Makefile.in | 2 - widget/src/windows/nsWindow.cpp | 18 ----- widget/src/windows/nsWindow.h | 4 - widget/src/windows/nsWindowGfx.cpp | 6 -- widget/src/xpwidgets/Makefile.in | 7 -- widget/src/xpwidgets/nsBaseAppShell.cpp | 9 --- widget/src/xpwidgets/nsBaseWidget.cpp | 4 - xpcom/base/nsTraceRefcntImpl.cpp | 8 -- xpcom/build/nsXPComInit.cpp | 10 --- xpcom/components/ManifestParser.cpp | 2 - xpcom/io/nsMultiplexInputStream.cpp | 8 -- xpcom/io/nsStringStream.cpp | 8 -- xpcom/threads/nsThread.cpp | 6 +- 173 files changed, 67 insertions(+), 1151 deletions(-) diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index 77c305bc6f9..7cdde5cc8f3 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -948,10 +948,8 @@ pref("dom.ipc.plugins.enabled.i386.flash player.plugin", true); pref("dom.ipc.plugins.enabled.i386.javaplugin2_npapi.plugin", true); // x86_64 ipc preferences pref("dom.ipc.plugins.enabled.x86_64", true); -#elifdef MOZ_IPC -pref("dom.ipc.plugins.enabled", true); #else -pref("dom.ipc.plugins.enabled", false); +pref("dom.ipc.plugins.enabled", true); #endif #ifdef XP_WIN diff --git a/browser/installer/Makefile.in b/browser/installer/Makefile.in index 376e3e04a08..acea03715aa 100644 --- a/browser/installer/Makefile.in +++ b/browser/installer/Makefile.in @@ -94,7 +94,6 @@ DEFINES += -DMOZ_D3DX9_DLL=$(MOZ_D3DX9_DLL) DEFINES += -DMOZ_D3DCOMPILER_DLL=$(MOZ_D3DCOMPILER_DLL) endif -# Don't ifdef MOZ_IPC this because mac ppc needs it too. include $(topsrcdir)/ipc/app/defs.mk DEFINES += -DMOZ_CHILD_PROCESS_NAME=$(MOZ_CHILD_PROCESS_NAME) diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index 91d9b44b780..769bdac37db 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -51,13 +51,11 @@ #else @BINPATH@/@DLL_PREFIX@xul@DLL_SUFFIX@ #endif -#ifdef MOZ_IPC #ifdef XP_MACOSX @BINPATH@/@MOZ_CHILD_PROCESS_NAME@.app/ #else @BINPATH@/@MOZ_CHILD_PROCESS_NAME@ #endif -#endif #ifdef WINCE @BINPATH@/mozce_shunt.dll #elifdef XP_WIN32 diff --git a/chrome/src/Makefile.in b/chrome/src/Makefile.in index 8d6426641c4..b1b0d1a7fd8 100644 --- a/chrome/src/Makefile.in +++ b/chrome/src/Makefile.in @@ -58,12 +58,9 @@ CPPSRCS = \ nsChromeRegistry.cpp \ nsChromeRegistryChrome.cpp \ nsChromeProtocolHandler.cpp \ + nsChromeRegistryContent.cpp \ $(NULL) -ifdef MOZ_IPC -CPPSRCS += nsChromeRegistryContent.cpp -endif - EXTRA_DSO_LDOPTS = \ $(MOZ_UNICHARUTIL_LIBS) \ $(MOZ_COMPONENT_LIBS) \ diff --git a/chrome/src/nsChromeRegistry.cpp b/chrome/src/nsChromeRegistry.cpp index 76f9da9b36a..254253ed558 100644 --- a/chrome/src/nsChromeRegistry.cpp +++ b/chrome/src/nsChromeRegistry.cpp @@ -41,9 +41,7 @@ #include "nsChromeRegistry.h" #include "nsChromeRegistryChrome.h" -#ifdef MOZ_IPC #include "nsChromeRegistryContent.h" -#endif #include @@ -677,11 +675,9 @@ nsChromeRegistry::GetSingleton() } nsRefPtr cr; -#ifdef MOZ_IPC if (GeckoProcessType_Content == XRE_GetProcessType()) cr = new nsChromeRegistryContent(); else -#endif cr = new nsChromeRegistryChrome(); if (NS_FAILED(cr->Init())) diff --git a/chrome/src/nsChromeRegistryChrome.cpp b/chrome/src/nsChromeRegistryChrome.cpp index bc6dc60c341..d98ac7b96bd 100644 --- a/chrome/src/nsChromeRegistryChrome.cpp +++ b/chrome/src/nsChromeRegistryChrome.cpp @@ -36,11 +36,9 @@ * * ***** END LICENSE BLOCK ***** */ -#ifdef MOZ_IPC #include "mozilla/dom/PContentParent.h" #include "RegistryMessageUtils.h" #include "nsResProtocolHandler.h" -#endif #include "nsChromeRegistryChrome.h" @@ -443,7 +441,6 @@ void nsChromeRegistryChrome::UpdateSelectedLocale() } } -#ifdef MOZ_IPC static void SerializeURI(nsIURI* aURI, SerializedURI& aSerializedURI) @@ -541,7 +538,6 @@ nsChromeRegistryChrome::CollectPackages(PLDHashTable *table, args->packages.AppendElement(chromePackage); return (PLDHashOperator)PL_DHASH_NEXT; } -#endif static PRBool CanLoadResource(nsIURI* aResourceURI) diff --git a/chrome/src/nsChromeRegistryChrome.h b/chrome/src/nsChromeRegistryChrome.h index daee848d5dc..44bd07c7f0a 100644 --- a/chrome/src/nsChromeRegistryChrome.h +++ b/chrome/src/nsChromeRegistryChrome.h @@ -75,16 +75,12 @@ class nsChromeRegistryChrome : public nsChromeRegistry nsISimpleEnumerator **_retval); #endif -#ifdef MOZ_IPC void SendRegisteredChrome(mozilla::dom::PContentParent* aChild); -#endif private: -#ifdef MOZ_IPC static PLDHashOperator CollectPackages(PLDHashTable *table, PLDHashEntryHdr *entry, PRUint32 number, void *arg); -#endif nsresult SelectLocaleFromPref(nsIPrefBranch* prefs); NS_OVERRIDE void UpdateSelectedLocale(); diff --git a/chrome/test/Makefile.in b/chrome/test/Makefile.in index 6936444d6a4..73ba8839e39 100644 --- a/chrome/test/Makefile.in +++ b/chrome/test/Makefile.in @@ -47,11 +47,9 @@ MODULE = test_chrome XPCSHELL_TESTS = unit \ $(NULL) -ifdef MOZ_IPC # FIXME/bug 575918: out-of-process xpcshell is broken on OS X ifneq ($(OS_ARCH),Darwin) XPCSHELL_TESTS += unit_ipc endif -endif include $(topsrcdir)/config/rules.mk diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in index 0a356a78d23..19fafa6d0d9 100644 --- a/config/autoconf.mk.in +++ b/config/autoconf.mk.in @@ -102,7 +102,6 @@ MOZ_DEBUG_FLAGS = @MOZ_DEBUG_FLAGS@ MOZ_DEBUG_LDFLAGS=@MOZ_DEBUG_LDFLAGS@ MOZ_EXTENSIONS = @MOZ_EXTENSIONS@ MOZ_JSDEBUGGER = @MOZ_JSDEBUGGER@ -MOZ_IPC = @MOZ_IPC@ MOZ_IPDL_TESTS = @MOZ_IPDL_TESTS@ MOZ_LEAKY = @MOZ_LEAKY@ MOZ_MEMORY = @MOZ_MEMORY@ diff --git a/configure.in b/configure.in index e2c65f0d901..fd5fb9a1e50 100644 --- a/configure.in +++ b/configure.in @@ -4950,7 +4950,6 @@ MOZ_BRANDING_DIRECTORY= MOZ_OFFICIAL_BRANDING= MOZ_FEEDS=1 MOZ_INSTALLER=1 -MOZ_IPC=1 MOZ_JAVAXPCOM= MOZ_JSDEBUGGER=1 MOZ_MATHML=1 @@ -5822,21 +5821,6 @@ MOZ_ARG_DISABLE_BOOL(jsd, MOZ_JSDEBUGGER=1) -dnl ======================================================== -dnl = Disable IPC support for tabs and plugins -dnl ======================================================== -MOZ_ARG_DISABLE_BOOL(ipc, -[ --disable-ipc Disable IPC for tabs and plugins (not supported)], - MOZ_IPC=, - MOZ_IPC=1) - -if test -z "$MOZ_IPC"; then - AC_MSG_ERROR([--disable-ipc is no longer supported.]) -fi - -AC_DEFINE(MOZ_IPC) -AC_SUBST(MOZ_IPC) - dnl ======================================================== dnl = Enable IPDL's "expensive" unit tests dnl ======================================================== diff --git a/content/base/src/Makefile.in b/content/base/src/Makefile.in index b8b9e5bd9d6..fc7010cf669 100644 --- a/content/base/src/Makefile.in +++ b/content/base/src/Makefile.in @@ -178,14 +178,9 @@ EXTRA_COMPONENTS = \ contentSecurityPolicy.manifest \ contentAreaDropListener.js \ contentAreaDropListener.manifest \ - $(NULL) - -ifdef MOZ_IPC -EXTRA_COMPONENTS += \ messageWakeupService.js \ messageWakeupService.manifest \ $(NULL) -endif EXTRA_JS_MODULES = \ CSPUtils.jsm \ diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp index e416efa1ee1..80aaa4e0fe6 100644 --- a/content/base/src/nsDocument.cpp +++ b/content/base/src/nsDocument.cpp @@ -8350,12 +8350,10 @@ PLDHashOperator UnlockEnumerator(imgIRequest* aKey, nsresult nsDocument::SetImageLockingState(PRBool aLocked) { -#ifdef MOZ_IPC if (XRE_GetProcessType() == GeckoProcessType_Content && !nsContentUtils::GetBoolPref("content.image.allow_locking", PR_TRUE)) { return NS_OK; } -#endif // MOZ_IPC // If there's no change, there's nothing to do. if (mLockingImages == aLocked) diff --git a/content/base/src/nsFrameLoader.cpp b/content/base/src/nsFrameLoader.cpp index f10ab414b47..e8ef29c8b2b 100644 --- a/content/base/src/nsFrameLoader.cpp +++ b/content/base/src/nsFrameLoader.cpp @@ -44,9 +44,7 @@ * handling of loads in it, recursion-checking). */ -#ifdef MOZ_IPC -# include "base/basictypes.h" -#endif +#include "base/basictypes.h" #include "prenv.h" @@ -112,15 +110,12 @@ #include "Layers.h" -#ifdef MOZ_IPC #include "ContentParent.h" #include "TabParent.h" #include "mozilla/layout/RenderFrameParent.h" using namespace mozilla; using namespace mozilla::dom; -#endif - using namespace mozilla::layers; typedef FrameMetrics::ViewID ViewID; @@ -324,13 +319,11 @@ nsFrameLoader::nsFrameLoader(nsIContent *aOwner, PRBool aNetworkCreated) , mInShow(PR_FALSE) , mHideCalled(PR_FALSE) , mNetworkCreated(aNetworkCreated) -#ifdef MOZ_IPC , mDelayRemoteDialogs(PR_FALSE) , mRemoteBrowserShown(PR_FALSE) , mRemoteFrame(false) , mCurrentRemoteFrame(nsnull) , mRemoteBrowser(nsnull) -#endif , mRenderMode(RENDER_MODE_DEFAULT) { } @@ -448,7 +441,6 @@ nsFrameLoader::ReallyStartLoadingInternal() return rv; } -#ifdef MOZ_IPC if (mRemoteFrame) { if (!mRemoteBrowser) { TryRemoteBrowser(); @@ -463,7 +455,6 @@ nsFrameLoader::ReallyStartLoadingInternal() mRemoteBrowser->LoadURL(mURIToLoad); return NS_OK; } -#endif NS_ASSERTION(mDocShell, "MaybeCreateDocShell succeeded with a null mDocShell"); @@ -534,11 +525,9 @@ nsFrameLoader::CheckURILoad(nsIURI* aURI) if (NS_FAILED(rv)) { return rv; } -#ifdef MOZ_IPC if (mRemoteFrame) { return NS_OK; } -#endif return CheckForRecursiveLoad(aURI); } @@ -554,12 +543,10 @@ nsFrameLoader::GetDocShell(nsIDocShell **aDocShell) nsresult rv = MaybeCreateDocShell(); if (NS_FAILED(rv)) return rv; -#ifdef MOZ_IPC if (mRemoteFrame) { NS_WARNING("No docshells for remote frames!"); return NS_ERROR_NOT_AVAILABLE; } -#endif NS_ASSERTION(mDocShell, "MaybeCreateDocShell succeeded, but null mDocShell"); } @@ -776,10 +763,7 @@ nsFrameLoader::Show(PRInt32 marginWidth, PRInt32 marginHeight, return PR_FALSE; } -#ifdef MOZ_IPC - if (!mRemoteFrame) -#endif - { + if (!mRemoteFrame) { if (!mDocShell) return PR_FALSE; nsCOMPtr presShell; @@ -803,11 +787,9 @@ nsFrameLoader::Show(PRInt32 marginWidth, PRInt32 marginHeight, if (!view) return PR_FALSE; -#ifdef MOZ_IPC if (mRemoteFrame) { return ShowRemoteFrame(GetSubDocumentSize(frame)); } -#endif nsCOMPtr baseWindow = do_QueryInterface(mDocShell); NS_ASSERTION(baseWindow, "Found a nsIDocShell that isn't a nsIBaseWindow."); @@ -880,7 +862,6 @@ nsFrameLoader::Show(PRInt32 marginWidth, PRInt32 marginHeight, return PR_TRUE; } -#ifdef MOZ_IPC bool nsFrameLoader::ShowRemoteFrame(const nsIntSize& size) { @@ -909,7 +890,6 @@ nsFrameLoader::ShowRemoteFrame(const nsIntSize& size) return true; } -#endif void nsFrameLoader::Hide() @@ -1234,13 +1214,11 @@ nsFrameLoader::SwapWithOtherLoader(nsFrameLoader* aOther, void nsFrameLoader::DestroyChild() { -#ifdef MOZ_IPC if (mRemoteBrowser) { mRemoteBrowser->SetOwnerElement(nsnull); mRemoteBrowser->Destroy(); mRemoteBrowser = nsnull; } -#endif } NS_IMETHODIMP @@ -1327,14 +1305,11 @@ void nsFrameLoader::SetOwnerContent(nsIContent* aContent) { mOwnerContent = aContent; -#ifdef MOZ_IPC if (RenderFrameParent* rfp = GetCurrentRemoteFrame()) { rfp->OwnerContentChanged(aContent); } -#endif } -#ifdef MOZ_IPC bool nsFrameLoader::ShouldUseRemoteProcess() { @@ -1370,7 +1345,6 @@ nsFrameLoader::ShouldUseRemoteProcess() PR_FALSE); return (bool) remoteEnabled; } -#endif nsresult nsFrameLoader::MaybeCreateDocShell() @@ -1378,19 +1352,15 @@ nsFrameLoader::MaybeCreateDocShell() if (mDocShell) { return NS_OK; } -#ifdef MOZ_IPC if (mRemoteFrame) { return NS_OK; } -#endif NS_ENSURE_STATE(!mDestroyCalled); -#ifdef MOZ_IPC if (ShouldUseRemoteProcess()) { mRemoteFrame = true; return NS_OK; } -#endif // Get our parent docshell off the document of mOwnerContent // XXXbz this is such a total hack.... We really need to have a @@ -1539,10 +1509,8 @@ nsFrameLoader::CheckForRecursiveLoad(nsIURI* aURI) if (NS_FAILED(rv)) { return rv; } -#ifdef MOZ_IPC NS_ASSERTION(!mRemoteFrame, "Shouldn't call CheckForRecursiveLoad on remote frames."); -#endif if (!mDocShell) { return NS_ERROR_FAILURE; } @@ -1642,7 +1610,6 @@ nsFrameLoader::CheckForRecursiveLoad(nsIURI* aURI) NS_IMETHODIMP nsFrameLoader::UpdatePositionAndSize(nsIFrame *aIFrame) { -#ifdef MOZ_IPC if (mRemoteFrame) { if (mRemoteBrowser) { nsIntSize size = GetSubDocumentSize(aIFrame); @@ -1650,7 +1617,6 @@ nsFrameLoader::UpdatePositionAndSize(nsIFrame *aIFrame) } return NS_OK; } -#endif return UpdateBaseWindowPositionAndSize(aIFrame); } @@ -1718,7 +1684,6 @@ nsFrameLoader::GetSubDocumentSize(const nsIFrame *aIFrame) presContext->AppUnitsToDevPixels(docSizeAppUnits.height)); } -#ifdef MOZ_IPC bool nsFrameLoader::TryRemoteBrowser() { @@ -1798,24 +1763,19 @@ nsFrameLoader::TryRemoteBrowser() } return true; } -#endif -#ifdef MOZ_IPC mozilla::dom::PBrowserParent* nsFrameLoader::GetRemoteBrowser() { return mRemoteBrowser; } -#endif NS_IMETHODIMP nsFrameLoader::ActivateRemoteFrame() { -#ifdef MOZ_IPC if (mRemoteBrowser) { mRemoteBrowser->Activate(); return NS_OK; } -#endif return NS_ERROR_UNEXPECTED; } @@ -1828,14 +1788,12 @@ nsFrameLoader::SendCrossProcessMouseEvent(const nsAString& aType, PRInt32 aModifiers, PRBool aIgnoreRootScrollFrame) { -#ifdef MOZ_IPC if (mRemoteBrowser) { mRemoteBrowser->SendMouseEvent(aType, aX, aY, aButton, aClickCount, aModifiers, aIgnoreRootScrollFrame); return NS_OK; } -#endif return NS_ERROR_FAILURE; } @@ -1843,12 +1801,10 @@ NS_IMETHODIMP nsFrameLoader::ActivateFrameEvent(const nsAString& aType, PRBool aCapture) { -#ifdef MOZ_IPC if (mRemoteBrowser) { return mRemoteBrowser->SendActivateFrameEvent(nsString(aType), aCapture) ? NS_OK : NS_ERROR_NOT_AVAILABLE; } -#endif return NS_ERROR_FAILURE; } @@ -1859,31 +1815,24 @@ nsFrameLoader::SendCrossProcessKeyEvent(const nsAString& aType, PRInt32 aModifiers, PRBool aPreventDefault) { -#ifdef MOZ_IPC if (mRemoteBrowser) { mRemoteBrowser->SendKeyEvent(aType, aKeyCode, aCharCode, aModifiers, aPreventDefault); return NS_OK; } -#endif return NS_ERROR_FAILURE; } NS_IMETHODIMP nsFrameLoader::GetDelayRemoteDialogs(PRBool* aRetVal) { -#ifdef MOZ_IPC *aRetVal = mDelayRemoteDialogs; -#else - *aRetVal = PR_FALSE; -#endif return NS_OK; } NS_IMETHODIMP nsFrameLoader::SetDelayRemoteDialogs(PRBool aDelay) { -#ifdef MOZ_IPC if (mRemoteBrowser && mDelayRemoteDialogs && !aDelay) { nsRefPtr ev = NS_NewRunnableMethod(mRemoteBrowser, @@ -1891,7 +1840,6 @@ nsFrameLoader::SetDelayRemoteDialogs(PRBool aDelay) NS_DispatchToCurrentThread(ev); } mDelayRemoteDialogs = aDelay; -#endif return NS_OK; } @@ -1922,13 +1870,11 @@ nsFrameLoader::CreateStaticClone(nsIFrameLoader* aDest) bool LoadScript(void* aCallbackData, const nsAString& aURL) { -#ifdef MOZ_IPC mozilla::dom::PBrowserParent* tabParent = static_cast(aCallbackData)->GetRemoteBrowser(); if (tabParent) { return tabParent->SendLoadRemoteScript(nsString(aURL)); } -#endif nsFrameLoader* fl = static_cast(aCallbackData); nsRefPtr tabChild = static_cast(fl->GetTabChildGlobalAsEventTarget()); @@ -1965,13 +1911,11 @@ bool SendAsyncMessageToChild(void* aCallbackData, const nsAString& aMessage, const nsAString& aJSON) { -#ifdef MOZ_IPC mozilla::dom::PBrowserParent* tabParent = static_cast(aCallbackData)->GetRemoteBrowser(); if (tabParent) { return tabParent->SendAsyncMessage(nsString(aMessage), nsString(aJSON)); } -#endif nsRefPtr ev = new nsAsyncMessageToChild(static_cast(aCallbackData), aMessage, aJSON); @@ -1996,7 +1940,6 @@ nsFrameLoader::GetContentViewsIn(float aXPx, float aYPx, PRUint32* aLength, nsIContentView*** aResult) { -#ifdef MOZ_IPC nscoord x = nsPresContext::CSSPixelsToAppUnits(aXPx - aLeftSize); nscoord y = nsPresContext::CSSPixelsToAppUnits(aYPx - aTopSize); nscoord w = nsPresContext::CSSPixelsToAppUnits(aLeftSize + aRightSize) + 1; @@ -2024,10 +1967,6 @@ nsFrameLoader::GetContentViewsIn(float aXPx, float aYPx, *aResult = result; *aLength = ids.Length(); -#else - *aResult = nsnull; - *aLength = 0; -#endif return NS_OK; } @@ -2035,7 +1974,6 @@ nsFrameLoader::GetContentViewsIn(float aXPx, float aYPx, NS_IMETHODIMP nsFrameLoader::GetRootContentView(nsIContentView** aContentView) { -#ifdef MOZ_IPC RenderFrameParent* rfp = GetCurrentRemoteFrame(); if (!rfp) { *aContentView = nsnull; @@ -2047,10 +1985,6 @@ nsFrameLoader::GetRootContentView(nsIContentView** aContentView) nsRefPtr(view).forget(aContentView); return NS_OK; -#else - return NS_ERROR_NOT_IMPLEMENTED; -#endif - } nsresult @@ -2063,20 +1997,14 @@ nsFrameLoader::EnsureMessageManager() return rv; } - if (!mIsTopLevelContent -#ifdef MOZ_IPC - && !mRemoteFrame -#endif - ) { + if (!mIsTopLevelContent && !mRemoteFrame) { return NS_OK; } if (mMessageManager) { -#ifdef MOZ_IPC if (ShouldUseRemoteProcess()) { mMessageManager->SetCallbackData(mRemoteBrowserShown ? this : nsnull); } -#endif return NS_OK; } @@ -2092,7 +2020,6 @@ nsFrameLoader::EnsureMessageManager() nsCOMPtr parentManager; chromeWindow->GetMessageManager(getter_AddRefs(parentManager)); -#ifdef MOZ_IPC if (ShouldUseRemoteProcess()) { mMessageManager = new nsFrameMessageManager(PR_TRUE, nsnull, @@ -2103,7 +2030,6 @@ nsFrameLoader::EnsureMessageManager() cx); NS_ENSURE_TRUE(mMessageManager, NS_ERROR_OUT_OF_MEMORY); } else -#endif { mMessageManager = new nsFrameMessageManager(PR_TRUE, diff --git a/content/base/src/nsFrameLoader.h b/content/base/src/nsFrameLoader.h index 7df004da528..4aa90fe7c96 100644 --- a/content/base/src/nsFrameLoader.h +++ b/content/base/src/nsFrameLoader.h @@ -61,7 +61,6 @@ class nsIView; class nsIInProcessContentFrameMessageManager; class AutoResetInShow; -#ifdef MOZ_IPC namespace mozilla { namespace dom { class PBrowserParent; @@ -79,7 +78,6 @@ typedef struct _GtkWidget GtkWidget; #ifdef MOZ_WIDGET_QT class QX11EmbedContainer; #endif -#endif /** * Defines a target configuration for this 's content @@ -167,11 +165,9 @@ class nsFrameLoader : public nsIFrameLoader, public nsIContentViewManager { friend class AutoResetInShow; -#ifdef MOZ_IPC typedef mozilla::dom::PBrowserParent PBrowserParent; typedef mozilla::dom::TabParent TabParent; typedef mozilla::layout::RenderFrameParent RenderFrameParent; -#endif protected: nsFrameLoader(nsIContent *aOwner, PRBool aNetworkCreated); @@ -246,7 +242,6 @@ public: nsIDocument* GetOwnerDoc() const { return mOwnerContent ? mOwnerContent->GetOwnerDoc() : nsnull; } -#ifdef MOZ_IPC PBrowserParent* GetRemoteBrowser(); /** @@ -277,7 +272,6 @@ public: { mCurrentRemoteFrame = aFrame; } -#endif nsFrameMessageManager* GetFrameMessageManager() { return mMessageManager; } nsIContent* GetOwnerContent() { return mOwnerContent; } @@ -285,9 +279,7 @@ public: private: -#ifdef MOZ_IPC bool ShouldUseRemoteProcess(); -#endif /** * If we are an IPC frame, set mRemoteFrame. Otherwise, create and @@ -307,13 +299,11 @@ private: void FireErrorEvent(); nsresult ReallyStartLoadingInternal(); -#ifdef MOZ_IPC // Return true if remote browser created; nothing else to do bool TryRemoteBrowser(); // Tell the remote browser that it's now "virtually visible" bool ShowRemoteFrame(const nsIntSize& size); -#endif nsCOMPtr mDocShell; nsCOMPtr mURIToLoad; @@ -335,7 +325,6 @@ private: // it may lose the flag. PRPackedBool mNetworkCreated : 1; -#ifdef MOZ_IPC PRPackedBool mDelayRemoteDialogs : 1; PRPackedBool mRemoteBrowserShown : 1; bool mRemoteFrame; @@ -343,7 +332,6 @@ private: nsCOMPtr mChildHost; RenderFrameParent* mCurrentRemoteFrame; TabParent* mRemoteBrowser; -#endif // See nsIFrameLoader.idl. Short story, if !(mRenderMode & // RENDER_MODE_ASYNC_SCROLL), all the fields below are ignored in diff --git a/content/base/src/nsFrameMessageManager.cpp b/content/base/src/nsFrameMessageManager.cpp index 374d592b944..6b0942aa408 100644 --- a/content/base/src/nsFrameMessageManager.cpp +++ b/content/base/src/nsFrameMessageManager.cpp @@ -35,10 +35,8 @@ * * ***** END LICENSE BLOCK ***** */ -#ifdef MOZ_IPC #include "ContentChild.h" #include "ContentParent.h" -#endif #include "jscntxt.h" #include "nsFrameMessageManager.h" #include "nsContentUtils.h" @@ -729,7 +727,6 @@ NS_IMPL_ISUPPORTS1(nsScriptCacheCleaner, nsIObserver) nsFrameMessageManager* nsFrameMessageManager::sChildProcessManager = nsnull; nsFrameMessageManager* nsFrameMessageManager::sParentProcessManager = nsnull; -#ifdef MOZ_IPC bool SendAsyncMessageToChildProcess(void* aCallbackData, const nsAString& aMessage, const nsAString& aJSON) @@ -769,14 +766,11 @@ bool SendAsyncMessageToParentProcess(void* aCallbackData, return true; } -#endif - nsresult NS_NewParentProcessMessageManager(nsIFrameMessageManager** aResult) { NS_ASSERTION(!nsFrameMessageManager::sParentProcessManager, "Re-creating sParentProcessManager"); -#ifdef MOZ_IPC NS_ENSURE_TRUE(IsChromeProcess(), NS_ERROR_NOT_AVAILABLE); nsFrameMessageManager* mm = new nsFrameMessageManager(PR_TRUE, nsnull, @@ -790,9 +784,6 @@ NS_NewParentProcessMessageManager(nsIFrameMessageManager** aResult) NS_ENSURE_TRUE(mm, NS_ERROR_OUT_OF_MEMORY); nsFrameMessageManager::sParentProcessManager = mm; return CallQueryInterface(mm, aResult); -#else - return NS_ERROR_NOT_AVAILABLE; -#endif } @@ -801,7 +792,6 @@ NS_NewChildProcessMessageManager(nsISyncMessageSender** aResult) { NS_ASSERTION(!nsFrameMessageManager::sChildProcessManager, "Re-creating sChildProcessManager"); -#ifdef MOZ_IPC NS_ENSURE_TRUE(!IsChromeProcess(), NS_ERROR_NOT_AVAILABLE); nsFrameMessageManager* mm = new nsFrameMessageManager(PR_FALSE, SendSyncMessageToParentProcess, @@ -815,7 +805,4 @@ NS_NewChildProcessMessageManager(nsISyncMessageSender** aResult) NS_ENSURE_TRUE(mm, NS_ERROR_OUT_OF_MEMORY); nsFrameMessageManager::sChildProcessManager = mm; return CallQueryInterface(mm, aResult); -#else - return NS_ERROR_NOT_AVAILABLE; -#endif } diff --git a/content/canvas/src/Makefile.in b/content/canvas/src/Makefile.in index 836b895593b..f98c7f4699d 100644 --- a/content/canvas/src/Makefile.in +++ b/content/canvas/src/Makefile.in @@ -55,14 +55,9 @@ CPPSRCS = \ CanvasImageCache.cpp \ CanvasUtils.cpp \ nsCanvasRenderingContext2D.cpp \ - $(NULL) - -ifdef MOZ_IPC -CPPSRCS += \ DocumentRendererParent.cpp \ DocumentRendererChild.cpp \ $(NULL) -endif # Canvas 3D Pieces diff --git a/content/canvas/src/nsCanvasRenderingContext2D.cpp b/content/canvas/src/nsCanvasRenderingContext2D.cpp index 6a417549196..0f907f4084f 100644 --- a/content/canvas/src/nsCanvasRenderingContext2D.cpp +++ b/content/canvas/src/nsCanvasRenderingContext2D.cpp @@ -38,9 +38,7 @@ * * ***** END LICENSE BLOCK ***** */ -#ifdef MOZ_IPC # include "base/basictypes.h" -#endif #include "nsIDOMXULElement.h" @@ -119,7 +117,6 @@ #include "nsStyleUtil.h" #include "CanvasImageCache.h" -#ifdef MOZ_IPC # include # include "mozilla/dom/ContentParent.h" # include "mozilla/ipc/PDocumentRendererParent.h" @@ -130,7 +127,6 @@ # undef DrawText using namespace mozilla::ipc; -#endif #ifdef MOZ_SVG #include "nsSVGEffects.h" @@ -1234,7 +1230,6 @@ nsCanvasRenderingContext2D::SetIsOpaque(PRBool isOpaque) NS_IMETHODIMP nsCanvasRenderingContext2D::SetIsIPC(PRBool isIPC) { -#ifdef MOZ_IPC if (isIPC == mIPC) return NS_OK; @@ -1248,9 +1243,6 @@ nsCanvasRenderingContext2D::SetIsIPC(PRBool isIPC) } return NS_OK; -#else - return NS_ERROR_NOT_IMPLEMENTED; -#endif } NS_IMETHODIMP @@ -3767,7 +3759,6 @@ nsCanvasRenderingContext2D::AsyncDrawXULElement(nsIDOMXULElement* aElem, float a if (!frameloader) return NS_ERROR_FAILURE; -#ifdef MOZ_IPC PBrowserParent *child = frameloader->GetRemoteBrowser(); if (!child) { nsCOMPtr window = @@ -3815,14 +3806,6 @@ nsCanvasRenderingContext2D::AsyncDrawXULElement(nsIDOMXULElement* aElem, float a } return NS_OK; -#else - nsCOMPtr window = - do_GetInterface(frameloader->GetExistingDocShell()); - if (!window) - return NS_ERROR_FAILURE; - - return DrawWindow(window, aX, aY, aW, aH, aBGColor, flags); -#endif } // diff --git a/content/events/src/nsDOMEvent.cpp b/content/events/src/nsDOMEvent.cpp index b956ba04ce7..71644cdb2b3 100644 --- a/content/events/src/nsDOMEvent.cpp +++ b/content/events/src/nsDOMEvent.cpp @@ -37,10 +37,8 @@ * * ***** END LICENSE BLOCK ***** */ -#ifdef MOZ_IPC #include "base/basictypes.h" #include "IPC/IPCMessageUtils.h" -#endif #include "nsCOMPtr.h" #include "nsDOMEvent.h" #include "nsEventStateManager.h" @@ -1370,7 +1368,6 @@ nsDOMEvent::GetPreventDefault(PRBool* aReturn) void nsDOMEvent::Serialize(IPC::Message* aMsg, PRBool aSerializeInterfaceType) { -#ifdef MOZ_IPC if (aSerializeInterfaceType) { IPC::WriteParam(aMsg, NS_LITERAL_STRING("event")); } @@ -1392,13 +1389,11 @@ nsDOMEvent::Serialize(IPC::Message* aMsg, PRBool aSerializeInterfaceType) IPC::WriteParam(aMsg, trusted); // No timestamp serialization for now! -#endif } PRBool nsDOMEvent::Deserialize(const IPC::Message* aMsg, void** aIter) { -#ifdef MOZ_IPC nsString type; NS_ENSURE_TRUE(IPC::ReadParam(aMsg, aIter, &type), PR_FALSE); @@ -1416,9 +1411,6 @@ nsDOMEvent::Deserialize(const IPC::Message* aMsg, void** aIter) SetTrusted(trusted); return PR_TRUE; -#else - return PR_FALSE; -#endif } diff --git a/content/events/src/nsDOMNotifyPaintEvent.cpp b/content/events/src/nsDOMNotifyPaintEvent.cpp index 175cf0a21f8..62b6e597313 100644 --- a/content/events/src/nsDOMNotifyPaintEvent.cpp +++ b/content/events/src/nsDOMNotifyPaintEvent.cpp @@ -36,10 +36,8 @@ * * ***** END LICENSE BLOCK ***** */ -#ifdef MOZ_IPC #include "base/basictypes.h" #include "IPC/IPCMessageUtils.h" -#endif #include "nsDOMNotifyPaintEvent.h" #include "nsContentUtils.h" #include "nsClientRect.h" @@ -148,7 +146,6 @@ nsDOMNotifyPaintEvent::GetPaintRequests(nsIDOMPaintRequestList** aResult) return NS_OK; } -#ifdef MOZ_IPC void nsDOMNotifyPaintEvent::Serialize(IPC::Message* aMsg, PRBool aSerializeInterfaceType) @@ -190,7 +187,6 @@ nsDOMNotifyPaintEvent::Deserialize(const IPC::Message* aMsg, void** aIter) return PR_TRUE; } -#endif nsresult NS_NewDOMNotifyPaintEvent(nsIDOMEvent** aInstancePtrResult, nsPresContext* aPresContext, diff --git a/content/events/src/nsDOMNotifyPaintEvent.h b/content/events/src/nsDOMNotifyPaintEvent.h index 2238f551f32..aed65914a26 100644 --- a/content/events/src/nsDOMNotifyPaintEvent.h +++ b/content/events/src/nsDOMNotifyPaintEvent.h @@ -61,10 +61,8 @@ public: // Forward to base class NS_FORWARD_TO_NSDOMEVENT -#ifdef MOZ_IPC virtual void Serialize(IPC::Message* aMsg, PRBool aSerializeInterfaceType); virtual PRBool Deserialize(const IPC::Message* aMsg, void** aIter); -#endif private: nsRegion GetRegion(); diff --git a/content/events/src/nsDOMScrollAreaEvent.cpp b/content/events/src/nsDOMScrollAreaEvent.cpp index 674164c26d8..5712179653b 100644 --- a/content/events/src/nsDOMScrollAreaEvent.cpp +++ b/content/events/src/nsDOMScrollAreaEvent.cpp @@ -35,10 +35,8 @@ * * ***** END LICENSE BLOCK ***** */ -#ifdef MOZ_IPC #include "base/basictypes.h" #include "IPC/IPCMessageUtils.h" -#endif #include "nsDOMScrollAreaEvent.h" #include "nsGUIEvent.h" @@ -116,7 +114,6 @@ nsDOMScrollAreaEvent::InitScrollAreaEvent(const nsAString &aEventType, return NS_OK; } -#ifdef MOZ_IPC void nsDOMScrollAreaEvent::Serialize(IPC::Message* aMsg, PRBool aSerializeInterfaceType) @@ -152,7 +149,6 @@ nsDOMScrollAreaEvent::Deserialize(const IPC::Message* aMsg, void** aIter) return PR_TRUE; } -#endif nsresult NS_NewDOMScrollAreaEvent(nsIDOMEvent **aInstancePtrResult, diff --git a/content/events/src/nsDOMScrollAreaEvent.h b/content/events/src/nsDOMScrollAreaEvent.h index 41b31372fd1..34f943fd0d5 100644 --- a/content/events/src/nsDOMScrollAreaEvent.h +++ b/content/events/src/nsDOMScrollAreaEvent.h @@ -58,10 +58,8 @@ public: NS_FORWARD_TO_NSDOMUIEVENT -#ifdef MOZ_IPC virtual void Serialize(IPC::Message* aMsg, PRBool aSerializeInterfaceType); virtual PRBool Deserialize(const IPC::Message* aMsg, void** aIter); -#endif protected: nsClientRect mClientArea; diff --git a/content/events/src/nsDOMUIEvent.cpp b/content/events/src/nsDOMUIEvent.cpp index 758baa590eb..a3c1406a77f 100644 --- a/content/events/src/nsDOMUIEvent.cpp +++ b/content/events/src/nsDOMUIEvent.cpp @@ -37,10 +37,8 @@ * * ***** END LICENSE BLOCK ***** */ -#ifdef MOZ_IPC #include "base/basictypes.h" #include "IPC/IPCMessageUtils.h" -#endif #include "nsCOMPtr.h" #include "nsDOMUIEvent.h" #include "nsIPresShell.h" @@ -394,7 +392,6 @@ nsDOMUIEvent::DuplicatePrivateData() return rv; } -#ifdef MOZ_IPC void nsDOMUIEvent::Serialize(IPC::Message* aMsg, PRBool aSerializeInterfaceType) { @@ -416,7 +413,6 @@ nsDOMUIEvent::Deserialize(const IPC::Message* aMsg, void** aIter) NS_ENSURE_TRUE(IPC::ReadParam(aMsg, aIter, &mDetail), PR_FALSE); return PR_TRUE; } -#endif nsresult NS_NewDOMUIEvent(nsIDOMEvent** aInstancePtrResult, nsPresContext* aPresContext, diff --git a/content/events/src/nsDOMUIEvent.h b/content/events/src/nsDOMUIEvent.h index 71bf18f351b..a242af36f5b 100644 --- a/content/events/src/nsDOMUIEvent.h +++ b/content/events/src/nsDOMUIEvent.h @@ -62,10 +62,8 @@ public: // nsIPrivateDOMEvent interface NS_IMETHOD DuplicatePrivateData(); -#ifdef MOZ_IPC virtual void Serialize(IPC::Message* aMsg, PRBool aSerializeInterfaceType); virtual PRBool Deserialize(const IPC::Message* aMsg, void** aIter); -#endif // Forward to nsDOMEvent NS_FORWARD_TO_NSDOMEVENT diff --git a/content/events/src/nsEventStateManager.cpp b/content/events/src/nsEventStateManager.cpp index f3ae73f2463..5b5fb1a32d4 100644 --- a/content/events/src/nsEventStateManager.cpp +++ b/content/events/src/nsEventStateManager.cpp @@ -44,9 +44,7 @@ * * ***** END LICENSE BLOCK ***** */ -#ifdef MOZ_IPC #include "mozilla/dom/TabParent.h" -#endif #include "nsCOMPtr.h" #include "nsEventStateManager.h" @@ -164,9 +162,7 @@ #import #endif -#ifdef MOZ_IPC using namespace mozilla::dom; -#endif //#define DEBUG_DOCSHELL_FOCUS @@ -1338,20 +1334,16 @@ nsEventStateManager::PreHandleEvent(nsPresContext* aPresContext, break; case NS_QUERY_SELECTED_TEXT: { -#ifdef MOZ_IPC if (RemoteQueryContentEvent(aEvent)) break; -#endif nsContentEventHandler handler(mPresContext); handler.OnQuerySelectedText((nsQueryContentEvent*)aEvent); } break; case NS_QUERY_TEXT_CONTENT: { -#ifdef MOZ_IPC if (RemoteQueryContentEvent(aEvent)) break; -#endif nsContentEventHandler handler(mPresContext); handler.OnQueryTextContent((nsQueryContentEvent*)aEvent); } @@ -1407,7 +1399,6 @@ nsEventStateManager::PreHandleEvent(nsPresContext* aPresContext, break; case NS_SELECTION_SET: { -#ifdef MOZ_IPC nsSelectionEvent *selectionEvent = static_cast(aEvent); if (IsTargetCrossProcess(selectionEvent)) { @@ -1416,7 +1407,6 @@ nsEventStateManager::PreHandleEvent(nsPresContext* aPresContext, selectionEvent->mSucceeded = PR_TRUE; break; } -#endif nsContentEventHandler handler(mPresContext); handler.OnSelectionEvent((nsSelectionEvent*)aEvent); } @@ -1437,7 +1427,6 @@ nsEventStateManager::PreHandleEvent(nsPresContext* aPresContext, DoContentCommandScrollEvent(static_cast(aEvent)); } break; -#ifdef MOZ_IPC case NS_TEXT_TEXT: { nsTextEvent *textEvent = static_cast(aEvent); @@ -1464,7 +1453,6 @@ nsEventStateManager::PreHandleEvent(nsPresContext* aPresContext, } } break; -#endif // MOZ_IPC } return NS_OK; } @@ -3337,7 +3325,6 @@ nsEventStateManager::PostHandleEvent(nsPresContext* aPresContext, return ret; } -#ifdef MOZ_IPC PRBool nsEventStateManager::RemoteQueryContentEvent(nsEvent *aEvent) { @@ -3367,7 +3354,6 @@ nsEventStateManager::IsTargetCrossProcess(nsGUIEvent *aEvent) return PR_FALSE; return TabParent::GetIMETabParent() != nsnull; } -#endif NS_IMETHODIMP nsEventStateManager::NotifyDestroyPresContext(nsPresContext* aPresContext) diff --git a/content/events/src/nsEventStateManager.h b/content/events/src/nsEventStateManager.h index 236af0d33fb..357559ad52a 100644 --- a/content/events/src/nsEventStateManager.h +++ b/content/events/src/nsEventStateManager.h @@ -349,11 +349,9 @@ protected: nsresult DoContentCommandEvent(nsContentCommandEvent* aEvent); nsresult DoContentCommandScrollEvent(nsContentCommandEvent* aEvent); -#ifdef MOZ_IPC PRBool RemoteQueryContentEvent(nsEvent *aEvent); mozilla::dom::TabParent *GetCrossProcessTarget(); PRBool IsTargetCrossProcess(nsGUIEvent *aEvent); -#endif PRInt32 mLockCursor; diff --git a/content/html/content/src/Makefile.in b/content/html/content/src/Makefile.in index 7659fe6a1c4..e4a3d3e19c4 100644 --- a/content/html/content/src/Makefile.in +++ b/content/html/content/src/Makefile.in @@ -50,14 +50,9 @@ LIBXUL_LIBRARY = 1 EXPORTS = \ nsImageMapUtils.h \ nsClientRect.h \ + nsHTMLDNSPrefetch.h \ $(NULL) -ifdef MOZ_IPC -EXPORTS += \ - nsHTMLDNSPrefetch.h \ - $(NULL) -endif - CPPSRCS = \ nsClientRect.cpp \ nsHTMLDNSPrefetch.cpp \ diff --git a/content/html/content/src/nsHTMLCanvasElement.cpp b/content/html/content/src/nsHTMLCanvasElement.cpp index d545cbb269e..acf8bf9c6e5 100644 --- a/content/html/content/src/nsHTMLCanvasElement.cpp +++ b/content/html/content/src/nsHTMLCanvasElement.cpp @@ -553,7 +553,6 @@ NS_IMETHODIMP nsHTMLCanvasElement::MozGetIPCContext(const nsAString& aContextId, nsISupports **aContext) { -#ifdef MOZ_IPC if(!nsContentUtils::IsCallerTrustedForRead()) { // XXX ERRMSG we need to report an error to developers here! (bug 329026) return NS_ERROR_DOM_SECURITY_ERR; @@ -588,9 +587,6 @@ nsHTMLCanvasElement::MozGetIPCContext(const nsAString& aContextId, NS_ADDREF (*aContext = mCurrentContext); return NS_OK; -#else - return NS_ERROR_NOT_IMPLEMENTED; -#endif } nsresult diff --git a/content/html/content/src/nsHTMLDNSPrefetch.cpp b/content/html/content/src/nsHTMLDNSPrefetch.cpp index 0a400794dbb..36ee2f26a0f 100644 --- a/content/html/content/src/nsHTMLDNSPrefetch.cpp +++ b/content/html/content/src/nsHTMLDNSPrefetch.cpp @@ -36,12 +36,10 @@ * * ***** END LICENSE BLOCK ***** */ -#ifdef MOZ_IPC #include "base/basictypes.h" #include "mozilla/net/NeckoCommon.h" #include "mozilla/net/NeckoChild.h" #include "nsURLHelper.h" -#endif #include "nsHTMLDNSPrefetch.h" #include "nsCOMPtr.h" @@ -108,10 +106,8 @@ nsHTMLDNSPrefetch::Initialize() rv = CallGetService(kDNSServiceCID, &sDNSService); if (NS_FAILED(rv)) return rv; -#ifdef MOZ_IPC if (IsNeckoChild()) NeckoChild::InitNeckoChild(); -#endif sInitialized = PR_TRUE; return NS_OK; @@ -142,7 +138,6 @@ nsHTMLDNSPrefetch::IsAllowed (nsIDocument *aDocument) nsresult nsHTMLDNSPrefetch::Prefetch(Link *aElement, PRUint16 flags) { -#ifdef MOZ_IPC if (IsNeckoChild()) { // Instead of transporting the Link object to the other process // we are using the hostname based function here, too. Compared to the @@ -153,7 +148,6 @@ nsHTMLDNSPrefetch::Prefetch(Link *aElement, PRUint16 flags) return Prefetch(hostname, flags); } -#endif if (!(sInitialized && sPrefetches && sDNSService && sDNSListener)) return NS_ERROR_NOT_AVAILABLE; @@ -182,7 +176,6 @@ nsHTMLDNSPrefetch::PrefetchHigh(Link *aElement) nsresult nsHTMLDNSPrefetch::Prefetch(nsAString &hostname, PRUint16 flags) { -#ifdef MOZ_IPC if (IsNeckoChild()) { // We need to check IsEmpty() because net_IsValidHostName() // considers empty strings to be valid hostnames @@ -192,7 +185,6 @@ nsHTMLDNSPrefetch::Prefetch(nsAString &hostname, PRUint16 flags) } return NS_OK; } -#endif if (!(sInitialized && sDNSService && sPrefetches && sDNSListener)) return NS_ERROR_NOT_AVAILABLE; diff --git a/content/html/content/src/nsHTMLDNSPrefetch.h b/content/html/content/src/nsHTMLDNSPrefetch.h index e2973ae6e5e..a25b2834c98 100644 --- a/content/html/content/src/nsHTMLDNSPrefetch.h +++ b/content/html/content/src/nsHTMLDNSPrefetch.h @@ -143,9 +143,7 @@ public: } mEntries[sMaxDeferred]; }; -#ifdef MOZ_IPC friend class mozilla::net::NeckoParent; -#endif }; #endif diff --git a/content/media/nsAudioStream.cpp b/content/media/nsAudioStream.cpp index c5fe5e4c90b..8eb6602084d 100644 --- a/content/media/nsAudioStream.cpp +++ b/content/media/nsAudioStream.cpp @@ -37,14 +37,12 @@ * * ***** END LICENSE BLOCK ***** */ -#ifdef MOZ_IPC #include "mozilla/dom/ContentChild.h" #include "mozilla/dom/PAudioChild.h" #include "mozilla/dom/AudioChild.h" #include "mozilla/Monitor.h" #include "nsXULAppAPI.h" using namespace mozilla::dom; -#endif #include #include @@ -65,7 +63,7 @@ extern "C" { // Android's audio backend is not available in content processes, so audio must // be remoted to the parent chrome process. -#if defined(ANDROID) && defined(MOZ_IPC) +#if defined(ANDROID) #define REMOTE_AUDIO 1 #endif @@ -122,7 +120,6 @@ class nsAudioStreamLocal : public nsAudioStream }; -#ifdef MOZ_IPC class nsAudioStreamRemote : public nsAudioStream { public: @@ -294,7 +291,6 @@ class AudioShutdownEvent : public nsRunnable nsRefPtr mAudioChild; }; -#endif // MOZ_IPC void nsAudioStream::InitLibrary() @@ -597,8 +593,6 @@ PRInt32 nsAudioStreamLocal::GetMinWriteSamples() return static_cast(samples); } -#ifdef MOZ_IPC - nsAudioStreamRemote::nsAudioStreamRemote() : mAudioChild(NULL), mFormat(FORMAT_S16_LE), @@ -750,5 +744,3 @@ nsAudioStreamRemote::IsPaused() { return mPaused; } - -#endif // MOZ_IPC diff --git a/content/media/nsAudioStream.h b/content/media/nsAudioStream.h index d7878992579..de560a147be 100644 --- a/content/media/nsAudioStream.h +++ b/content/media/nsAudioStream.h @@ -64,14 +64,13 @@ public: // library after using it. static void ShutdownLibrary(); - // Thread, usually for MOZ_IPC handling, that is shared between audio streams. + // Thread that is shared between audio streams. // This may return null in the child process nsIThread *GetThread(); // AllocateStream will return either a local stream or a remoted stream - // depending on where you call it from. If MOZ_IPC is enabled, and you - // call this from a child process, you may recieve an implementation which - // forwards to a compositing process. + // depending on where you call it from. If you call this from a child process, + // you may receive an implementation which forwards to a compositing process. static nsAudioStream* AllocateStream(); // Initialize the audio stream. aNumChannels is the number of audio channels diff --git a/docshell/base/IHistory.h b/docshell/base/IHistory.h index b03c718508a..2448784db96 100644 --- a/docshell/base/IHistory.h +++ b/docshell/base/IHistory.h @@ -71,7 +71,7 @@ public: * UnregisterVisitedCallback. * * @pre aURI must not be null. - * @pre aLink may be null only in the MOZ_IPC parent process. + * @pre aLink may be null only in the parent (chrome) process. * * @param aURI * The URI to check. diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp index 948c9b73497..5e1e09db097 100644 --- a/docshell/base/nsDocShell.cpp +++ b/docshell/base/nsDocShell.cpp @@ -229,9 +229,7 @@ static NS_DEFINE_CID(kAppShellCID, NS_APPSHELL_CID); #include "nsIChannelPolicy.h" #include "nsIContentSecurityPolicy.h" -#ifdef MOZ_IPC #include "nsXULAppAPI.h" -#endif using namespace mozilla; @@ -6012,12 +6010,10 @@ nsDocShell::OnRedirectStateChange(nsIChannel* aOldChannel, nsCOMPtr appCacheChannel = do_QueryInterface(aNewChannel); if (appCacheChannel) { -#ifdef MOZ_IPC // Permission will be checked in the parent process. if (GeckoProcessType_Default != XRE_GetProcessType()) appCacheChannel->SetChooseApplicationCache(PR_TRUE); else -#endif appCacheChannel->SetChooseApplicationCache(ShouldCheckAppCache(newURI)); } @@ -8728,12 +8724,10 @@ nsDocShell::DoURILoad(nsIURI * aURI, // Loads with the correct permissions should check for a matching // application cache. -#ifdef MOZ_IPC // Permission will be checked in the parent process if (GeckoProcessType_Default != XRE_GetProcessType()) appCacheChannel->SetChooseApplicationCache(PR_TRUE); else -#endif appCacheChannel->SetChooseApplicationCache( ShouldCheckAppCache(aURI)); } diff --git a/dom/Makefile.in b/dom/Makefile.in index c74d6daf30d..66b2af9130a 100644 --- a/dom/Makefile.in +++ b/dom/Makefile.in @@ -83,13 +83,8 @@ DIRS += \ plugins \ indexedDB \ system \ - $(NULL) - -ifdef MOZ_IPC -DIRS += \ ipc \ $(NULL) -endif ifdef ENABLE_TESTS DIRS += tests diff --git a/dom/base/Makefile.in b/dom/base/Makefile.in index 9f3f473445f..8603c0f7bd7 100644 --- a/dom/base/Makefile.in +++ b/dom/base/Makefile.in @@ -83,6 +83,7 @@ EXPORTS = \ nsPIWindowRoot.h \ nsFocusManager.h \ nsWrapperCache.h \ + nsContentPermissionHelper.h \ $(NULL) CPPSRCS = \ @@ -106,27 +107,17 @@ CPPSRCS = \ nsScriptNameSpaceManager.cpp \ nsDOMScriptObjectFactory.cpp \ nsQueryContentEventResult.cpp \ + nsContentPermissionHelper.cpp \ $(NULL) -ifdef MOZ_IPC -EXPORTS += \ - nsContentPermissionHelper.h \ - $(NULL) -CPPSRCS += \ - nsContentPermissionHelper.cpp \ - $(NULL) -endif - include $(topsrcdir)/dom/dom-config.mk ifdef MOZ_JSDEBUGGER DEFINES += -DMOZ_JSDEBUGGER endif -ifdef MOZ_IPC include $(topsrcdir)/config/config.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk -endif include $(topsrcdir)/config/rules.mk diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp index 30fd854a270..2e5e13711e2 100644 --- a/dom/base/nsGlobalWindow.cpp +++ b/dom/base/nsGlobalWindow.cpp @@ -46,9 +46,7 @@ * * ***** END LICENSE BLOCK ***** */ -#ifdef MOZ_IPC #include "base/basictypes.h" -#endif // Local Includes #include "nsGlobalWindow.h" diff --git a/dom/plugins/Makefile.in b/dom/plugins/Makefile.in index 3563be61178..b824c96cb95 100644 --- a/dom/plugins/Makefile.in +++ b/dom/plugins/Makefile.in @@ -50,8 +50,6 @@ EXPORTS_mozilla = \ PluginLibrary.h \ $(NULL) -ifdef MOZ_IPC - EXPORTS_NAMESPACES = mozilla mozilla/plugins EXPORTS_mozilla/plugins = \ @@ -151,7 +149,6 @@ LOCAL_INCLUDES = \ include $(topsrcdir)/config/config.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk -endif include $(topsrcdir)/config/rules.mk diff --git a/dom/src/geolocation/Makefile.in b/dom/src/geolocation/Makefile.in index 8bd9c569d7e..39f03db04f2 100644 --- a/dom/src/geolocation/Makefile.in +++ b/dom/src/geolocation/Makefile.in @@ -83,9 +83,7 @@ LOCAL_INCLUDES += -I$(topsrcdir)/dom/system/android \ $(NULL) endif -ifdef MOZ_IPC EXPORTS += nsGeoPositionIPCSerialiser.h -endif include $(topsrcdir)/config/config.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/dom/src/geolocation/nsGeolocation.cpp b/dom/src/geolocation/nsGeolocation.cpp index de9d3e579e0..81a42fd3802 100644 --- a/dom/src/geolocation/nsGeolocation.cpp +++ b/dom/src/geolocation/nsGeolocation.cpp @@ -34,7 +34,6 @@ * * ***** END LICENSE BLOCK ***** */ -#ifdef MOZ_IPC #include "nsContentPermissionHelper.h" #include "nsXULAppAPI.h" @@ -53,7 +52,6 @@ #include "nsDOMEventTargetHelper.h" #include "TabChild.h" -#endif #include "nsGeolocation.h" #include "nsAutoPtr.h" @@ -482,7 +480,6 @@ nsGeolocationRequest::Shutdown() mErrorCallback = nsnull; } -#ifdef MOZ_IPC bool nsGeolocationRequest::Recv__delete__(const bool& allow) { if (allow) @@ -491,7 +488,6 @@ bool nsGeolocationRequest::Recv__delete__(const bool& allow) (void) Cancel(); return true; } -#endif //////////////////////////////////////////////////// // nsGeolocationService //////////////////////////////////////////////////// @@ -681,13 +677,11 @@ nsGeolocationService::StartDevice() // inactivivity SetDisconnectTimer(); -#ifdef MOZ_IPC if (XRE_GetProcessType() == GeckoProcessType_Content) { ContentChild* cpc = ContentChild::GetSingleton(); cpc->SendAddGeolocationListener(); return NS_OK; } -#endif // Start them up! nsCOMPtr obs = mozilla::services::GetObserverService(); @@ -726,13 +720,11 @@ nsGeolocationService::StopDevice() mDisconnectTimer = nsnull; } -#ifdef MOZ_IPC if (XRE_GetProcessType() == GeckoProcessType_Content) { ContentChild* cpc = ContentChild::GetSingleton(); cpc->SendRemoveGeolocationListener(); return; // bail early } -#endif nsCOMPtr obs = mozilla::services::GetObserverService(); if (!obs) @@ -1053,7 +1045,6 @@ nsGeolocation::WindowOwnerStillExists() bool nsGeolocation::RegisterRequestWithPrompt(nsGeolocationRequest* request) { -#ifdef MOZ_IPC if (XRE_GetProcessType() == GeckoProcessType_Content) { nsCOMPtr window = do_QueryReferent(mOwner); if (!window) @@ -1075,7 +1066,6 @@ nsGeolocation::RegisterRequestWithPrompt(nsGeolocationRequest* request) request->Sendprompt(); return true; } -#endif if (nsContentUtils::GetBoolPref("geo.prompt.testing", PR_FALSE)) { diff --git a/dom/src/geolocation/nsGeolocation.h b/dom/src/geolocation/nsGeolocation.h index 7dac97470ed..7aa40746ae7 100644 --- a/dom/src/geolocation/nsGeolocation.h +++ b/dom/src/geolocation/nsGeolocation.h @@ -37,11 +37,9 @@ #ifndef nsGeoLocation_h #define nsGeoLocation_h -#ifdef MOZ_IPC #include "mozilla/dom/PContentPermissionRequestChild.h" // Microsoft's API Name hackery sucks #undef CreateEvent -#endif #include "nsCOMPtr.h" #include "nsAutoPtr.h" @@ -67,9 +65,7 @@ #include "nsIGeolocationProvider.h" #include "nsIContentPermissionPrompt.h" -#ifdef MOZ_IPC #include "PCOMContentPermissionRequestChild.h" -#endif class nsGeolocationService; class nsGeolocation; @@ -77,9 +73,7 @@ class nsGeolocation; class nsGeolocationRequest : public nsIContentPermissionRequest , public nsITimerCallback -#ifdef MOZ_IPC , public PCOMContentPermissionRequestChild -#endif { public: NS_DECL_CYCLE_COLLECTING_ISUPPORTS @@ -107,10 +101,8 @@ class nsGeolocationRequest ~nsGeolocationRequest(); -#ifdef MOZ_IPC bool Recv__delete__(const bool& allow); void IPDLRelease() { Release(); } -#endif private: diff --git a/dom/src/notification/nsDesktopNotification.cpp b/dom/src/notification/nsDesktopNotification.cpp index 0ecec32fcae..b7770adcad5 100644 --- a/dom/src/notification/nsDesktopNotification.cpp +++ b/dom/src/notification/nsDesktopNotification.cpp @@ -36,7 +36,6 @@ #include "nsDesktopNotification.h" -#ifdef MOZ_IPC #include "nsContentPermissionHelper.h" #include "nsXULAppAPI.h" @@ -44,7 +43,6 @@ #include "TabChild.h" using namespace mozilla::dom; -#endif /* ------------------------------------------------------------------------ */ /* AlertServiceObserver */ @@ -129,7 +127,6 @@ nsDOMDesktopNotification::nsDOMDesktopNotification(const nsAString & title, nsRefPtr request = new nsDesktopNotificationRequest(this); // if we are in the content process, then remote it to the parent. -#ifdef MOZ_IPC if (XRE_GetProcessType() == GeckoProcessType_Content) { // if for some reason mOwner is null, just silently @@ -152,7 +149,6 @@ nsDOMDesktopNotification::nsDOMDesktopNotification(const nsAString & title, request->Sendprompt(); return; } -#endif // otherwise, dispatch it NS_DispatchToMainThread(request); diff --git a/dom/src/notification/nsDesktopNotification.h b/dom/src/notification/nsDesktopNotification.h index bc480616449..18ff79b2319 100644 --- a/dom/src/notification/nsDesktopNotification.h +++ b/dom/src/notification/nsDesktopNotification.h @@ -37,10 +37,7 @@ #ifndef nsDesktopNotification_h #define nsDesktopNotification_h -#ifdef MOZ_IPC #include "PCOMContentPermissionRequestChild.h" -#endif - #include "nsDOMClassInfo.h" #include "nsIJSContextStack.h" @@ -155,10 +152,8 @@ protected: * Simple Request */ class nsDesktopNotificationRequest : public nsIContentPermissionRequest, - public nsRunnable -#ifdef MOZ_IPC - , public PCOMContentPermissionRequestChild -#endif + public nsRunnable, + public PCOMContentPermissionRequestChild { public: @@ -182,8 +177,6 @@ class nsDesktopNotificationRequest : public nsIContentPermissionRequest, { } -#ifdef MOZ_IPC - bool Recv__delete__(const bool& allow) { if (allow) @@ -193,7 +186,6 @@ class nsDesktopNotificationRequest : public nsIContentPermissionRequest, return true; } void IPDLRelease() { Release(); } -#endif nsRefPtr mDesktopNotification; }; diff --git a/dom/src/offline/nsDOMOfflineResourceList.cpp b/dom/src/offline/nsDOMOfflineResourceList.cpp index c9b5b26e794..381d95c4485 100644 --- a/dom/src/offline/nsDOMOfflineResourceList.cpp +++ b/dom/src/offline/nsDOMOfflineResourceList.cpp @@ -57,14 +57,9 @@ #include "nsIScriptGlobalObject.h" #include "nsIWebNavigation.h" -#ifdef MOZ_IPC #include "nsXULAppAPI.h" #define IS_CHILD_PROCESS() \ (GeckoProcessType_Default != XRE_GetProcessType()) -#else -#define IS_CHILD_PROCESS() \ - (false) -#endif // Event names diff --git a/dom/src/storage/Makefile.in b/dom/src/storage/Makefile.in index 3f78dd64df7..9faf2150cf4 100644 --- a/dom/src/storage/Makefile.in +++ b/dom/src/storage/Makefile.in @@ -55,13 +55,11 @@ CPPSRCS = \ ifdef MOZ_STORAGE CPPSRCS += nsDOMStorageDBWrapper.cpp nsDOMStoragePersistentDB.cpp nsDOMStorageMemoryDB.cpp -ifdef MOZ_IPC CPPSRCS += StorageChild.cpp StorageParent.cpp EXPORTS_NAMESPACES = mozilla/dom EXPORTS_mozilla/dom = StorageChild.h StorageParent.h endif -endif # we don't want the shared lib, but we want to force the creation of a static lib. FORCE_STATIC_LIB = 1 diff --git a/dom/src/storage/nsDOMStorage.cpp b/dom/src/storage/nsDOMStorage.cpp index 8e418cc6856..4e852322f2d 100644 --- a/dom/src/storage/nsDOMStorage.cpp +++ b/dom/src/storage/nsDOMStorage.cpp @@ -40,12 +40,10 @@ * * ***** END LICENSE BLOCK ***** */ -#ifdef MOZ_IPC #include "StorageChild.h" #include "StorageParent.h" #include "nsXULAppAPI.h" using mozilla::dom::StorageChild; -#endif #include "prnetdb.h" #include "nsCOMPtr.h" @@ -271,11 +269,9 @@ nsDOMStorageManager::Initialize() NS_ADDREF(gStorageManager); -#ifdef MOZ_IPC // No observers needed in non-chrome if (XRE_GetProcessType() != GeckoProcessType_Default) return NS_OK; -#endif nsCOMPtr os = mozilla::services::GetObserverService(); if (!os) @@ -1355,12 +1351,10 @@ nsDOMStorage::nsDOMStorage() { mSecurityChecker = this; -#ifdef MOZ_IPC if (XRE_GetProcessType() != GeckoProcessType_Default) mStorageImpl = new StorageChild(this); else -#endif - mStorageImpl = new DOMStorageImpl(this); + mStorageImpl = new DOMStorageImpl(this); } nsDOMStorage::nsDOMStorage(nsDOMStorage& aThat) @@ -1369,13 +1363,10 @@ nsDOMStorage::nsDOMStorage(nsDOMStorage& aThat) { mSecurityChecker = this; -#ifdef MOZ_IPC if (XRE_GetProcessType() != GeckoProcessType_Default) { StorageChild* other = static_cast(aThat.mStorageImpl.get()); mStorageImpl = new StorageChild(this, *other); - } else -#endif - { + } else { DOMStorageImpl* other = static_cast(aThat.mStorageImpl.get()); mStorageImpl = new DOMStorageImpl(this, *other); } diff --git a/embedding/browser/webBrowser/nsWebBrowser.cpp b/embedding/browser/webBrowser/nsWebBrowser.cpp index c037dc2c2d8..f0b35569008 100644 --- a/embedding/browser/webBrowser/nsWebBrowser.cpp +++ b/embedding/browser/webBrowser/nsWebBrowser.cpp @@ -1229,10 +1229,7 @@ NS_IMETHODIMP nsWebBrowser::Create() } mDocShellAsNav->SetSessionHistory(mInitInfo->sessionHistory); -#ifdef MOZ_IPC - if (XRE_GetProcessType() == GeckoProcessType_Default) -#endif - { + if (XRE_GetProcessType() == GeckoProcessType_Default) { // Hook up global history. Do not fail if we can't - just warn. rv = EnableGlobalHistory(mShouldEnableHistory); NS_WARN_IF_FALSE(NS_SUCCEEDED(rv), "EnableGlobalHistory() failed"); diff --git a/extensions/cookie/nsPermissionManager.cpp b/extensions/cookie/nsPermissionManager.cpp index d182013ec65..c202d553dcd 100644 --- a/extensions/cookie/nsPermissionManager.cpp +++ b/extensions/cookie/nsPermissionManager.cpp @@ -37,11 +37,9 @@ * * ***** END LICENSE BLOCK ***** */ -#ifdef MOZ_IPC #include "mozilla/dom/ContentParent.h" #include "mozilla/dom/ContentChild.h" #include "mozilla/unused.h" -#endif #include "nsPermissionManager.h" #include "nsPermission.h" #include "nsCRT.h" @@ -63,7 +61,6 @@ static nsPermissionManager *gPermissionManager = nsnull; -#ifdef MOZ_IPC using mozilla::dom::ContentParent; using mozilla::dom::ContentChild; using mozilla::unused; // ha! @@ -108,7 +105,6 @@ ParentProcess() return nsnull; } -#endif #define ENSURE_NOT_CHILD_PROCESS_(onError) \ PR_BEGIN_MACRO \ @@ -174,9 +170,7 @@ NS_IMPL_ISUPPORTS3(nsPermissionManager, nsIPermissionManager, nsIObserver, nsISu nsPermissionManager::nsPermissionManager() : mLargestID(0) -#ifdef MOZ_IPC , mUpdateChildProcess(PR_FALSE) -#endif { } @@ -233,7 +227,6 @@ nsPermissionManager::Init() mObserverService->AddObserver(this, "profile-do-change", PR_TRUE); } -#ifdef MOZ_IPC if (IsChildProcess()) { // Get the permissions from the parent process InfallibleTArray perms; @@ -248,7 +241,6 @@ nsPermissionManager::Init() // Stop here; we don't need the DB in the child process return NS_OK; } -#endif // ignore failure here, since it's non-fatal (we can run fine without // persistent storage - e.g. if there's no profile). @@ -440,9 +432,7 @@ nsPermissionManager::Add(nsIURI *aURI, PRUint32 aExpireType, PRInt64 aExpireTime) { -#ifdef MOZ_IPC ENSURE_NOT_CHILD_PROCESS; -#endif NS_ENSURE_ARG_POINTER(aURI); NS_ENSURE_ARG_POINTER(aType); @@ -476,7 +466,6 @@ nsPermissionManager::AddInternal(const nsAFlatCString &aHost, NotifyOperationType aNotifyOperation, DBOperationType aDBOperation) { -#ifdef MOZ_IPC if (!IsChildProcess()) { // In the parent, send the update now, if the child is ready if (mUpdateChildProcess) { @@ -486,7 +475,6 @@ nsPermissionManager::AddInternal(const nsAFlatCString &aHost, unused << ParentProcess()->SendAddPermission(permission); } } -#endif if (!gHostArena) { gHostArena = new PLArenaPool; @@ -627,9 +615,7 @@ NS_IMETHODIMP nsPermissionManager::Remove(const nsACString &aHost, const char *aType) { -#ifdef MOZ_IPC ENSURE_NOT_CHILD_PROCESS; -#endif NS_ENSURE_ARG_POINTER(aType); @@ -647,9 +633,7 @@ nsPermissionManager::Remove(const nsACString &aHost, NS_IMETHODIMP nsPermissionManager::RemoveAll() { -#ifdef MOZ_IPC ENSURE_NOT_CHILD_PROCESS; -#endif nsresult rv = RemoveAllInternal(); NotifyObservers(nsnull, NS_LITERAL_STRING("cleared").get()); @@ -806,9 +790,7 @@ AddPermissionsToList(nsHostEntry *entry, void *arg) NS_IMETHODIMP nsPermissionManager::GetEnumerator(nsISimpleEnumerator **aEnum) { -#ifdef MOZ_IPC ENSURE_NOT_CHILD_PROCESS; -#endif // roll an nsCOMArray of all our permissions, then hand out an enumerator nsCOMArray array; @@ -821,9 +803,7 @@ NS_IMETHODIMP nsPermissionManager::GetEnumerator(nsISimpleEnumerator **aEnum) NS_IMETHODIMP nsPermissionManager::Observe(nsISupports *aSubject, const char *aTopic, const PRUnichar *someData) { -#ifdef MOZ_IPC ENSURE_NOT_CHILD_PROCESS; -#endif if (!nsCRT::strcmp(aTopic, "profile-before-change")) { // The profile is about to change, @@ -920,9 +900,7 @@ nsPermissionManager::NotifyObservers(nsIPermission *aPermission, nsresult nsPermissionManager::Read() { -#ifdef MOZ_IPC ENSURE_NOT_CHILD_PROCESS; -#endif nsresult rv; @@ -990,9 +968,7 @@ static const char kMatchTypeHost[] = "host"; nsresult nsPermissionManager::Import() { -#ifdef MOZ_IPC ENSURE_NOT_CHILD_PROCESS; -#endif nsresult rv; @@ -1098,9 +1074,7 @@ nsPermissionManager::UpdateDB(OperationType aOp, PRUint32 aExpireType, PRInt64 aExpireTime) { -#ifdef MOZ_IPC ENSURE_NOT_CHILD_PROCESS_NORET; -#endif nsresult rv; diff --git a/extensions/cookie/nsPermissionManager.h b/extensions/cookie/nsPermissionManager.h index b45772a6fea..78786a32943 100644 --- a/extensions/cookie/nsPermissionManager.h +++ b/extensions/cookie/nsPermissionManager.h @@ -251,7 +251,6 @@ private: // An array to store the strings identifying the different types. nsTArray mTypeArray; -#ifdef MOZ_IPC // Whether we should update the child process with every change to a // permission. This is set to true once the child is ready to receive // such updates. @@ -262,7 +261,6 @@ public: { mUpdateChildProcess = PR_TRUE; } -#endif }; // {4F6B5E00-0C36-11d5-A535-0010A401EB10} diff --git a/extensions/cookie/test/Makefile.in b/extensions/cookie/test/Makefile.in index 79dd07701dc..2bd0b08dda8 100644 --- a/extensions/cookie/test/Makefile.in +++ b/extensions/cookie/test/Makefile.in @@ -96,12 +96,10 @@ libs:: $(_BROWSER_TEST_FILES) XPCSHELL_TESTS = unit -ifdef MOZ_IPC # FIXME/bug 575918: out-of-process xpcshell is broken on OS X ifneq ($(OS_ARCH),Darwin) XPCSHELL_TESTS += unit_ipc endif -endif include $(topsrcdir)/config/rules.mk diff --git a/gfx/Makefile.in b/gfx/Makefile.in index 288c9f78ce4..381e345d262 100644 --- a/gfx/Makefile.in +++ b/gfx/Makefile.in @@ -59,16 +59,12 @@ endif DIRS += angle -DIRS += src qcms layers harfbuzz/src ots/src thebes src/thebes +DIRS += src qcms layers harfbuzz/src ots/src thebes src/thebes ipc ifdef BUILD_STATIC_LIBS DIRS += ycbcr endif -ifdef MOZ_IPC -DIRS += ipc -endif - ifdef ENABLE_TESTS TOOL_DIRS += tests endif diff --git a/gfx/ipc/Makefile.in b/gfx/ipc/Makefile.in index 85c3fb0f6f9..c0950b2425e 100644 --- a/gfx/ipc/Makefile.in +++ b/gfx/ipc/Makefile.in @@ -42,8 +42,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -ifdef MOZ_IPC - MODULE = gfxipc LIBRARY_NAME = gfxipc_s FORCE_STATIC_LIB = 1 @@ -73,8 +71,6 @@ endif include $(topsrcdir)/config/config.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk -endif - include $(topsrcdir)/config/rules.mk CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(TK_CFLAGS) diff --git a/gfx/layers/Layers.cpp b/gfx/layers/Layers.cpp index eae4fa9cd18..c3527ac8f85 100644 --- a/gfx/layers/Layers.cpp +++ b/gfx/layers/Layers.cpp @@ -38,9 +38,7 @@ * * ***** END LICENSE BLOCK ***** */ -#ifdef MOZ_IPC -# include "mozilla/layers/ShadowLayers.h" -#endif // MOZ_IPC +#include "mozilla/layers/ShadowLayers.h" #include "ImageLayers.h" #include "Layers.h" @@ -241,7 +239,6 @@ Layer::CanUseOpaqueSurface() parent->CanUseOpaqueSurface(); } -#ifdef MOZ_IPC // NB: eventually these methods will be defined unconditionally, and // can be moved into Layers.h const nsIntRect* @@ -262,13 +259,6 @@ Layer::GetEffectiveVisibleRegion() return GetVisibleRegion(); } -#else - -const nsIntRect* Layer::GetEffectiveClipRect() { return GetClipRect(); } -const nsIntRegion& Layer::GetEffectiveVisibleRegion() { return GetVisibleRegion(); } - -#endif // MOZ_IPC - gfx3DMatrix Layer::SnapTransform(const gfx3DMatrix& aTransform, const gfxRect& aSnapRect, @@ -361,10 +351,8 @@ Layer::CalculateScissorRect(bool aIntermediate, const gfx3DMatrix& Layer::GetLocalTransform() { -#ifdef MOZ_IPC if (ShadowLayer* shadow = AsShadowLayer()) return shadow->GetShadowTransform(); -#endif return mTransform; } @@ -702,7 +690,6 @@ LayerManager::IsLogEnabled() return PR_LOG_TEST(sLog, PR_LOG_DEBUG); } -# ifdef MOZ_IPC static nsACString& PrintInfo(nsACString& aTo, ShadowLayer* aShadowLayer) { @@ -720,12 +707,6 @@ PrintInfo(nsACString& aTo, ShadowLayer* aShadowLayer) } return aTo; } -# else -static nsACString& PrintInfo(nsACString& aTo, ShadowLayer* aShadowLayer) -{ - return aTo; -} -# endif // MOZ_IPC #else // !MOZ_LAYERS_HAVE_LOG diff --git a/gfx/layers/Makefile.in b/gfx/layers/Makefile.in index 0eb89f1f9bf..daef4cd5942 100644 --- a/gfx/layers/Makefile.in +++ b/gfx/layers/Makefile.in @@ -44,14 +44,11 @@ VPATH = \ $(srcdir)/opengl \ $(srcdir)/d3d9 \ $(srcdir)/d3d10 \ + $(srcdir)/ipc \ $(NULL) include $(DEPTH)/config/autoconf.mk -ifdef MOZ_IPC -VPATH += $(srcdir)/ipc -endif - MODULE = thebes LIBRARY_NAME = layers LIBXUL_LIBRARY = 1 @@ -127,7 +124,6 @@ CPPSRCS += \ endif endif -ifdef MOZ_IPC #{ EXPORTS_NAMESPACES = IPC mozilla/layers EXPORTS_IPC = ShadowLayerUtils.h EXPORTS_mozilla/layers =\ @@ -149,8 +145,6 @@ EXPORTS_mozilla/layers += ShadowLayerUtilsX11.h CPPSRCS += ShadowLayerUtilsX11.cpp endif #} -endif #} - # Enable GLES2.0 under maemo ifdef MOZ_X11 ifdef MOZ_PLATFORM_MAEMO @@ -160,9 +154,7 @@ endif include $(topsrcdir)/config/rules.mk -ifdef MOZ_IPC include $(topsrcdir)/ipc/chromium/chromium-config.mk -endif CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(TK_CFLAGS) diff --git a/gfx/layers/basic/BasicLayers.cpp b/gfx/layers/basic/BasicLayers.cpp index 86bfa762e67..5d6a2f3122b 100644 --- a/gfx/layers/basic/BasicLayers.cpp +++ b/gfx/layers/basic/BasicLayers.cpp @@ -36,14 +36,12 @@ * * ***** END LICENSE BLOCK ***** */ -#ifdef MOZ_IPC -# include "gfxSharedImageSurface.h" +#include "gfxSharedImageSurface.h" -# include "mozilla/layers/PLayerChild.h" -# include "mozilla/layers/PLayersChild.h" -# include "mozilla/layers/PLayersParent.h" -# include "ipc/ShadowLayerChild.h" -#endif +#include "mozilla/layers/PLayerChild.h" +#include "mozilla/layers/PLayersChild.h" +#include "mozilla/layers/PLayersParent.h" +#include "ipc/ShadowLayerChild.h" #include "BasicLayers.h" #include "ImageLayers.h" @@ -1609,8 +1607,6 @@ BasicLayerManager::CreateReadbackLayer() return layer.forget(); } -#ifdef MOZ_IPC - class BasicShadowableThebesLayer; class BasicShadowableLayer : public ShadowableLayer { @@ -2894,7 +2890,6 @@ BasicShadowLayerManager::IsCompositingCheap() return mShadowManager && LayerManager::IsCompositingCheap(GetParentBackendType()); } -#endif // MOZ_IPC } } diff --git a/gfx/layers/basic/BasicLayers.h b/gfx/layers/basic/BasicLayers.h index 6590f618001..392479d38e8 100644 --- a/gfx/layers/basic/BasicLayers.h +++ b/gfx/layers/basic/BasicLayers.h @@ -45,9 +45,7 @@ #include "nsAutoRef.h" #include "nsThreadUtils.h" -#ifdef MOZ_IPC #include "mozilla/layers/ShadowLayers.h" -#endif class nsIWidget; @@ -71,11 +69,7 @@ class ReadbackProcessor; * between layers). */ class THEBES_API BasicLayerManager : -#ifdef MOZ_IPC public ShadowLayerManager -#else - public LayerManager -#endif { public: /** @@ -235,7 +229,6 @@ protected: }; -#ifdef MOZ_IPC class BasicShadowLayerManager : public BasicLayerManager, public ShadowLayerForwarder { @@ -284,7 +277,6 @@ private: LayerRefArray mKeepAlive; }; -#endif // MOZ_IPC } } diff --git a/gfx/layers/opengl/CanvasLayerOGL.cpp b/gfx/layers/opengl/CanvasLayerOGL.cpp index c7f4478ecc6..e7b5c2fec7a 100644 --- a/gfx/layers/opengl/CanvasLayerOGL.cpp +++ b/gfx/layers/opengl/CanvasLayerOGL.cpp @@ -35,9 +35,7 @@ * * ***** END LICENSE BLOCK ***** */ -#ifdef MOZ_IPC # include "gfxSharedImageSurface.h" -#endif #include "CanvasLayerOGL.h" @@ -253,8 +251,6 @@ CanvasLayerOGL::RenderLayer(int aPreviousDestination, } -#ifdef MOZ_IPC - ShadowCanvasLayerOGL::ShadowCanvasLayerOGL(LayerManagerOGL* aManager) : ShadowCanvasLayer(aManager, nsnull) , LayerOGL(aManager) @@ -342,5 +338,3 @@ ShadowCanvasLayerOGL::RenderLayer(int aPreviousFrameBuffer, mOGLManager->BindAndDrawQuad(program); } - -#endif // MOZ_IPC diff --git a/gfx/layers/opengl/CanvasLayerOGL.h b/gfx/layers/opengl/CanvasLayerOGL.h index 23a66d5c491..24bc189bd9e 100644 --- a/gfx/layers/opengl/CanvasLayerOGL.h +++ b/gfx/layers/opengl/CanvasLayerOGL.h @@ -38,10 +38,8 @@ #ifndef GFX_CANVASLAYEROGL_H #define GFX_CANVASLAYEROGL_H -#ifdef MOZ_IPC # include "mozilla/layers/PLayers.h" # include "mozilla/layers/ShadowLayers.h" -#endif // MOZ_IPC #include "LayerManagerOGL.h" #include "gfxASurface.h" @@ -89,7 +87,6 @@ protected: PRPackedBool mNeedsYFlip; }; -#ifdef MOZ_IPC // NB: eventually we'll have separate shadow canvas2d and shadow // canvas3d layers, but currently they look the same from the // perspective of the compositor process @@ -130,7 +127,6 @@ private: }; -#endif // MOZ_IPC } /* layers */ } /* mozilla */ diff --git a/gfx/layers/opengl/ColorLayerOGL.cpp b/gfx/layers/opengl/ColorLayerOGL.cpp index de29e49a3b0..bf45085c435 100644 --- a/gfx/layers/opengl/ColorLayerOGL.cpp +++ b/gfx/layers/opengl/ColorLayerOGL.cpp @@ -80,14 +80,12 @@ ColorLayerOGL::RenderLayer(int, return RenderColorLayer(this, mOGLManager, aOffset); } -#ifdef MOZ_IPC void ShadowColorLayerOGL::RenderLayer(int, const nsIntPoint& aOffset) { return RenderColorLayer(this, mOGLManager, aOffset); } -#endif // MOZ_IPC } /* layers */ diff --git a/gfx/layers/opengl/ColorLayerOGL.h b/gfx/layers/opengl/ColorLayerOGL.h index 4cd291e079e..717dc9a90f7 100644 --- a/gfx/layers/opengl/ColorLayerOGL.h +++ b/gfx/layers/opengl/ColorLayerOGL.h @@ -38,10 +38,8 @@ #ifndef GFX_COLORLAYEROGL_H #define GFX_COLORLAYEROGL_H -#ifdef MOZ_IPC # include "mozilla/layers/PLayers.h" # include "mozilla/layers/ShadowLayers.h" -#endif // MOZ_IPC #include "LayerManagerOGL.h" @@ -69,7 +67,6 @@ public: const nsIntPoint& aOffset); }; -#ifdef MOZ_IPC class ShadowColorLayerOGL : public ShadowColorLayer, public LayerOGL { @@ -90,7 +87,6 @@ public: virtual void RenderLayer(int aPreviousFrameBuffer, const nsIntPoint& aOffset); }; -#endif // MOZ_IPC } /* layers */ } /* mozilla */ diff --git a/gfx/layers/opengl/ContainerLayerOGL.cpp b/gfx/layers/opengl/ContainerLayerOGL.cpp index f7121f25777..2d77443b77f 100644 --- a/gfx/layers/opengl/ContainerLayerOGL.cpp +++ b/gfx/layers/opengl/ContainerLayerOGL.cpp @@ -343,8 +343,6 @@ ContainerLayerOGL::RenderLayer(int aPreviousFrameBuffer, } -#ifdef MOZ_IPC - ShadowContainerLayerOGL::ShadowContainerLayerOGL(LayerManagerOGL *aManager) : ShadowContainerLayer(aManager, NULL) , LayerOGL(aManager) @@ -391,8 +389,6 @@ ShadowContainerLayerOGL::RenderLayer(int aPreviousFrameBuffer, ContainerRender(this, aPreviousFrameBuffer, aOffset, mOGLManager); } -#endif // MOZ_IPC - } /* layers */ } /* mozilla */ diff --git a/gfx/layers/opengl/ContainerLayerOGL.h b/gfx/layers/opengl/ContainerLayerOGL.h index 2a1184335dd..74fc728bc75 100644 --- a/gfx/layers/opengl/ContainerLayerOGL.h +++ b/gfx/layers/opengl/ContainerLayerOGL.h @@ -38,10 +38,8 @@ #ifndef GFX_CONTAINERLAYEROGL_H #define GFX_CONTAINERLAYEROGL_H -#ifdef MOZ_IPC # include "mozilla/layers/PLayers.h" # include "mozilla/layers/ShadowLayers.h" -#endif #include "Layers.h" #include "LayerManagerOGL.h" @@ -100,7 +98,6 @@ public: } }; -#ifdef MOZ_IPC class ShadowContainerLayerOGL : public ShadowContainerLayer, public LayerOGL { @@ -139,7 +136,6 @@ public: DefaultComputeEffectiveTransforms(aTransformToSurface); } }; -#endif // MOZ_IPC } /* layers */ } /* mozilla */ diff --git a/gfx/layers/opengl/ImageLayerOGL.cpp b/gfx/layers/opengl/ImageLayerOGL.cpp index 122a2dcc2a4..8a4a896cc9b 100644 --- a/gfx/layers/opengl/ImageLayerOGL.cpp +++ b/gfx/layers/opengl/ImageLayerOGL.cpp @@ -36,9 +36,7 @@ * * ***** END LICENSE BLOCK ***** */ -#ifdef MOZ_IPC # include "gfxSharedImageSurface.h" -#endif #include "ImageLayerOGL.h" #include "gfxImageSurface.h" @@ -745,8 +743,6 @@ CairoImageOGL::SetData(const CairoImage::Data &aData) tex); } -#ifdef MOZ_IPC - ShadowImageLayerOGL::ShadowImageLayerOGL(LayerManagerOGL* aManager) : ShadowImageLayer(aManager, nsnull) , LayerOGL(aManager) @@ -837,8 +833,6 @@ ShadowImageLayerOGL::RenderLayer(int aPreviousFrameBuffer, mOGLManager->BindAndDrawQuad(program); } -#endif // MOZ_IPC - } /* layers */ } /* mozilla */ diff --git a/gfx/layers/opengl/ImageLayerOGL.h b/gfx/layers/opengl/ImageLayerOGL.h index 09493b17c0f..8169f8b766b 100644 --- a/gfx/layers/opengl/ImageLayerOGL.h +++ b/gfx/layers/opengl/ImageLayerOGL.h @@ -38,10 +38,8 @@ #ifndef GFX_IMAGELAYEROGL_H #define GFX_IMAGELAYEROGL_H -#ifdef MOZ_IPC # include "mozilla/layers/PLayers.h" # include "mozilla/layers/ShadowLayers.h" -#endif // MOZ_IPC #include "LayerManagerOGL.h" #include "ImageLayers.h" @@ -234,7 +232,6 @@ public: gl::ShaderProgramType mLayerProgram; }; -#ifdef MOZ_IPC class ShadowImageLayerOGL : public ShadowImageLayer, public LayerOGL { @@ -271,7 +268,6 @@ private: }; -#endif } /* layers */ } /* mozilla */ diff --git a/gfx/layers/opengl/LayerManagerOGL.cpp b/gfx/layers/opengl/LayerManagerOGL.cpp index 070a75a343d..5d3c8b850a1 100644 --- a/gfx/layers/opengl/LayerManagerOGL.cpp +++ b/gfx/layers/opengl/LayerManagerOGL.cpp @@ -37,9 +37,7 @@ * * ***** END LICENSE BLOCK ***** */ -#ifdef MOZ_IPC # include "mozilla/layers/PLayers.h" -#endif // MOZ_IPC #include "LayerManagerOGL.h" #include "ThebesLayerOGL.h" @@ -970,8 +968,6 @@ void LayerOGL::ApplyFilter(gfxPattern::GraphicsFilter aFilter) } } -#ifdef MOZ_IPC - already_AddRefed LayerManagerOGL::CreateShadowThebesLayer() { @@ -1022,20 +1018,6 @@ LayerManagerOGL::CreateShadowCanvasLayer() return nsRefPtr(new ShadowCanvasLayerOGL(this)).forget(); } -#else - -already_AddRefed -LayerManagerOGL::CreateShadowThebesLayer() { return nsnull; } -already_AddRefed -LayerManagerOGL::CreateShadowContainerLayer() { return nsnull; } -already_AddRefed -LayerManagerOGL::CreateShadowImageLayer() { return nsnull; } -already_AddRefed -LayerManagerOGL::CreateShadowColorLayer() { return nsnull; } -already_AddRefed -LayerManagerOGL::CreateShadowCanvasLayer() { return nsnull; } - -#endif // MOZ_IPC } /* layers */ } /* mozilla */ diff --git a/gfx/layers/opengl/LayerManagerOGL.h b/gfx/layers/opengl/LayerManagerOGL.h index a4980353761..0cc7d76968f 100644 --- a/gfx/layers/opengl/LayerManagerOGL.h +++ b/gfx/layers/opengl/LayerManagerOGL.h @@ -42,9 +42,7 @@ #include "Layers.h" -#ifdef MOZ_IPC #include "mozilla/layers/ShadowLayers.h" -#endif #ifdef XP_WIN #include @@ -84,11 +82,7 @@ class ShadowColorLayer; * the main thread. */ class THEBES_API LayerManagerOGL : -#ifdef MOZ_IPC public ShadowLayerManager -#else - public LayerManager -#endif { typedef mozilla::gl::GLContext GLContext; typedef mozilla::gl::ShaderProgramType ProgramType; diff --git a/gfx/layers/opengl/ThebesLayerOGL.cpp b/gfx/layers/opengl/ThebesLayerOGL.cpp index a36371e2c30..dd71cde4ee6 100644 --- a/gfx/layers/opengl/ThebesLayerOGL.cpp +++ b/gfx/layers/opengl/ThebesLayerOGL.cpp @@ -36,10 +36,8 @@ * * ***** END LICENSE BLOCK ***** */ -#ifdef MOZ_IPC # include "mozilla/layers/PLayers.h" # include "mozilla/layers/ShadowLayers.h" -#endif #include "ThebesLayerBuffer.h" #include "ThebesLayerOGL.h" @@ -778,8 +776,6 @@ ThebesLayerOGL::IsEmpty() } -#ifdef MOZ_IPC - class ShadowBufferOGL : public ThebesLayerBufferOGL { public: @@ -952,8 +948,6 @@ ShadowThebesLayerOGL::RenderLayer(int aPreviousFrameBuffer, mBuffer->RenderTo(aOffset, mOGLManager); } -#endif // MOZ_IPC - } /* layers */ } /* mozilla */ diff --git a/gfx/layers/opengl/ThebesLayerOGL.h b/gfx/layers/opengl/ThebesLayerOGL.h index ab1a9bc91db..b2b459437a3 100644 --- a/gfx/layers/opengl/ThebesLayerOGL.h +++ b/gfx/layers/opengl/ThebesLayerOGL.h @@ -38,10 +38,8 @@ #ifndef GFX_THEBESLAYEROGL_H #define GFX_THEBESLAYEROGL_H -#ifdef MOZ_IPC -# include "mozilla/layers/PLayers.h" -# include "mozilla/layers/ShadowLayers.h" -#endif +#include "mozilla/layers/PLayers.h" +#include "mozilla/layers/ShadowLayers.h" #include "Layers.h" #include "LayerManagerOGL.h" @@ -86,7 +84,6 @@ private: nsRefPtr mBuffer; }; -#ifdef MOZ_IPC class ShadowThebesLayerOGL : public ShadowThebesLayer, public LayerOGL { @@ -117,7 +114,6 @@ public: private: nsRefPtr mBuffer; }; -#endif // MOZ_IPC } /* layers */ } /* mozilla */ diff --git a/gfx/thebes/Makefile.in b/gfx/thebes/Makefile.in index 531c78b03e2..fbc9ac47390 100644 --- a/gfx/thebes/Makefile.in +++ b/gfx/thebes/Makefile.in @@ -47,13 +47,8 @@ EXPORTS = \ GLContextProviderImpl.h \ nsCoreAnimationSupport.h \ EGLUtils.h \ - $(NULL) - -ifdef MOZ_IPC -EXPORTS += \ gfxSharedImageSurface.h \ $(NULL) -endif ifeq ($(MOZ_WIDGET_TOOLKIT),android) EXPORTS += \ @@ -185,6 +180,7 @@ CPPSRCS = \ gfxHarfBuzzShaper.cpp \ GLContext.cpp \ GLContextProviderOSMesa.cpp \ + gfxSharedImageSurface.cpp \ $(NULL) # Are we targeting x86 or x64? If so, build gfxAlphaRecoverySSE2.cpp. @@ -203,12 +199,6 @@ endif endif -ifdef MOZ_IPC -CPPSRCS += \ - gfxSharedImageSurface.cpp \ - $(NULL) -endif - SHARED_LIBRARY_LIBS += \ ../layers/$(LIB_PREFIX)layers.$(LIB_SUFFIX) \ $(NULL) diff --git a/gfx/thebes/gfxAndroidPlatform.cpp b/gfx/thebes/gfxAndroidPlatform.cpp index 6e5fe1ac4ee..4254268e60b 100644 --- a/gfx/thebes/gfxAndroidPlatform.cpp +++ b/gfx/thebes/gfxAndroidPlatform.cpp @@ -35,10 +35,8 @@ * the terms of any one of the MPL, the GPL or the LGPL. * * ***** END LICENSE BLOCK ***** */ -#ifdef MOZ_IPC #include "mozilla/dom/ContentChild.h" #include "nsXULAppAPI.h" -#endif #include @@ -173,10 +171,8 @@ public: mMap.ops = nsnull; LOG("initializing the map failed"); } -#ifdef MOZ_IPC NS_ABORT_IF_FALSE(XRE_GetProcessType() == GeckoProcessType_Default, "StartupCacheFontNameCache should only be used in chrome procsess"); -#endif mCache = mozilla::scache::StartupCache::GetSingleton(); Init(); } diff --git a/ipc/chromium/chromium-config.mk b/ipc/chromium/chromium-config.mk index 8b09ed1730f..09fc3db2287 100644 --- a/ipc/chromium/chromium-config.mk +++ b/ipc/chromium/chromium-config.mk @@ -46,8 +46,6 @@ CHROMIUM_CONFIG_INCLUDED = 1 EXTRA_DEPS += $(topsrcdir)/ipc/chromium/chromium-config.mk -ifdef MOZ_IPC # { - DEFINES += \ -DEXCLUDE_SKIA_DEPENDENCIES \ -DCHROMIUM_MOZILLA_BUILD \ @@ -108,4 +106,3 @@ OS_CXXFLAGS := $(filter-out -pedantic,$(OS_CXXFLAGS)) endif # } endif # } -endif # } \ No newline at end of file diff --git a/js/src/xpconnect/shell/xpcshell.cpp b/js/src/xpconnect/shell/xpcshell.cpp index 0dcb8071567..82a9050298b 100644 --- a/js/src/xpconnect/shell/xpcshell.cpp +++ b/js/src/xpconnect/shell/xpcshell.cpp @@ -678,8 +678,6 @@ Clear(JSContext *cx, uintN argc, jsval *vp) return JS_TRUE; } -#ifdef MOZ_IPC - static JSBool SendCommand(JSContext* cx, uintN argc, @@ -724,8 +722,6 @@ GetChildGlobalObject(JSContext* cx, return JS_FALSE; } -#endif // MOZ_IPC - /* * JSContext option name to flag map. The option names are in alphabetical * order for better reporting. @@ -860,10 +856,8 @@ static JSFunctionSpec glob_functions[] = { #ifdef DEBUG {"dumpHeap", DumpHeap, 5,0}, #endif -#ifdef MOZ_IPC {"sendCommand", SendCommand, 1,0}, {"getChildGlobalObject", GetChildGlobalObject, 0,0}, -#endif #ifdef MOZ_CALLGRIND {"startCallgrind", js_StartCallgrind, 0,0}, {"stopCallgrind", js_StopCallgrind, 0,0}, @@ -2019,10 +2013,8 @@ main(int argc, char **argv) JS_DestroyContext(cx); } // this scopes the nsCOMPtrs -#ifdef MOZ_IPC if (!XRE_ShutdownTestShell()) NS_ERROR("problem shutting down testshell"); -#endif #ifdef MOZ_CRASHREPORTER // Get the crashreporter service while XPCOM is still active. diff --git a/layout/Makefile.in b/layout/Makefile.in index 98501607b07..7964c1a905c 100644 --- a/layout/Makefile.in +++ b/layout/Makefile.in @@ -52,16 +52,13 @@ PARALLEL_DIRS = \ tables \ xul/base/public \ xul/base/src \ + ipc \ $(NULL) ifdef NS_PRINTING PARALLEL_DIRS += printing endif -ifdef MOZ_IPC -PARALLEL_DIRS += ipc -endif - ifdef MOZ_MATHML PARALLEL_DIRS += \ mathml \ diff --git a/layout/base/Makefile.in b/layout/base/Makefile.in index 3e9cf6485c5..b728ac362cd 100644 --- a/layout/base/Makefile.in +++ b/layout/base/Makefile.in @@ -148,9 +148,7 @@ FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk -ifdef MOZ_IPC include $(topsrcdir)/ipc/chromium/chromium-config.mk -endif LOCAL_INCLUDES += \ -I$(srcdir) \ diff --git a/layout/base/nsDisplayList.cpp b/layout/base/nsDisplayList.cpp index dcea41baf35..f3a8dbde7ac 100644 --- a/layout/base/nsDisplayList.cpp +++ b/layout/base/nsDisplayList.cpp @@ -1701,8 +1701,6 @@ nsDisplayOwnLayer::BuildLayer(nsDisplayListBuilder* aBuilder, return layer.forget(); } -#ifdef MOZ_IPC - nsDisplayScrollLayer::nsDisplayScrollLayer(nsDisplayListBuilder* aBuilder, nsDisplayList* aList, nsIFrame* aForFrame, @@ -1782,8 +1780,6 @@ nsDisplayScrollLayer::~nsDisplayScrollLayer() } #endif -#endif - nsDisplayClip::nsDisplayClip(nsDisplayListBuilder* aBuilder, nsIFrame* aFrame, nsDisplayItem* aItem, const nsRect& aRect) diff --git a/layout/base/nsDisplayList.h b/layout/base/nsDisplayList.h index f2644eacd7c..8785eeb488f 100644 --- a/layout/base/nsDisplayList.h +++ b/layout/base/nsDisplayList.h @@ -1769,7 +1769,6 @@ public: NS_DISPLAY_DECL_NAME("OwnLayer", TYPE_OWN_LAYER) }; -#ifdef MOZ_IPC /** * This creates a layer for the given list of items, whose visibility is * determined by the displayport for the given frame instead of what is @@ -1817,7 +1816,6 @@ public: private: nsIFrame* mViewportFrame; }; -#endif /** * nsDisplayClip can clip a list of items, but we take a single item diff --git a/layout/build/Makefile.in b/layout/build/Makefile.in index 9cc786bef43..f36829e6b0d 100644 --- a/layout/build/Makefile.in +++ b/layout/build/Makefile.in @@ -78,17 +78,11 @@ EXPORTS = \ nsLayoutStatics.h \ $(NULL) -ifdef MOZ_IPC -GKIPCLIB=../ipc/$(LIB_PREFIX)gkipc_s.$(LIB_SUFFIX) -else -GKIPCLIB=$(NULL) -endif - SHARED_LIBRARY_LIBS = \ ../base/$(LIB_PREFIX)gkbase_s.$(LIB_SUFFIX) \ ../forms/$(LIB_PREFIX)gkforms_s.$(LIB_SUFFIX) \ ../generic/$(LIB_PREFIX)gkgeneric_s.$(LIB_SUFFIX) \ - $(GKIPCLIB) \ + ../ipc/$(LIB_PREFIX)gkipc_s.$(LIB_SUFFIX) \ ../style/$(LIB_PREFIX)gkstyle_s.$(LIB_SUFFIX) \ ../tables/$(LIB_PREFIX)gktable_s.$(LIB_SUFFIX) \ ../xul/base/src/$(LIB_PREFIX)gkxulbase_s.$(LIB_SUFFIX) \ @@ -300,10 +294,8 @@ ifdef MOZ_NATIVE_LIBVPX EXTRA_DSO_LDOPTS += $(MOZ_LIBVPX_LIBS) endif -ifdef MOZ_IPC include $(topsrcdir)/config/config.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk -endif include $(topsrcdir)/config/rules.mk diff --git a/layout/build/nsLayoutModule.cpp b/layout/build/nsLayoutModule.cpp index 65e6b7b765c..94ed5f64a00 100644 --- a/layout/build/nsLayoutModule.cpp +++ b/layout/build/nsLayoutModule.cpp @@ -36,9 +36,7 @@ * * ***** END LICENSE BLOCK ***** */ -#ifdef MOZ_IPC #include "base/basictypes.h" -#endif #include "xpcmodule.h" #include "mozilla/ModuleUtils.h" diff --git a/layout/generic/nsObjectFrame.cpp b/layout/generic/nsObjectFrame.cpp index b3f31f6a0f7..6d2a5e1092b 100644 --- a/layout/generic/nsObjectFrame.cpp +++ b/layout/generic/nsObjectFrame.cpp @@ -55,9 +55,7 @@ #undef slots #endif -#ifdef MOZ_IPC #include "mozilla/plugins/PluginMessageUtils.h" -#endif #ifdef MOZ_X11 #include @@ -240,9 +238,7 @@ static PRLogModuleInfo *nsObjectFrameLM = PR_NewLogModule("nsObjectFrame"); #endif using namespace mozilla; -#ifdef MOZ_IPC using namespace mozilla::plugins; -#endif using namespace mozilla::layers; // special class for handeling DOM context menu events because for @@ -2355,7 +2351,6 @@ nsObjectFrame::PaintPlugin(nsDisplayListBuilder* aBuilder, nsPoint origin; gfxWindowsNativeDrawing nativeDraw(ctx, frameGfxRect); -#ifdef MOZ_IPC if (nativeDraw.IsDoublePass()) { // OOP plugin specific: let the shim know before we paint if we are doing a // double pass render. If this plugin isn't oop, the register window message @@ -2367,7 +2362,6 @@ nsObjectFrame::PaintPlugin(nsDisplayListBuilder* aBuilder, if (pluginEvent.event) inst->HandleEvent(&pluginEvent, nsnull); } -#endif do { HDC hdc = nativeDraw.BeginNativeDrawing(); if (!hdc) diff --git a/layout/generic/nsSubDocumentFrame.cpp b/layout/generic/nsSubDocumentFrame.cpp index 4fd1470140e..03e115c7397 100644 --- a/layout/generic/nsSubDocumentFrame.cpp +++ b/layout/generic/nsSubDocumentFrame.cpp @@ -43,10 +43,8 @@ * as ,