Commit 80a760bb authored by Emilio Cobos Álvarez's avatar Emilio Cobos Álvarez
Browse files

Bug 1823686 - Unify ReferrerInfo::CreateFor{InternalCSS,SVG}Resources, since... 

Bug 1823686 - Unify ReferrerInfo::CreateFor{InternalCSS,SVG}Resources, since they're the same. r=smaug

Differential Revision: https://phabricator.services.mozilla.com/D173154
parent 5c659eb4

dom/base/Document.cpp

+2 −1
Original line number Diff line number Diff line
@@ -6657,7 +6657,8 @@ URLExtraData* Document::DefaultStyleAttrURLData() { 
      NS_FAILED(mCachedURLData->ReferrerInfo()->Equals(mCachedReferrerInfo,

                                                       &equals)) ||

      !equals) {

    mCachedReferrerInfo = ReferrerInfo::CreateForInternalCSSResources(this);

    mCachedReferrerInfo =

        ReferrerInfo::CreateForInternalCSSAndSVGResources(this);

    mCachedURLData = new URLExtraData(baseURI, mCachedReferrerInfo, principal);

  }

  return mCachedURLData;

dom/base/FragmentOrElement.cpp

+1 −1
Original line number Diff line number Diff line
@@ -344,7 +344,7 @@ already_AddRefed<URLExtraData> nsIContent::GetURLDataForStyleAttr( 
  if (aSubjectPrincipal && aSubjectPrincipal != NodePrincipal()) {

    // TODO: Cache this?

    nsCOMPtr<nsIReferrerInfo> referrerInfo =

        ReferrerInfo::CreateForInternalCSSResources(OwnerDoc());

        ReferrerInfo::CreateForInternalCSSAndSVGResources(OwnerDoc());

    return MakeAndAddRef<URLExtraData>(OwnerDoc()->GetDocBaseURI(),

                                       referrerInfo, aSubjectPrincipal);

  }

dom/base/nsAttrValue.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1758,7 +1758,7 @@ bool nsAttrValue::ParseStyleAttribute(const nsAString& aString, 
  }



  nsCOMPtr<nsIReferrerInfo> referrerInfo =

      dom::ReferrerInfo::CreateForInternalCSSResources(ownerDoc);

      dom::ReferrerInfo::CreateForInternalCSSAndSVGResources(ownerDoc);

  auto data = MakeRefPtr<URLExtraData>(baseURI, referrerInfo, principal);

  RefPtr<DeclarationBlock> decl = DeclarationBlock::FromCssText(

      aString, data, ownerDoc->GetCompatibilityMode(), ownerDoc->CSSLoader(),

dom/base/nsTreeSanitizer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1788,7 +1788,7 @@ static void SanitizeStyleSheet(const nsAString& aOriginal, 


  NS_ConvertUTF16toUTF8 style(aOriginal);

  RefPtr<nsIReferrerInfo> referrer =

      ReferrerInfo::CreateForInternalCSSResources(aDocument);

      ReferrerInfo::CreateForInternalCSSAndSVGResources(aDocument);

  auto extraData =

      MakeRefPtr<URLExtraData>(aBaseURI, referrer, aDocument->NodePrincipal());

  RefPtr<RawServoStyleSheetContents> contents =

dom/security/ReferrerInfo.cpp

+2 −14
Original line number Diff line number Diff line
@@ -1281,20 +1281,8 @@ already_AddRefed<nsIReferrerInfo> ReferrerInfo::CreateForExternalCSSResources( 
}



/* static */

already_AddRefed<nsIReferrerInfo> ReferrerInfo::CreateForInternalCSSResources(

    Document* aDocument) {

  MOZ_ASSERT(aDocument);

  nsCOMPtr<nsIReferrerInfo> referrerInfo;



  referrerInfo = new ReferrerInfo(aDocument->GetDocumentURI(),

                                  aDocument->GetReferrerPolicy());

  return referrerInfo.forget();

}



// Bug 1415044 to investigate which referrer and policy we should use

/* static */

already_AddRefed<nsIReferrerInfo> ReferrerInfo::CreateForSVGResources(

    Document* aDocument) {

already_AddRefed<nsIReferrerInfo>

ReferrerInfo::CreateForInternalCSSAndSVGResources(Document* aDocument) {

  MOZ_ASSERT(aDocument);

  nsCOMPtr<nsIReferrerInfo> referrerInfo;