diff --git a/layout/style/ServoBindings.cpp b/layout/style/ServoBindings.cpp index e59a42c739c9..7b000454c468 100644 --- a/layout/style/ServoBindings.cpp +++ b/layout/style/ServoBindings.cpp @@ -1672,7 +1672,7 @@ const nsStyleImageRequest* Gecko_GetImageRequest(const nsStyleImage* aImage) { MOZ_ASSERT(aImage); - return aImage->GetImageRequest(); + return aImage->ImageRequest(); } nsAtom* diff --git a/layout/style/nsStyleStruct.cpp b/layout/style/nsStyleStruct.cpp index 9dc16bbb514e..45fb23c58586 100644 --- a/layout/style/nsStyleStruct.cpp +++ b/layout/style/nsStyleStruct.cpp @@ -3716,7 +3716,7 @@ nsStyleDisplay::FinishStyle( // ImageValue is created, in both Gecko and Stylo. That will // avoid doing a mutation here. if (shapeImage->GetType() == eStyleImageType_Image) { - shapeImage->GetImageRequest()->GetImageValue()->SetCORSMode( + shapeImage->ImageRequest()->GetImageValue()->SetCORSMode( CORSMode::CORS_ANONYMOUS); } const nsStyleImage* oldShapeImage = diff --git a/layout/style/nsStyleStruct.h b/layout/style/nsStyleStruct.h index ce8b08aa3d16..57cffd90989e 100644 --- a/layout/style/nsStyleStruct.h +++ b/layout/style/nsStyleStruct.h @@ -382,7 +382,7 @@ struct nsStyleImage if (mType == eStyleImageType_Image && !mImage->IsResolved()) { const nsStyleImageRequest* oldRequest = (aOldImage && aOldImage->GetType() == eStyleImageType_Image) - ? aOldImage->GetImageRequest() : nullptr; + ? aOldImage->ImageRequest() : nullptr; mImage->Resolve(aContext, oldRequest); } } @@ -390,20 +390,20 @@ struct nsStyleImage nsStyleImageType GetType() const { return mType; } - nsStyleImageRequest* GetImageRequest() const { + nsStyleImageRequest* ImageRequest() const { MOZ_ASSERT(mType == eStyleImageType_Image, "Data is not an image!"); MOZ_ASSERT(mImage); return mImage; } imgRequestProxy* GetImageData() const { - return GetImageRequest()->get(); + return ImageRequest()->get(); } nsStyleGradient* GetGradientData() const { NS_ASSERTION(mType == eStyleImageType_Gradient, "Data is not a gradient!"); return mGradient; } bool IsResolved() const { - return mType != eStyleImageType_Image || GetImageRequest()->IsResolved(); + return mType != eStyleImageType_Image || ImageRequest()->IsResolved(); } const nsAtom* GetElementId() const { NS_ASSERTION(mType == eStyleImageType_Element, "Data is not an element!"); @@ -2685,15 +2685,16 @@ public: return mContent.mCounters; } - nsStyleImageRequest* GetImageRequest() const + nsStyleImageRequest* ImageRequest() const { MOZ_ASSERT(mType == eStyleContentType_Image); + MOZ_ASSERT(mContent.mImage); return mContent.mImage; } imgRequestProxy* GetImage() const { - return GetImageRequest()->get(); + return ImageRequest()->get(); } void SetKeyword(nsStyleContentType aType)