From fbdd52ea571bb591e596797f7cc745426b620a97 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Mon, 21 May 2018 13:56:28 +0200 Subject: Remove GMP, Plugin and IPC crash reporter hooks. Stubs will be removed in follow-up Tag #20. --- dom/plugins/ipc/PPluginModule.ipdl | 5 ----- dom/plugins/ipc/PluginModuleChild.cpp | 25 ------------------------- dom/plugins/ipc/PluginModuleChild.h | 15 --------------- dom/plugins/ipc/PluginModuleParent.cpp | 29 ----------------------------- dom/plugins/ipc/PluginModuleParent.h | 14 -------------- 5 files changed, 88 deletions(-) (limited to 'dom/plugins') diff --git a/dom/plugins/ipc/PPluginModule.ipdl b/dom/plugins/ipc/PPluginModule.ipdl index ecde41b63..6d83f3a3b 100644 --- a/dom/plugins/ipc/PPluginModule.ipdl +++ b/dom/plugins/ipc/PPluginModule.ipdl @@ -5,7 +5,6 @@ include protocol PPluginInstance; include protocol PPluginScriptableObject; -include protocol PCrashReporter; include protocol PContent; include ProfilerTypes; @@ -39,7 +38,6 @@ intr protocol PPluginModule bridges PContent, PPluginModule; manages PPluginInstance; - manages PCrashReporter; both: // Window-specific message which instructs the interrupt mechanism to enter @@ -94,9 +92,6 @@ child: async SetParentHangTimeout(uint32_t seconds); - intr PCrashReporter() - returns (NativeThreadId tid, uint32_t processType); - /** * Control the Gecko Profiler in the plugin process. */ diff --git a/dom/plugins/ipc/PluginModuleChild.cpp b/dom/plugins/ipc/PluginModuleChild.cpp index 7350a7fa7..78c0d26ea 100644 --- a/dom/plugins/ipc/PluginModuleChild.cpp +++ b/dom/plugins/ipc/PluginModuleChild.cpp @@ -56,8 +56,6 @@ using namespace mozilla; using namespace mozilla::ipc; using namespace mozilla::plugins; using namespace mozilla::widget; -using mozilla::dom::CrashReporterChild; -using mozilla::dom::PCrashReporterChild; #if defined(XP_WIN) const wchar_t * kFlashFullscreenClass = L"ShockwaveFlashFullScreen"; @@ -733,29 +731,6 @@ PluginModuleChild::AllocPPluginModuleChild(mozilla::ipc::Transport* aTransport, return PluginModuleChild::CreateForContentProcess(aTransport, aOtherPid); } -PCrashReporterChild* -PluginModuleChild::AllocPCrashReporterChild(mozilla::dom::NativeThreadId* id, - uint32_t* processType) -{ - return new CrashReporterChild(); -} - -bool -PluginModuleChild::DeallocPCrashReporterChild(PCrashReporterChild* actor) -{ - delete actor; - return true; -} - -bool -PluginModuleChild::AnswerPCrashReporterConstructor( - PCrashReporterChild* actor, - mozilla::dom::NativeThreadId* id, - uint32_t* processType) -{ - return true; -} - void PluginModuleChild::ActorDestroy(ActorDestroyReason why) { diff --git a/dom/plugins/ipc/PluginModuleChild.h b/dom/plugins/ipc/PluginModuleChild.h index 233a95369..1c04ed7f9 100644 --- a/dom/plugins/ipc/PluginModuleChild.h +++ b/dom/plugins/ipc/PluginModuleChild.h @@ -46,17 +46,12 @@ typedef NS_NPAPIPLUGIN_CALLBACK(NPError, NP_PLUGINUNIXINIT) (const NPNetscapeFun typedef NS_NPAPIPLUGIN_CALLBACK(NPError, NP_PLUGINSHUTDOWN) (void); namespace mozilla { -namespace dom { -class PCrashReporterChild; -} // namespace dom - namespace plugins { class PluginInstanceChild; class PluginModuleChild : public PPluginModuleChild { - typedef mozilla::dom::PCrashReporterChild PCrashReporterChild; protected: virtual mozilla::ipc::RacyInterruptPolicy MediateInterruptRace(const MessageInfo& parent, @@ -124,16 +119,6 @@ protected: virtual bool RecvSetParentHangTimeout(const uint32_t& aSeconds) override; - virtual PCrashReporterChild* - AllocPCrashReporterChild(mozilla::dom::NativeThreadId* id, - uint32_t* processType) override; - virtual bool - DeallocPCrashReporterChild(PCrashReporterChild* actor) override; - virtual bool - AnswerPCrashReporterConstructor(PCrashReporterChild* actor, - mozilla::dom::NativeThreadId* id, - uint32_t* processType) override; - virtual void ActorDestroy(ActorDestroyReason why) override; diff --git a/dom/plugins/ipc/PluginModuleParent.cpp b/dom/plugins/ipc/PluginModuleParent.cpp index ae6da8787..ee005b14a 100755 --- a/dom/plugins/ipc/PluginModuleParent.cpp +++ b/dom/plugins/ipc/PluginModuleParent.cpp @@ -10,7 +10,6 @@ #include "mozilla/Attributes.h" #include "mozilla/dom/ContentParent.h" #include "mozilla/dom/ContentChild.h" -#include "mozilla/dom/PCrashReporterParent.h" #include "mozilla/ipc/GeckoChildProcessHost.h" #include "mozilla/ipc/MessageChannel.h" #include "mozilla/ipc/ProtocolUtils.h" @@ -67,7 +66,6 @@ using mozilla::ProfileGatherer; #endif using mozilla::ipc::MessageChannel; using mozilla::ipc::GeckoChildProcessHost; -using mozilla::dom::PCrashReporterParent; using mozilla::dom::CrashReporterParent; using namespace mozilla; @@ -2525,33 +2523,6 @@ PluginModuleParent::RecvPluginHideWindow(const uint32_t& aWindowId) #endif } -PCrashReporterParent* -PluginModuleParent::AllocPCrashReporterParent(mozilla::dom::NativeThreadId* id, - uint32_t* processType) -{ - MOZ_CRASH("unreachable"); -} - -bool -PluginModuleParent::DeallocPCrashReporterParent(PCrashReporterParent* actor) -{ - MOZ_CRASH("unreachable"); -} - -PCrashReporterParent* -PluginModuleChromeParent::AllocPCrashReporterParent(mozilla::dom::NativeThreadId* id, - uint32_t* processType) -{ - return nullptr; -} - -bool -PluginModuleChromeParent::DeallocPCrashReporterParent(PCrashReporterParent* actor) -{ - delete actor; - return true; -} - bool PluginModuleParent::RecvSetCursor(const NSCursorInfo& aCursorInfo) { diff --git a/dom/plugins/ipc/PluginModuleParent.h b/dom/plugins/ipc/PluginModuleParent.h index d00a01401..a84666ab5 100644 --- a/dom/plugins/ipc/PluginModuleParent.h +++ b/dom/plugins/ipc/PluginModuleParent.h @@ -34,7 +34,6 @@ namespace mozilla { class ProfileGatherer; #endif namespace dom { -class PCrashReporterParent; class CrashReporterParent; } // namespace dom @@ -76,7 +75,6 @@ class PluginModuleParent { protected: typedef mozilla::PluginLibrary PluginLibrary; - typedef mozilla::dom::PCrashReporterParent PCrashReporterParent; typedef mozilla::dom::CrashReporterParent CrashReporterParent; PPluginInstanceParent* @@ -158,12 +156,6 @@ protected: virtual bool RecvPluginHideWindow(const uint32_t& aWindowId) override; - virtual PCrashReporterParent* - AllocPCrashReporterParent(mozilla::dom::NativeThreadId* id, - uint32_t* processType) override; - virtual bool - DeallocPCrashReporterParent(PCrashReporterParent* actor) override; - virtual bool RecvSetCursor(const NSCursorInfo& aCursorInfo) override; @@ -508,12 +500,6 @@ private: virtual bool ShouldContinueFromReplyTimeout() override; - virtual PCrashReporterParent* - AllocPCrashReporterParent(mozilla::dom::NativeThreadId* id, - uint32_t* processType) override; - virtual bool - DeallocPCrashReporterParent(PCrashReporterParent* actor) override; - PluginProcessParent* Process() const { return mSubprocess; } base::ProcessHandle ChildProcessHandle() { return mSubprocess->GetChildProcessHandle(); } -- cgit v1.2.3