diff options
Diffstat (limited to 'dom')
-rw-r--r-- | dom/ipc/ContentChild.cpp | 14 | ||||
-rw-r--r-- | dom/ipc/ContentChild.h | 7 | ||||
-rw-r--r-- | dom/ipc/ContentParent.cpp | 23 | ||||
-rw-r--r-- | dom/ipc/ContentParent.h | 12 | ||||
-rw-r--r-- | dom/ipc/CrashReporterChild.cpp | 27 | ||||
-rw-r--r-- | dom/ipc/CrashReporterChild.h | 18 | ||||
-rw-r--r-- | dom/ipc/CrashReporterParent.cpp | 45 | ||||
-rw-r--r-- | dom/ipc/CrashReporterParent.h | 53 | ||||
-rw-r--r-- | dom/ipc/PContent.ipdl | 4 | ||||
-rw-r--r-- | dom/ipc/PCrashReporter.ipdl | 31 | ||||
-rw-r--r-- | dom/ipc/moz.build | 1 | ||||
-rw-r--r-- | dom/media/gmp/GMPChild.cpp | 14 | ||||
-rw-r--r-- | dom/media/gmp/GMPChild.h | 3 | ||||
-rw-r--r-- | dom/media/gmp/GMPParent.cpp | 17 | ||||
-rw-r--r-- | dom/media/gmp/GMPParent.h | 3 | ||||
-rw-r--r-- | dom/media/gmp/PGMP.ipdl | 3 | ||||
-rw-r--r-- | dom/plugins/ipc/PPluginModule.ipdl | 5 | ||||
-rw-r--r-- | dom/plugins/ipc/PluginModuleChild.cpp | 25 | ||||
-rw-r--r-- | dom/plugins/ipc/PluginModuleChild.h | 15 | ||||
-rwxr-xr-x | dom/plugins/ipc/PluginModuleParent.cpp | 29 | ||||
-rw-r--r-- | dom/plugins/ipc/PluginModuleParent.h | 14 |
21 files changed, 6 insertions, 357 deletions
diff --git a/dom/ipc/ContentChild.cpp b/dom/ipc/ContentChild.cpp index 9e1c7e8cb4..532a9a3a42 100644 --- a/dom/ipc/ContentChild.cpp +++ b/dom/ipc/ContentChild.cpp @@ -32,7 +32,6 @@ #include "mozilla/dom/ExternalHelperAppChild.h" #include "mozilla/dom/FlyWebPublishedServerIPC.h" #include "mozilla/dom/GetFilesHelper.h" -#include "mozilla/dom/PCrashReporterChild.h" #include "mozilla/dom/ProcessGlobal.h" #include "mozilla/dom/PushNotifier.h" #include "mozilla/dom/workers/ServiceWorkerManager.h" @@ -1497,19 +1496,6 @@ ContentChild::RecvNotifyEmptyHTTPCache() return true; } -PCrashReporterChild* -ContentChild::AllocPCrashReporterChild(const mozilla::dom::NativeThreadId& id, - const uint32_t& processType) -{ - return nullptr; -} - -bool -ContentChild::DeallocPCrashReporterChild(PCrashReporterChild* crashreporter) -{ - delete crashreporter; - return true; -} PHalChild* ContentChild::AllocPHalChild() diff --git a/dom/ipc/ContentChild.h b/dom/ipc/ContentChild.h index c78f951f0f..978dd6357c 100644 --- a/dom/ipc/ContentChild.h +++ b/dom/ipc/ContentChild.h @@ -186,13 +186,6 @@ public: virtual bool DeallocPBlobChild(PBlobChild* aActor) override; - virtual PCrashReporterChild* - AllocPCrashReporterChild(const mozilla::dom::NativeThreadId& id, - const uint32_t& processType) override; - - virtual bool - DeallocPCrashReporterChild(PCrashReporterChild*) override; - virtual PHalChild* AllocPHalChild() override; virtual bool DeallocPHalChild(PHalChild*) override; diff --git a/dom/ipc/ContentParent.cpp b/dom/ipc/ContentParent.cpp index 8b9ab44428..eb5550088e 100644 --- a/dom/ipc/ContentParent.cpp +++ b/dom/ipc/ContentParent.cpp @@ -2953,29 +2953,6 @@ ContentParent::FriendlyName(nsAString& aName, bool aAnonymize) } } -PCrashReporterParent* -ContentParent::AllocPCrashReporterParent(const NativeThreadId& tid, - const uint32_t& processType) -{ - return nullptr; -} - -bool -ContentParent::RecvPCrashReporterConstructor(PCrashReporterParent* actor, - const NativeThreadId& tid, - const uint32_t& processType) -{ - static_cast<CrashReporterParent*>(actor)->SetChildData(tid, processType); - return true; -} - -bool -ContentParent::DeallocPCrashReporterParent(PCrashReporterParent* crashreporter) -{ - delete crashreporter; - return true; -} - hal_sandbox::PHalParent* ContentParent::AllocPHalParent() { diff --git a/dom/ipc/ContentParent.h b/dom/ipc/ContentParent.h index 3f74b10e10..87384e0300 100644 --- a/dom/ipc/ContentParent.h +++ b/dom/ipc/ContentParent.h @@ -372,15 +372,6 @@ public: virtual void OnChannelError() override; - virtual PCrashReporterParent* - AllocPCrashReporterParent(const NativeThreadId& tid, - const uint32_t& processType) override; - - virtual bool - RecvPCrashReporterConstructor(PCrashReporterParent* actor, - const NativeThreadId& tid, - const uint32_t& processType) override; - virtual PNeckoParent* AllocPNeckoParent() override; virtual bool RecvPNeckoConstructor(PNeckoParent* aActor) override @@ -735,9 +726,6 @@ private: RecvPBlobConstructor(PBlobParent* aActor, const BlobConstructorParams& params) override; - virtual bool - DeallocPCrashReporterParent(PCrashReporterParent* crashreporter) override; - virtual bool RecvNSSU2FTokenIsCompatibleVersion(const nsString& aVersion, bool* aIsCompatible) override; diff --git a/dom/ipc/CrashReporterChild.cpp b/dom/ipc/CrashReporterChild.cpp index 8174452e70..d5616a504e 100644 --- a/dom/ipc/CrashReporterChild.cpp +++ b/dom/ipc/CrashReporterChild.cpp @@ -12,31 +12,6 @@ using mozilla::plugins::PluginModuleChild; namespace mozilla { namespace dom { - -/*static*/ -PCrashReporterChild* -CrashReporterChild::GetCrashReporter() -{ - const ManagedContainer<PCrashReporterChild>* reporters = nullptr; - switch (XRE_GetProcessType()) { - case GeckoProcessType_Content: { - ContentChild* child = ContentChild::GetSingleton(); - reporters = &child->ManagedPCrashReporterChild(); - break; - } - case GeckoProcessType_Plugin: { - PluginModuleChild* child = PluginModuleChild::GetChrome(); - reporters = &child->ManagedPCrashReporterChild(); - break; - } - default: - break; - } - if (!reporters) { - return nullptr; - } - return LoneManagedOrNullAsserts(*reporters); -} - + /*** STUB ***/ } // namespace dom } // namespace mozilla diff --git a/dom/ipc/CrashReporterChild.h b/dom/ipc/CrashReporterChild.h index 96355ca11a..32140a9011 100644 --- a/dom/ipc/CrashReporterChild.h +++ b/dom/ipc/CrashReporterChild.h @@ -7,25 +7,9 @@ #ifndef mozilla_dom_CrashReporterChild_h #define mozilla_dom_CrashReporterChild_h -#include "mozilla/dom/PCrashReporterChild.h" - namespace mozilla { namespace dom { - -class CrashReporterChild : - public PCrashReporterChild -{ -public: - CrashReporterChild() { - MOZ_COUNT_CTOR(CrashReporterChild); - } - ~CrashReporterChild() { - MOZ_COUNT_DTOR(CrashReporterChild); - } - - static PCrashReporterChild* GetCrashReporter(); -}; - + /*** STUB ***/ } // namespace dom } // namespace mozilla diff --git a/dom/ipc/CrashReporterParent.cpp b/dom/ipc/CrashReporterParent.cpp index 677b296702..75b0fccb74 100644 --- a/dom/ipc/CrashReporterParent.cpp +++ b/dom/ipc/CrashReporterParent.cpp @@ -16,48 +16,7 @@ namespace mozilla { namespace dom { -using namespace mozilla::ipc; - -void -CrashReporterParent::AnnotateCrashReport(const nsCString& key, - const nsCString& data) -{ -} - -void -CrashReporterParent::ActorDestroy(ActorDestroyReason aWhy) -{ - // Implement me! Bug 1005155 -} - -bool -CrashReporterParent::RecvAppendAppNotes(const nsCString& data) -{ - mAppNotes.Append(data); - return true; -} - -CrashReporterParent::CrashReporterParent() - : - mStartTime(::time(nullptr)) - , mInitialized(false) -{ - MOZ_COUNT_CTOR(CrashReporterParent); -} - -CrashReporterParent::~CrashReporterParent() -{ - MOZ_COUNT_DTOR(CrashReporterParent); -} - -void -CrashReporterParent::SetChildData(const NativeThreadId& tid, - const uint32_t& processType) -{ - mInitialized = true; - mMainThread = tid; - mProcessType = GeckoProcessType(processType); -} - + /*** STUB ***/ + } // namespace dom } // namespace mozilla diff --git a/dom/ipc/CrashReporterParent.h b/dom/ipc/CrashReporterParent.h index 71896c5c1b..481c4d77bf 100644 --- a/dom/ipc/CrashReporterParent.h +++ b/dom/ipc/CrashReporterParent.h @@ -7,63 +7,14 @@ #ifndef mozilla_dom_CrashReporterParent_h #define mozilla_dom_CrashReporterParent_h -#include "mozilla/dom/PCrashReporterParent.h" #include "mozilla/dom/TabMessageUtils.h" #include "nsIFile.h" namespace mozilla { namespace dom { -class CrashReporterParent : public PCrashReporterParent -{ -public: - CrashReporterParent(); - virtual ~CrashReporterParent(); - - /* - * Initialize this reporter with data from the child process. - */ - void - SetChildData(const NativeThreadId& id, const uint32_t& processType); - - /* - * Returns the ID of the child minidump. - * GeneratePairedMinidump or GenerateCrashReport must be called first. - */ - const nsString& ChildDumpID() const { - return mChildDumpID; - } - - /* - * Add an annotation to our internally tracked list of annotations. - * Callers must apply these notes using GenerateChildData otherwise - * the notes will get dropped. - */ - void - AnnotateCrashReport(const nsCString& aKey, const nsCString& aData); - - protected: - virtual void ActorDestroy(ActorDestroyReason aWhy) override; - - virtual bool RecvAnnotateCrashReport(const nsCString& aKey, - const nsCString& aData) override - { - AnnotateCrashReport(aKey, aData); - return true; - } - - virtual bool RecvAppendAppNotes(const nsCString& aData) override; - - nsCString mAppNotes; - nsString mChildDumpID; - // stores the child main thread id - NativeThreadId mMainThread; - time_t mStartTime; - // stores the child process type - GeckoProcessType mProcessType; - bool mInitialized; -}; - + /*** STUB ***/ + } // namespace dom } // namespace mozilla diff --git a/dom/ipc/PContent.ipdl b/dom/ipc/PContent.ipdl index d436c19fef..a914c4cc88 100644 --- a/dom/ipc/PContent.ipdl +++ b/dom/ipc/PContent.ipdl @@ -11,7 +11,6 @@ include protocol PCompositorBridge; include protocol PContentBridge; include protocol PContentPermissionRequest; include protocol PCycleCollectWithLogs; -include protocol PCrashReporter; include protocol PPSMContentDownloader; include protocol PExternalHelperApp; include protocol PHandlerService; @@ -243,7 +242,6 @@ nested(upto inside_cpow) sync protocol PContent manages PBlob; manages PBrowser; manages PContentPermissionRequest; - manages PCrashReporter; manages PCycleCollectWithLogs; manages PPSMContentDownloader; manages PExternalHelperApp; @@ -625,8 +623,6 @@ parent: async PRemoteSpellcheckEngine(); - sync PCrashReporter(NativeThreadId tid, uint32_t processType); - /** * Is this token compatible with the provided version? * diff --git a/dom/ipc/PCrashReporter.ipdl b/dom/ipc/PCrashReporter.ipdl deleted file mode 100644 index 8f965f2eec..0000000000 --- a/dom/ipc/PCrashReporter.ipdl +++ /dev/null @@ -1,31 +0,0 @@ -/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- - * vim: set sw=4 ts=8 et tw=80 : - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -include protocol PContent; -include protocol PPluginModule; -include protocol PGMP; - -namespace mozilla { -namespace dom { - -struct Mapping { - nsCString library_name; - nsCString file_id; - uintptr_t start_address; - size_t mapping_length; - size_t file_offset; -}; - -async protocol PCrashReporter { - manager PContent or PPluginModule or PGMP; -parent: - async AnnotateCrashReport(nsCString key, nsCString data); - async AppendAppNotes(nsCString data); - async __delete__(); -}; - -} -} diff --git a/dom/ipc/moz.build b/dom/ipc/moz.build index c34ac5d484..0871f3f23e 100644 --- a/dom/ipc/moz.build +++ b/dom/ipc/moz.build @@ -92,7 +92,6 @@ IPDL_SOURCES += [ 'PContentBridge.ipdl', 'PContentPermission.ipdlh', 'PContentPermissionRequest.ipdl', - 'PCrashReporter.ipdl', 'PCycleCollectWithLogs.ipdl', 'PFilePicker.ipdl', 'PMemoryReportRequest.ipdl', diff --git a/dom/media/gmp/GMPChild.cpp b/dom/media/gmp/GMPChild.cpp index f83a927cac..ad08d39502 100644 --- a/dom/media/gmp/GMPChild.cpp +++ b/dom/media/gmp/GMPChild.cpp @@ -26,7 +26,6 @@ #include "widevine-adapter/WidevineAdapter.h" using namespace mozilla::ipc; -using mozilla::dom::CrashReporterChild; static const int MAX_VOUCHER_LENGTH = 500000; @@ -331,19 +330,6 @@ GMPChild::ProcessingError(Result aCode, const char* aReason) } } -mozilla::dom::PCrashReporterChild* -GMPChild::AllocPCrashReporterChild(const NativeThreadId& aThread) -{ - return new CrashReporterChild(); -} - -bool -GMPChild::DeallocPCrashReporterChild(PCrashReporterChild* aCrashReporter) -{ - delete aCrashReporter; - return true; -} - PGMPTimerChild* GMPChild::AllocPGMPTimerChild() { diff --git a/dom/media/gmp/GMPChild.h b/dom/media/gmp/GMPChild.h index a4f6889016..722e4c7a91 100644 --- a/dom/media/gmp/GMPChild.h +++ b/dom/media/gmp/GMPChild.h @@ -52,9 +52,6 @@ private: bool AnswerStartPlugin(const nsString& aAdapter) override; bool RecvPreloadLibs(const nsCString& aLibs) override; - PCrashReporterChild* AllocPCrashReporterChild(const NativeThreadId& aThread) override; - bool DeallocPCrashReporterChild(PCrashReporterChild*) override; - PGMPTimerChild* AllocPGMPTimerChild() override; bool DeallocPGMPTimerChild(PGMPTimerChild* aActor) override; diff --git a/dom/media/gmp/GMPParent.cpp b/dom/media/gmp/GMPParent.cpp index 851634ce79..beca4d1a3c 100644 --- a/dom/media/gmp/GMPParent.cpp +++ b/dom/media/gmp/GMPParent.cpp @@ -23,7 +23,6 @@ #include "VideoUtils.h" #include "mozilla/dom/CrashReporterParent.h" -using mozilla::dom::CrashReporterParent; using mozilla::ipc::GeckoChildProcessHost; #include "mozilla/Telemetry.h" @@ -580,22 +579,6 @@ GMPParent::ActorDestroy(ActorDestroyReason aWhy) } } -mozilla::dom::PCrashReporterParent* -GMPParent::AllocPCrashReporterParent(const NativeThreadId& aThread) -{ - MOZ_ASSERT(false, "Should only be sent if crash reporting is enabled."); - CrashReporterParent* cr = new CrashReporterParent(); - cr->SetChildData(aThread, GeckoProcessType_GMPlugin); - return cr; -} - -bool -GMPParent::DeallocPCrashReporterParent(PCrashReporterParent* aCrashReporter) -{ - delete aCrashReporter; - return true; -} - PGMPStorageParent* GMPParent::AllocPGMPStorageParent() { diff --git a/dom/media/gmp/GMPParent.h b/dom/media/gmp/GMPParent.h index 4f91ec5ba6..dacd6feeba 100644 --- a/dom/media/gmp/GMPParent.h +++ b/dom/media/gmp/GMPParent.h @@ -168,9 +168,6 @@ private: RefPtr<GenericPromise> ReadChromiumManifestFile(nsIFile* aFile); // GMP thread. void ActorDestroy(ActorDestroyReason aWhy) override; - PCrashReporterParent* AllocPCrashReporterParent(const NativeThreadId& aThread) override; - bool DeallocPCrashReporterParent(PCrashReporterParent* aCrashReporter) override; - bool RecvPGMPStorageConstructor(PGMPStorageParent* actor) override; PGMPStorageParent* AllocPGMPStorageParent() override; bool DeallocPGMPStorageParent(PGMPStorageParent* aActor) override; diff --git a/dom/media/gmp/PGMP.ipdl b/dom/media/gmp/PGMP.ipdl index b421f0280f..e1738d0103 100644 --- a/dom/media/gmp/PGMP.ipdl +++ b/dom/media/gmp/PGMP.ipdl @@ -3,7 +3,6 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -include protocol PCrashReporter; include protocol PGMPContent; include protocol PGMPTimer; include protocol PGMPStorage; @@ -17,12 +16,10 @@ intr protocol PGMP { parent opens PGMPContent; - manages PCrashReporter; manages PGMPTimer; manages PGMPStorage; parent: - async PCrashReporter(NativeThreadId tid); async PGMPTimer(); async PGMPStorage(); diff --git a/dom/plugins/ipc/PPluginModule.ipdl b/dom/plugins/ipc/PPluginModule.ipdl index ecde41b63a..6d83f3a3bd 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 7350a7fa73..78c0d26ea3 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 233a95369d..1c04ed7f98 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 ae6da8787b..ee005b14a8 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 d00a01401d..a84666ab5e 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(); } |