Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-14 05:45:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1461940 - Rename two GetImageRequest() methods to ImageRequest(). r=emilio

Browse Source 
MozReview-Commit-ID: 3eA86IOSLta

--HG--
extra : rebase_source : 3ec406a9b14b394abb42cc6324d19e093fd991f8
This commit is contained in:
Xidorn Quan 2018-05-16 22:28:50 +10:00
parent 9cb5dba87a
commit d9091cf557
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
layout/style/ServoBindings.cpp
View File

@ -1672,7 +1672,7 @@ const nsStyleImageRequest*
Gecko_GetImageRequest(const nsStyleImage* aImage)
{
MOZ_ASSERT(aImage);
return aImage->GetImageRequest();
return aImage->ImageRequest();
}
nsAtom*

2
layout/style/nsStyleStruct.cpp
View File

@ -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 =

13
layout/style/nsStyleStruct.h
View File

@ -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)