Issue #25 - Part 18: Remove GMP (or nearly all of it)

I had planned to ifdef GMP but the infection is so deep that I couldn't do discrete parts and have it stay building.

2 files changed, 4 insertions, 13 deletions

diff --git a/system/graphics/layers/ipc/PAPZCTreeManager.ipdl b/system/graphics/layers/ipc/PAPZCTreeManager.ipdl
index 21d899f91..134a222ad 100644
--- a/system/graphics/layers/ipc/PAPZCTreeManager.ipdl
+++ b/system/graphics/layers/ipc/PAPZCTreeManager.ipdl
@@ -8,6 +8,10 @@ include "ipc/nsGUIEventIPC.h";
 
 include protocol PCompositorBridge;
 
+// Workaround to prevent error if PContentChild.cpp & PAPZCTreeManagerChild.cpp
+// are put into different UnifiedProtocolsXX.cpp files.
+include "mozilla/dom/TabMessageUtils.h";
+
 using CSSRect from "Units.h";
 using LayoutDeviceCoord from "Units.h";
 using LayoutDeviceIntPoint from "Units.h";
diff --git a/system/runtime/nsEmbedFunctions.cpp b/system/runtime/nsEmbedFunctions.cpp
index 02cd1e39d..def157cf8 100644
--- a/system/runtime/nsEmbedFunctions.cpp
+++ b/system/runtime/nsEmbedFunctions.cpp
@@ -63,8 +63,6 @@
 #include "mozilla/ipc/XPCShellEnvironment.h"
 #include "mozilla/WindowsDllBlocklist.h"
 
-#include "GMPProcessChild.h"
-#include "GMPLoader.h"
 #include "mozilla/gfx/GPUProcessImpl.h"
 
 #include "GeckoProfiler.h"
@@ -89,10 +87,6 @@ using mozilla::dom::ContentProcess;
 using mozilla::dom::ContentParent;
 using mozilla::dom::ContentChild;
 
-using mozilla::gmp::GMPLoader;
-using mozilla::gmp::CreateGMPLoader;
-using mozilla::gmp::GMPProcessChild;
-
 using mozilla::ipc::TestShellParent;
 using mozilla::ipc::TestShellCommandParent;
 using mozilla::ipc::XPCShellEnvironment;
@@ -351,9 +345,6 @@ XRE_InitChildProcess(int aArgc,
       // Content processes need the XPCOM/chromium frankenventloop
       uiLoopType = MessageLoop::TYPE_MOZILLA_CHILD;
       break;
-  case GeckoProcessType_GMPlugin:
-      uiLoopType = MessageLoop::TYPE_DEFAULT;
-      break;
   default:
       uiLoopType = MessageLoop::TYPE_UI;
       break;
@@ -415,10 +406,6 @@ XRE_InitChildProcess(int aArgc,
 #endif
         break;
 
-      case GeckoProcessType_GMPlugin:
-        process = new gmp::GMPProcessChild(parentPID);
-        break;
-
       case GeckoProcessType_GPU:
         process = new gfx::GPUProcessImpl(parentPID);
         break;