Commit 0cde7ece authored by Daniel Holbert's avatar Daniel Holbert
Browse files

Bug 1896711 part 5: Use MakeRefPtr/MakeAndAddRef to reduce boilerplate, in layout/style. r=TYLin 

Differential Revision: https://phabricator.services.mozilla.com/D210390
parent b4511d30

layout/style/CSSStyleRule.cpp

+2 −2
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ already_AddRefed<StyleLockedCssRules> CSSStyleRule::GetOrCreateRawRules() { 


void CSSStyleRuleDeclaration::SetRawAfterClone(

    RefPtr<StyleLockedDeclarationBlock> aRaw) {

  RefPtr<DeclarationBlock> block = new DeclarationBlock(aRaw.forget());

  auto block = MakeRefPtr<DeclarationBlock>(aRaw.forget());

  mDecls->SetOwningRule(nullptr);

  mDecls = std::move(block);

  mDecls->SetOwningRule(Rule());
@@ -317,7 +317,7 @@ already_AddRefed<nsINodeList> CSSStyleRule::QuerySelectorAll(nsINode& aRoot) { 
  CollectStyleRules(*this, /* aDesugared = */ true, rules);

  StyleSelectorList* list = Servo_StyleRule_GetSelectorList(&rules);



  RefPtr<nsSimpleContentList> contentList = new nsSimpleContentList(&aRoot);

  auto contentList = MakeRefPtr<nsSimpleContentList>(&aRoot);

  Servo_SelectorList_QueryAll(&aRoot, list, contentList.get(),

                              /* useInvalidation */ false);

  Servo_SelectorList_Drop(list);

layout/style/FontFaceImpl.cpp

+2 −2
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ static FontFaceLoadStatus LoadStateToStatus( 
already_AddRefed<FontFaceImpl> FontFaceImpl::CreateForRule(

    FontFace* aOwner, FontFaceSetImpl* aFontFaceSet,

    StyleLockedFontFaceRule* aRule) {

  RefPtr<FontFaceImpl> obj = new FontFaceImpl(aOwner, aFontFaceSet);

  auto obj = MakeRefPtr<FontFaceImpl>(aOwner, aFontFaceSet);

  obj->mRule = aRule;

  obj->mSourceType = eSourceType_FontFaceRule;

  obj->mInFontFaceSet = true;
@@ -723,7 +723,7 @@ gfxCharacterMap* FontFaceImpl::GetUnicodeRangeAsCharacterMap() { 


  Span<const StyleUnicodeRange> ranges(rangesPtr, len);

  if (!ranges.IsEmpty()) {

    RefPtr<gfxCharacterMap> charMap = new gfxCharacterMap();

    auto charMap = MakeRefPtr<gfxCharacterMap>();

    for (auto& range : ranges) {

      charMap->SetRange(range.start, range.end);

    }

layout/style/FontFaceSetDocumentImpl.cpp

+2 −2
Original line number Diff line number Diff line
@@ -131,8 +131,8 @@ void FontFaceSetDocumentImpl::DispatchToOwningThread( 
    std::function<void()> mFunc;

  };



  RefPtr<FontFaceSetDocumentRunnable> runnable =

      new FontFaceSetDocumentRunnable(aName, std::move(aFunc));

  auto runnable =

      MakeRefPtr<FontFaceSetDocumentRunnable>(aName, std::move(aFunc));

  NS_DispatchToMainThread(runnable.forget());

}

layout/style/FontFaceSetWorkerImpl.cpp

+4 −4
Original line number Diff line number Diff line
@@ -193,8 +193,8 @@ void FontFaceSetWorkerImpl::DispatchToOwningThread( 
    std::function<void()> mFunc;

  };



  RefPtr<FontFaceSetWorkerRunnable> runnable =

      new FontFaceSetWorkerRunnable(workerPrivate, std::move(aFunc));

  auto runnable =

      MakeRefPtr<FontFaceSetWorkerRunnable>(workerPrivate, std::move(aFunc));

  runnable->Dispatch(workerPrivate);

}
@@ -262,8 +262,8 @@ nsresult FontFaceSetWorkerImpl::StartLoad(gfxUserFontEntry* aUserFontEntry, 
      mWorkerRef->Private(), loadGroup, nullptr);

  NS_ENSURE_SUCCESS(rv, rv);



  RefPtr<nsFontFaceLoader> fontLoader =

      new nsFontFaceLoader(aUserFontEntry, aSrcIndex, this, channel);

  auto fontLoader =

      MakeRefPtr<nsFontFaceLoader>(aUserFontEntry, aSrcIndex, this, channel);



  if (LOG_ENABLED()) {

    nsCOMPtr<nsIURI> referrer =

layout/style/GeckoBindings.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1372,7 +1372,7 @@ static already_AddRefed<StyleSheet> LoadImportSheet( 
  MOZ_ASSERT(aLoader, "Should've catched this before");

  MOZ_ASSERT(aParent, "Only used for @import, so parent should exist!");



  RefPtr<MediaList> media = new MediaList(std::move(aMediaList));

  auto media = MakeRefPtr<MediaList>(std::move(aMediaList));

  nsCOMPtr<nsIURI> uri = aURL.GetURI();

  nsresult rv = uri ? NS_OK : NS_ERROR_FAILURE;