Commit b5701b12 authored by Nika Layzell's avatar Nika Layzell
Browse files

Bug 1401379 - Part 2: Add more cycle collector edges for nsDocShell, r=smaug 

MozReview-Commit-ID: 3j9jfLv7MO2
parent a864cbc3

dom/base/nsContentSink.cpp

+2 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsContentSink) 
  }

  NS_IMPL_CYCLE_COLLECTION_UNLINK(mDocument)

  NS_IMPL_CYCLE_COLLECTION_UNLINK(mParser)

  NS_IMPL_CYCLE_COLLECTION_UNLINK(mDocShell)

  NS_IMPL_CYCLE_COLLECTION_UNLINK(mCSSLoader)

  NS_IMPL_CYCLE_COLLECTION_UNLINK(mNodeInfoManager)

  NS_IMPL_CYCLE_COLLECTION_UNLINK(mScriptLoader)
@@ -86,6 +87,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_END 
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsContentSink)

  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mDocument)

  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mParser)

  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mDocShell)

  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mCSSLoader)

  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mNodeInfoManager)

  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mScriptLoader)

dom/base/nsInProcessTabChildGlobal.cpp

+2 −0
Original line number Diff line number Diff line
@@ -143,6 +143,7 @@ NS_IMPL_CYCLE_COLLECTION_CLASS(nsInProcessTabChildGlobal) 
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(nsInProcessTabChildGlobal,

                                                  DOMEventTargetHelper)

   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mMessageManager)

   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mDocShell)

   tmp->TraverseHostObjectURIs(cb);

NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
@@ -154,6 +155,7 @@ NS_IMPL_CYCLE_COLLECTION_TRACE_END 
NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(nsInProcessTabChildGlobal,

                                                DOMEventTargetHelper)

  NS_IMPL_CYCLE_COLLECTION_UNLINK(mMessageManager)

  NS_IMPL_CYCLE_COLLECTION_UNLINK(mDocShell)

  tmp->nsMessageManagerScriptExecutor::Unlink();

  tmp->UnlinkHostObjectURIs();

NS_IMPL_CYCLE_COLLECTION_UNLINK_END

dom/canvas/CanvasRenderingContext2D.cpp

+2 −0
Original line number Diff line number Diff line
@@ -1019,6 +1019,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(CanvasRenderingContext2D) 
  // since we're logically destructed at this point.

  CanvasRenderingContext2D::RemoveDemotableContext(tmp);

  NS_IMPL_CYCLE_COLLECTION_UNLINK(mCanvasElement)

  NS_IMPL_CYCLE_COLLECTION_UNLINK(mDocShell)

  for (uint32_t i = 0; i < tmp->mStyleStack.Length(); i++) {

    ImplCycleCollectionUnlink(tmp->mStyleStack[i].patternStyles[Style::STROKE]);

    ImplCycleCollectionUnlink(tmp->mStyleStack[i].patternStyles[Style::FILL]);
@@ -1042,6 +1043,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_END 


NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(CanvasRenderingContext2D)

  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mCanvasElement)

  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mDocShell)

  for (uint32_t i = 0; i < tmp->mStyleStack.Length(); i++) {

    ImplCycleCollectionTraverse(cb, tmp->mStyleStack[i].patternStyles[Style::STROKE], "Stroke CanvasPattern");

    ImplCycleCollectionTraverse(cb, tmp->mStyleStack[i].patternStyles[Style::FILL], "Fill CanvasPattern");

editor/libeditor/HTMLEditor.cpp

+4 −0
Original line number Diff line number Diff line
@@ -195,6 +195,8 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(HTMLEditor, TextEditor) 
  NS_IMPL_CYCLE_COLLECTION_UNLINK(mStyleSheets)



  tmp->HideAnonymousEditingUIs();



  NS_IMPL_CYCLE_COLLECTION_UNLINK(mLinkHandler)

NS_IMPL_CYCLE_COLLECTION_UNLINK_END



NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(HTMLEditor, TextEditor)
@@ -228,6 +230,8 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(HTMLEditor, TextEditor) 
  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mAddRowBeforeButton)

  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mRemoveRowButton)

  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mAddRowAfterButton)



  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mLinkHandler)

NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END



NS_IMPL_ADDREF_INHERITED(HTMLEditor, EditorBase)