Commit 0c0337bf authored by Nika Layzell's avatar Nika Layzell
Browse files

Bug 1401379 - Part 5: Don't check for a docshell to determine if a window is alive, r=smaug 

MozReview-Commit-ID: 8Ze3KrgpaTQ
parent f4dfb6a9

dom/base/nsCCUncollectableMarker.cpp

+1 −1
Original line number Diff line number Diff line
@@ -508,7 +508,7 @@ mozilla::dom::TraceBlackJS(JSTracer* aTrc, uint32_t aGCNumber, bool aIsShutdownG 
  if (windowsById) {

    for (auto iter = windowsById->Iter(); !iter.Done(); iter.Next()) {

      nsGlobalWindow* window = iter.Data();

      if (window->GetDocShell() && window->IsOuterWindow()) {

      if (!window->IsCleanedUp() && window->IsOuterWindow()) {

        window->TraceGlobalJSObject(aTrc);

        EventListenerManager* elm = window->GetExistingListenerManager();

        if (elm) {

dom/base/nsGlobalWindow.h

+6 −0
Original line number Diff line number Diff line
@@ -669,6 +669,12 @@ public: 
            mCleanedUp);

  }



  bool

  IsCleanedUp() const

  {

    return mCleanedUp;

  }



  bool

  HadOriginalOpener() const

  {