Remove makefile and glue bits which support out of process tabs on the electrolysis-plugins-only branch. electrolysis-plugins-only
authorBenjamin Smedberg <benjamin@smedbergs.us>
Mon, 30 Nov 2009 14:44:38 -0500
branchelectrolysis-plugins-only
changeset 36121 8718a4fb041a3b1e35967585b325766fb36db4a2
parent 36120 304741fcee19b277d9db3bb204fa2a4d3afa839d
child 36122 19d257200d1bd0da7e6834c930ade8f406ceaaef
push idunknown
push userunknown
push dateunknown
milestone1.9.3a1pre
Remove makefile and glue bits which support out of process tabs on the electrolysis-plugins-only branch.
dom/Makefile.in
ipc/Makefile.in
ipc/ipdl/Makefile.in
toolkit/library/libxul-config.mk
toolkit/xre/nsEmbedFunctions.cpp
--- a/dom/Makefile.in
+++ b/dom/Makefile.in
@@ -77,20 +77,14 @@ endif
 DIRS += \
   public/coreEvents \
   base \
   src \
   locales \
   plugins \
   $(NULL)
 
-ifdef MOZ_IPC
-DIRS += \
-  ipc \
-  $(NULL)
-endif
-
 ifdef ENABLE_TESTS
 DIRS += tests
 endif
 
 include $(topsrcdir)/config/rules.mk
 
--- a/ipc/Makefile.in
+++ b/ipc/Makefile.in
@@ -36,12 +36,11 @@
 
 DEPTH = ..
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS += testshell
 TOOL_DIRS = app
 
 include $(topsrcdir)/config/rules.mk
--- a/ipc/ipdl/Makefile.in
+++ b/ipc/ipdl/Makefile.in
@@ -43,21 +43,17 @@ include $(DEPTH)/config/autoconf.mk
 
 GARBAGE_DIRS += _ipdlheaders
 GARBAGE += ipdl_lextab.py ipdl_yacctab.py
 
 include $(topsrcdir)/config/rules.mk
 
 IPDLDIRS =  \
   dom/plugins  \
-  dom/ipc  \
-  netwerk/ipc  \
-  netwerk/protocol/http/src  \
   ipc/ipdl/test/cxx  \
-  ipc/testshell  \
   $(NULL)
 
 vpath %.ipdl $(topsrcdir)
 
 define ADD_IPDLDIR
 include $(topsrcdir)/$(IPDLDIR)/ipdl.mk
 ALL_IPDLSRCS += $$(IPDLSRCS:%=$(IPDLDIR)/%)
 endef
--- a/toolkit/library/libxul-config.mk
+++ b/toolkit/library/libxul-config.mk
@@ -88,21 +88,19 @@ RCFLAGS += -i $(topsrcdir)/widget/src/os
 endif
 
 LOCAL_INCLUDES += -I$(topsrcdir)/widget/src/os2
 endif
 
 # dependent libraries
 ifdef MOZ_IPC
 STATIC_LIBS += \
-  domipc_s \
   domplugins_s \
   mozipc_s \
   chromium_s \
-  ipcshell_s \
   $(NULL)
 
 ifdef MOZ_IPDL_TESTS
 STATIC_LIBS += ipdlunittest_s
 endif
 
 ifeq (Linux,$(OS_ARCH))
 OS_LIBS += -lrt
--- a/toolkit/xre/nsEmbedFunctions.cpp
+++ b/toolkit/xre/nsEmbedFunctions.cpp
@@ -73,43 +73,32 @@
 #include "base/process_util.h"
 #include "chrome/common/child_process.h"
 
 #include "mozilla/ipc/GeckoChildProcessHost.h"
 #include "mozilla/ipc/GeckoThread.h"
 #include "ScopedXREEmbed.h"
 
 #include "mozilla/plugins/PluginThreadChild.h"
-#include "mozilla/dom/ContentProcessThread.h"
-#include "mozilla/dom/ContentProcessParent.h"
-#include "mozilla/dom/ContentProcessChild.h"
 
-#include "mozilla/ipc/TestShellParent.h"
-#include "mozilla/ipc/XPCShellEnvironment.h"
 #include "mozilla/Monitor.h"
 
 #ifdef MOZ_IPDL_TESTS
 #include "mozilla/_ipdltest/IPDLUnitTests.h"
 #include "mozilla/_ipdltest/IPDLUnitTestThreadChild.h"
 
 using mozilla::_ipdltest::IPDLUnitTestThreadChild;
 #endif  // ifdef MOZ_IPDL_TESTS
 
 using mozilla::ipc::GeckoChildProcessHost;
 using mozilla::ipc::GeckoThread;
 using mozilla::ipc::BrowserProcessSubThread;
 using mozilla::ipc::ScopedXREEmbed;
 
 using mozilla::plugins::PluginThreadChild;
-using mozilla::dom::ContentProcessThread;
-using mozilla::dom::ContentProcessParent;
-using mozilla::dom::ContentProcessChild;
-using mozilla::ipc::TestShellParent;
-using mozilla::ipc::TestShellCommandParent;
-using mozilla::ipc::XPCShellEnvironment;
 
 using mozilla::Monitor;
 using mozilla::MonitorAutoEnter;
 #endif
 
 static NS_DEFINE_CID(kAppShellCID, NS_APPSHELL_CID);
 
 void
@@ -304,20 +293,16 @@ XRE_InitChildProcess(int aArgc,
     case GeckoProcessType_Default:
       mainThread = new GeckoThread(parentHandle);
       break;
 
     case GeckoProcessType_Plugin:
       mainThread = new PluginThreadChild(parentHandle);
       break;
 
-    case GeckoProcessType_Content:
-      mainThread = new ContentProcessThread(parentHandle);
-      break;
-
     case GeckoProcessType_IPDLUnitTest:
 #ifdef MOZ_IPDL_TESTS
       mainThread = new IPDLUnitTestThreadChild(parentHandle);
 #else
       NS_RUNTIMEABORT("rebuild with --enable-ipdl-tests");
 #endif
       break;
 
@@ -446,76 +431,19 @@ nsresult
 XRE_RunAppShell()
 {
     nsCOMPtr<nsIAppShell> appShell(do_GetService(kAppShellCID));
     NS_ENSURE_TRUE(appShell, NS_ERROR_FAILURE);
 
     return appShell->Run();
 }
 
-template<>
-struct RunnableMethodTraits<ContentProcessChild>
-{
-    static void RetainCallee(ContentProcessChild* obj) { }
-    static void ReleaseCallee(ContentProcessChild* obj) { }
-};
-
 void
 XRE_ShutdownChildProcess(MessageLoop* aUILoop)
 {
-    NS_ASSERTION(aUILoop, "Shouldn't be null!");
-    if (aUILoop) {
-        NS_ASSERTION(!NS_IsMainThread(), "Wrong thread!");
-        if (GeckoProcessType_Content == XRE_GetProcessType())
-            aUILoop->PostTask(
-                FROM_HERE,
-                NewRunnableMethod(ContentProcessChild::GetSingleton(),
-                                  &ContentProcessChild::Quit));
-    }
-}
-
-namespace {
-TestShellParent* gTestShellParent = nsnull;
-}
-
-bool
-XRE_SendTestShellCommand(JSContext* aCx,
-                         JSString* aCommand,
-                         void* aCallback)
-{
-    if (!gTestShellParent) {
-        ContentProcessParent* parent = ContentProcessParent::GetSingleton();
-        NS_ENSURE_TRUE(parent, false);
-
-        gTestShellParent = parent->CreateTestShell();
-        NS_ENSURE_TRUE(gTestShellParent, false);
-    }
-
-    nsDependentString command((PRUnichar*)JS_GetStringChars(aCommand),
-                              JS_GetStringLength(aCommand));
-    if (!aCallback) {
-        return gTestShellParent->SendExecuteCommand(command);
-    }
-
-    TestShellCommandParent* callback = static_cast<TestShellCommandParent*>(
-        gTestShellParent->SendPTestShellCommandConstructor(command));
-    NS_ENSURE_TRUE(callback, false);
-
-    jsval callbackVal = *reinterpret_cast<jsval*>(aCallback);
-    NS_ENSURE_TRUE(callback->SetCallback(aCx, callbackVal), false);
-
-    return true;
-}
-
-bool
-XRE_ShutdownTestShell()
-{
-  if (!gTestShellParent)
-    return true;
-  return ContentProcessParent::GetSingleton()->DestroyTestShell(gTestShellParent);
 }
 
 #endif // MOZ_IPC
 
 
 nsresult
 XRE_InitCommandLine(int aArgc, char* aArgv[])
 {