Make GrVkStencilAttachment derive form GrVkImage

src/gpu/vk/GrVkStencilAttachment.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrVkStencilAttachment.h"
 #include "GrVkGpu.h"
 #include "GrVkImage.h"
 #include "GrVkImageView.h"
 #include "GrVkUtil.h"
 
 #define VK_CALL(GPU, X) GR_VK_CALL(GPU->vkInterface(), X)
 
 GrVkStencilAttachment::GrVkStencilAttachment(GrVkGpu* gpu,
                                              GrGpuResource::LifeCycle lifeCycle,
                                              const Format& format,
                                              const GrVkImage::ImageDesc& desc,
                                              const GrVkImage::Resource* imageResource,
                                              const GrVkImageView* stencilView)
-    : INHERITED(gpu, lifeCycle, desc.fWidth, desc.fHeight, format.fStencilBits, desc.fSamples)
+    : GrStencilAttachment(gpu, lifeCycle, desc.fWidth, desc.fHeight,
+                          format.fStencilBits, desc.fSamples)
+    , GrVkImage(imageResource)
     , fFormat(format)
-    , fImageResource(imageResource)
     , fStencilView(stencilView) {
     this->registerWithCache();
-    imageResource->ref();
     stencilView->ref();
 }
 
 GrVkStencilAttachment* GrVkStencilAttachment::Create(GrVkGpu* gpu,
                                                      GrGpuResource::LifeCycle lifeCycle,
                                                      int width,
                                                      int height,
                                                      int sampleCnt,
                                                      const Format& format) {
     GrVkImage::ImageDesc imageDesc;
@@ skipping 23 matching lines @@
     GrVkStencilAttachment* stencil = new GrVkStencilAttachment(gpu, lifeCycle, format, imageDesc,
                                                                imageResource, imageView);
     imageResource->unref(gpu);
     imageView->unref(gpu);
     
     return stencil;
 }
 
 GrVkStencilAttachment::~GrVkStencilAttachment() {
     // should have been released or abandoned first
-    SkASSERT(!fImageResource);
     SkASSERT(!fStencilView);
 }
 
 size_t GrVkStencilAttachment::onGpuMemorySize() const {
     uint64_t size = this->width();
     size *= this->height();
     size *= fFormat.fTotalBits;
     size *= SkTMax(1,this->numSamples());
     return static_cast<size_t>(size / 8);
 }
 
 void GrVkStencilAttachment::onRelease() {
     GrVkGpu* gpu = this->getVkGpu();
 
-    fImageResource->unref(gpu);
-    fImageResource = nullptr;
+    this->releaseImage(gpu);
 
     fStencilView->unref(gpu);
     fStencilView = nullptr;
-    INHERITED::onRelease();
+    GrStencilAttachment::onRelease();
 }
 
 void GrVkStencilAttachment::onAbandon() {
-    fImageResource->unrefAndAbandon();
-    fImageResource = nullptr;
+    this->abandonImage();
     fStencilView->unrefAndAbandon();
     fStencilView = nullptr;
-    INHERITED::onAbandon();
+    GrStencilAttachment::onAbandon();
 }
 
 GrVkGpu* GrVkStencilAttachment::getVkGpu() const {
     SkASSERT(!this->wasDestroyed());
     return static_cast<GrVkGpu*>(this->getGpu());
 }