Bug 1366502 - Rename mImageClientTypeContainer into mImageClientContainerType. r=sotaro

MozReview-Commit-ID: LcSHVkBbM6G

gfx/layers/wr/WebRenderImageLayer.cpp

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

gfx/layers/wr/WebRenderImageLayer.h

@@ -43,7 +43,7 @@ protected:
   wr::MaybeExternalImageId mExternalImageId;
   Maybe<wr::ImageKey> mKey;
   RefPtr<ImageClient> mImageClient;
-  CompositableType mImageClientTypeContainer;
+  CompositableType mImageClientContainerType;
   Maybe<wr::PipelineId> mPipelineId;
 };