Bug 1366502 - Rename mImageClientTypeContainer into mImageClientContainerType. r=sotaro
authorJerryShih <hshih@mozilla.com>
Wed, 07 Jun 2017 23:44:03 +0800
changeset 410830 fcf47ea8ae7bea4575b6dd5133e88ea806b9e693
parent 410829 51c81beac6aa43f61b67adc5bc0692476759246f
child 410831 a03ce839ba8f11d0274f9e14fe17881db4559a28
push id7391
push usermtabara@mozilla.com
push dateMon, 12 Jun 2017 13:08:53 +0000
treeherdermozilla-beta@2191d7f87e2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssotaro
bugs1366502
milestone55.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1366502 - Rename mImageClientTypeContainer into mImageClientContainerType. r=sotaro MozReview-Commit-ID: LcSHVkBbM6G
gfx/layers/wr/WebRenderImageLayer.cpp
gfx/layers/wr/WebRenderImageLayer.h
--- a/gfx/layers/wr/WebRenderImageLayer.cpp
+++ b/gfx/layers/wr/WebRenderImageLayer.cpp
@@ -19,17 +19,17 @@
 
 namespace mozilla {
 namespace layers {
 
 using namespace gfx;
 
 WebRenderImageLayer::WebRenderImageLayer(WebRenderLayerManager* aLayerManager)
   : ImageLayer(aLayerManager, static_cast<WebRenderLayer*>(this))
-  , mImageClientTypeContainer(CompositableType::UNKNOWN)
+  , mImageClientContainerType(CompositableType::UNKNOWN)
 {
   MOZ_COUNT_CTOR(WebRenderImageLayer);
 }
 
 WebRenderImageLayer::~WebRenderImageLayer()
 {
   MOZ_COUNT_DTOR(WebRenderImageLayer);
 
@@ -43,30 +43,30 @@ WebRenderImageLayer::~WebRenderImageLaye
   if (mPipelineId.isSome()) {
     WrBridge()->RemovePipelineIdForAsyncCompositable(mPipelineId.ref());
   }
 }
 
 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>
 WebRenderImageLayer::GetAsSourceSurface()
 {
   if (!mContainer) {
     return nullptr;
   }
--- a/gfx/layers/wr/WebRenderImageLayer.h
+++ b/gfx/layers/wr/WebRenderImageLayer.h
@@ -38,16 +38,16 @@ public:
 protected:
   CompositableType GetImageClientType();
 
   void AddWRVideoImage(size_t aChannelNumber);
 
   wr::MaybeExternalImageId mExternalImageId;
   Maybe<wr::ImageKey> mKey;
   RefPtr<ImageClient> mImageClient;
-  CompositableType mImageClientTypeContainer;
+  CompositableType mImageClientContainerType;
   Maybe<wr::PipelineId> mPipelineId;
 };
 
 } // namespace layers
 } // namespace mozilla
 
 #endif // GFX_WEBRENDERIMAGELAYER_H