Commit e591e32a authored by Simon Giesecke's avatar Simon Giesecke
Browse files

Bug 1675868 - Store weak pointer to next parents. r=asuth, a=RyanVM 

Differential Revision: https://phabricator.services.mozilla.com/D99662
parent d1f76f8f

dom/messagechannel/MessagePortParent.h

+2 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#ifndef mozilla_dom_MessagePortParent_h

#define mozilla_dom_MessagePortParent_h



#include "mozilla/WeakPtr.h"

#include "mozilla/dom/PMessagePortParent.h"

#include "mozilla/dom/quota/CheckedUnsafePtr.h"
@@ -17,6 +18,7 @@ class MessagePortService; 


class MessagePortParent final

    : public PMessagePortParent,

      public SupportsWeakPtr,

      public SupportsCheckedUnsafePtr<CheckIf<DiagnosticAssertEnabled>> {

  friend class PMessagePortParent;

dom/messagechannel/MessagePortService.cpp

+8 −14
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include "mozilla/ipc/BackgroundParent.h"

#include "mozilla/StaticPtr.h"

#include "mozilla/Unused.h"

#include "mozilla/WeakPtr.h"

#include "nsTArray.h"



using mozilla::ipc::AssertIsOnBackgroundThread;
@@ -31,18 +32,12 @@ void AssertIsInMainProcess() { 
struct MessagePortService::NextParent {

  uint32_t mSequenceID;

  // MessagePortParent keeps the service alive, and we don't want a cycle.

  CheckedUnsafePtr<MessagePortParent> mParent;

  WeakPtr<MessagePortParent> mParent;

};



}  // namespace dom

}  // namespace mozilla



// Need to call CheckedUnsafePtr's copy constructor and destructor when

// resizing dynamic arrays containing NextParent (by calling NextParent's

// implicit copy constructor/destructor rather than memmove-ing NextParents).

MOZ_DECLARE_RELOCATE_USING_MOVE_CONSTRUCTOR(

    mozilla::dom::MessagePortService::NextParent);



namespace mozilla {

namespace dom {
@@ -280,14 +275,13 @@ void MessagePortService::CloseAll(const nsID& aUUID, bool aForced) { 
    data->mParent = nullptr;

  }



  for (auto& nextParent : data->mNextParents) {

    // CloseAndDelete may delete the pointee, so ensure no CheckedUnsafePtrs

    // exist when that happens.

    MessagePortParent* parent = nextParent.mParent;

    nextParent.mParent = nullptr;



  for (const auto& nextParent : data->mNextParents) {

    MessagePortParent* const parent = nextParent.mParent;

    if (parent) {

      parent->CloseAndDelete();

    }

  }

  data->mNextParents.Clear();



  nsID destinationUUID = data->mDestinationUUID;