mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-11 04:15:43 +00:00
Bug 1366502 - Rename mImageClientTypeContainer into mImageClientContainerType. r=sotaro
MozReview-Commit-ID: LcSHVkBbM6G
This commit is contained in:
parent
903f23a407
commit
8ed95790fb
@ -24,7 +24,7 @@ using namespace gfx;
|
||||
|
||||
WebRenderImageLayer::WebRenderImageLayer(WebRenderLayerManager* aLayerManager)
|
||||
: ImageLayer(aLayerManager, static_cast<WebRenderLayer*>(this))
|
||||
, mImageClientTypeContainer(CompositableType::UNKNOWN)
|
||||
, mImageClientContainerType(CompositableType::UNKNOWN)
|
||||
{
|
||||
MOZ_COUNT_CTOR(WebRenderImageLayer);
|
||||
}
|
||||
@ -48,20 +48,20 @@ WebRenderImageLayer::~WebRenderImageLayer()
|
||||
CompositableType
|
||||
WebRenderImageLayer::GetImageClientType()
|
||||
{
|
||||
if (mImageClientTypeContainer != CompositableType::UNKNOWN) {
|
||||
return mImageClientTypeContainer;
|
||||
if (mImageClientContainerType != CompositableType::UNKNOWN) {
|
||||
return mImageClientContainerType;
|
||||
}
|
||||
|
||||
if (mContainer->IsAsync()) {
|
||||
mImageClientTypeContainer = CompositableType::IMAGE_BRIDGE;
|
||||
return mImageClientTypeContainer;
|
||||
mImageClientContainerType = CompositableType::IMAGE_BRIDGE;
|
||||
return mImageClientContainerType;
|
||||
}
|
||||
|
||||
AutoLockImage autoLock(mContainer);
|
||||
|
||||
mImageClientTypeContainer = autoLock.HasImage()
|
||||
mImageClientContainerType = autoLock.HasImage()
|
||||
? CompositableType::IMAGE : CompositableType::UNKNOWN;
|
||||
return mImageClientTypeContainer;
|
||||
return mImageClientContainerType;
|
||||
}
|
||||
|
||||
already_AddRefed<gfx::SourceSurface>
|
||||
|
@ -43,7 +43,7 @@ protected:
|
||||
wr::MaybeExternalImageId mExternalImageId;
|
||||
Maybe<wr::ImageKey> mKey;
|
||||
RefPtr<ImageClient> mImageClient;
|
||||
CompositableType mImageClientTypeContainer;
|
||||
CompositableType mImageClientContainerType;
|
||||
Maybe<wr::PipelineId> mPipelineId;
|
||||
};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user