RandomHuman
/
Mypal
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[DOM] Store weak pointer to next parents.

This commit is contained in:
Fedor 2021-02-07 17:33:39 +02:00
parent 882efd728c
commit f508c50268
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dom/messagechannel/MessagePortParent.h
View File

@ -5,6 +5,7 @@
#ifndef mozilla_dom_MessagePortParent_h #ifndef mozilla_dom_MessagePortParent_h
#define mozilla_dom_MessagePortParent_h #define mozilla_dom_MessagePortParent_h
#include "mozilla/WeakPtr.h"
#include "mozilla/dom/PMessagePortParent.h" #include "mozilla/dom/PMessagePortParent.h"
namespace mozilla { namespace mozilla {
@ -12,7 +13,8 @@ namespace dom {
class MessagePortService; class MessagePortService;
class MessagePortParent final : public PMessagePortParent class MessagePortParent final : public PMessagePortParent,
public SupportsWeakPtr<MessagePortParent>
{ {
public: public:
explicit MessagePortParent(const nsID& aUUID); explicit MessagePortParent(const nsID& aUUID);
@ -40,6 +42,8 @@ public:
const nsID& aDestinationUUID, const nsID& aDestinationUUID,
const uint32_t& aSequenceID); const uint32_t& aSequenceID);
MOZ_DECLARE_WEAKREFERENCE_TYPENAME(MessagePortParent)
private: private:
virtual bool RecvPostMessages(nsTArray<MessagePortMessage>&& aMessages) virtual bool RecvPostMessages(nsTArray<MessagePortMessage>&& aMessages)
override; override;

11
dom/messagechannel/MessagePortService.cpp
View File

@ -9,6 +9,7 @@
#include "mozilla/ipc/BackgroundParent.h" #include "mozilla/ipc/BackgroundParent.h"
#include "mozilla/StaticPtr.h" #include "mozilla/StaticPtr.h"
#include "mozilla/Unused.h" #include "mozilla/Unused.h"
#include "mozilla/WeakPtr.h"
#include "nsTArray.h" #include "nsTArray.h"
using mozilla::ipc::AssertIsOnBackgroundThread; using mozilla::ipc::AssertIsOnBackgroundThread;
@ -59,7 +60,7 @@ public:
{ {
uint32_t mSequenceID; uint32_t mSequenceID;
// MessagePortParent keeps the service alive, and we don't want a cycle. // MessagePortParent keeps the service alive, and we don't want a cycle.
MessagePortParent* mParent; WeakPtr<MessagePortParent> mParent;
}; };
FallibleTArray<NextParent> mNextParents; FallibleTArray<NextParent> mNextParents;
@ -275,9 +276,13 @@ MessagePortService::CloseAll(const nsID& aUUID, bool aForced)
data->mParent->Close(); data->mParent->Close();
} }
for (const MessagePortServiceData::NextParent& parent : data->mNextParents) { for (const MessagePortServiceData::NextParent& nextParent : data->mNextParents) {
parent.mParent->CloseAndDelete(); MessagePortParent* const parent = nextParent.mParent;
if (parent) {
parent->CloseAndDelete();
}
} }
data->mNextParents.Clear();
nsID destinationUUID = data->mDestinationUUID; nsID destinationUUID = data->mDestinationUUID;