From 19334fd5af4b6335fd6800c8f17484f938649a64 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Thu, 24 May 2018 16:18:59 +0200 Subject: Remove IPC profile functions. Resolves #378. --- dom/plugins/ipc/PPluginModule.ipdl | 10 -------- dom/plugins/ipc/PluginModuleChild.cpp | 42 ---------------------------------- dom/plugins/ipc/PluginModuleChild.h | 4 ---- dom/plugins/ipc/PluginModuleParent.cpp | 7 ------ dom/plugins/ipc/PluginModuleParent.h | 5 ---- 5 files changed, 68 deletions(-) (limited to 'dom/plugins') diff --git a/dom/plugins/ipc/PPluginModule.ipdl b/dom/plugins/ipc/PPluginModule.ipdl index 6d83f3a3b..6797b49a7 100644 --- a/dom/plugins/ipc/PPluginModule.ipdl +++ b/dom/plugins/ipc/PPluginModule.ipdl @@ -92,14 +92,6 @@ child: async SetParentHangTimeout(uint32_t seconds); - /** - * Control the Gecko Profiler in the plugin process. - */ - async StartProfiler(ProfilerInitParams params); - async StopProfiler(); - - async GatherProfile(); - async SettingChanged(PluginSettings settings); async NPP_SetValue_NPNVaudioDeviceChangeDetails(NPAudioDeviceChangeDetailsIPC changeDetails); @@ -148,8 +140,6 @@ parent: // down the plugin process in response. async NotifyContentModuleDestroyed(); - async Profile(nsCString aProfile); - // Answers to request about site data async ReturnClearSiteData(NPError aRv, uint64_t aCallbackId); diff --git a/dom/plugins/ipc/PluginModuleChild.cpp b/dom/plugins/ipc/PluginModuleChild.cpp index 7f7cc7acb..cbf6e509f 100644 --- a/dom/plugins/ipc/PluginModuleChild.cpp +++ b/dom/plugins/ipc/PluginModuleChild.cpp @@ -2549,48 +2549,6 @@ PluginModuleChild::ProcessNativeEvents() { } #endif -bool -PluginModuleChild::RecvStartProfiler(const ProfilerInitParams& params) -{ - nsTArray featureArray; - for (size_t i = 0; i < params.features().Length(); ++i) { - featureArray.AppendElement(params.features()[i].get()); - } - - nsTArray threadNameFilterArray; - for (size_t i = 0; i < params.threadFilters().Length(); ++i) { - threadNameFilterArray.AppendElement(params.threadFilters()[i].get()); - } - - profiler_start(params.entries(), params.interval(), - featureArray.Elements(), featureArray.Length(), - threadNameFilterArray.Elements(), threadNameFilterArray.Length()); - - return true; -} - -bool -PluginModuleChild::RecvStopProfiler() -{ - profiler_stop(); - return true; -} - -bool -PluginModuleChild::RecvGatherProfile() -{ - nsCString profileCString; - UniquePtr profile = profiler_get_profile(); - if (profile != nullptr) { - profileCString = nsCString(profile.get(), strlen(profile.get())); - } else { - profileCString = nsCString("", 0); - } - - Unused << SendProfile(profileCString); - return true; -} - NPError PluginModuleChild::PluginRequiresAudioDeviceChanges( PluginInstanceChild* aInstance, diff --git a/dom/plugins/ipc/PluginModuleChild.h b/dom/plugins/ipc/PluginModuleChild.h index 1c04ed7f9..681743582 100644 --- a/dom/plugins/ipc/PluginModuleChild.h +++ b/dom/plugins/ipc/PluginModuleChild.h @@ -125,10 +125,6 @@ protected: virtual bool RecvProcessNativeEventsInInterruptCall() override; - virtual bool RecvStartProfiler(const ProfilerInitParams& params) override; - virtual bool RecvStopProfiler() override; - virtual bool RecvGatherProfile() override; - virtual bool AnswerModuleSupportsAsyncRender(bool* aResult) override; public: diff --git a/dom/plugins/ipc/PluginModuleParent.cpp b/dom/plugins/ipc/PluginModuleParent.cpp index 2772691eb..7b0e03538 100755 --- a/dom/plugins/ipc/PluginModuleParent.cpp +++ b/dom/plugins/ipc/PluginModuleParent.cpp @@ -2642,13 +2642,6 @@ PluginModuleParent::AnswerNPN_SetValue_NPPVpluginRequiresAudioDeviceChanges( return true; } -bool -PluginModuleChromeParent::RecvProfile(const nsCString& aProfile) -{ - /*** STUB ***/ - return true; -} - bool PluginModuleParent::AnswerGetKeyState(const int32_t& aVirtKey, int16_t* aRet) { diff --git a/dom/plugins/ipc/PluginModuleParent.h b/dom/plugins/ipc/PluginModuleParent.h index 3f4ed8ce1..0ceed6efd 100644 --- a/dom/plugins/ipc/PluginModuleParent.h +++ b/dom/plugins/ipc/PluginModuleParent.h @@ -185,8 +185,6 @@ protected: virtual bool RecvNotifyContentModuleDestroyed() override { return true; } - virtual bool RecvProfile(const nsCString& aProfile) override { return true; } - virtual bool AnswerGetKeyState(const int32_t& aVirtKey, int16_t* aRet) override; virtual bool RecvReturnClearSiteData(const NPError& aRv, @@ -463,9 +461,6 @@ class PluginModuleChromeParent void CachedSettingChanged(); - virtual bool - RecvProfile(const nsCString& aProfile) override; - virtual bool AnswerGetKeyState(const int32_t& aVirtKey, int16_t* aRet) override; -- cgit v1.2.3