From 45a0e9e65a9b2687f300c64104e8711bb95a462b Mon Sep 17 00:00:00 2001
From: JerryShih <hshih@mozilla.com>
Date: Wed, 7 Jun 2017 23:44:03 +0800
Subject: [PATCH] Bug 1366502 - Rename mImageClientTypeContainer into
 mImageClientContainerType. r=sotaro

MozReview-Commit-ID: LcSHVkBbM6G
---
 gfx/layers/wr/WebRenderImageLayer.cpp | 14 +++++++-------
 gfx/layers/wr/WebRenderImageLayer.h   |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/gfx/layers/wr/WebRenderImageLayer.cpp b/gfx/layers/wr/WebRenderImageLayer.cpp
index a8c158798027..18f1e0fcb394 100644
--- a/gfx/layers/wr/WebRenderImageLayer.cpp
+++ b/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>
diff --git a/gfx/layers/wr/WebRenderImageLayer.h b/gfx/layers/wr/WebRenderImageLayer.h
index 5dfa51238447..343cea9d9f2d 100644
--- a/gfx/layers/wr/WebRenderImageLayer.h
+++ b/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;
 };