Rename SkSpecialImage::getBitmap to getBitmapDeprecated

src/core/SkSpecialImage.cpp

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file
  */
 
 #include "SkCanvas.h"
 #include "SkImage_Base.h"
 #include "SkSpecialImage.h"
 #include "SkSpecialSurface.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 class SkSpecialImage_Base : public SkSpecialImage {
 public:
     SkSpecialImage_Base(SkImageFilter::Proxy* proxy, const SkIRect& subset, uint32_t uniqueID)
         : INHERITED(proxy, subset, uniqueID) {
     }
     virtual ~SkSpecialImage_Base() { }
 
     virtual void onDraw(SkCanvas*, SkScalar x, SkScalar y, const SkPaint*) const = 0;
 
     virtual bool testingOnlyOnPeekPixels(SkPixmap*) const { return false; }
 
     virtual GrTexture* onPeekTexture() const { return nullptr; }
 
     virtual bool testingOnlyOnGetROPixels(SkBitmap*) const = 0;
 
     // Delete this entry point ASAP (see skbug.com/4965)
-    virtual bool getBitmap(SkBitmap* result) const = 0;
+    virtual bool getBitmapDeprecated(SkBitmap* result) const = 0;
 
     virtual SkSpecialSurface* onNewSurface(const SkImageInfo& info) const { return nullptr; }
 
 private:
     typedef SkSpecialImage INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 static inline const SkSpecialImage_Base* as_SIB(const SkSpecialImage* image) {
     return static_cast<const SkSpecialImage_Base*>(image);
@@ skipping 34 matching lines @@
                                           src.getTexture());
     }
 
     return SkSpecialImage::NewFromRaster(proxy, src.bounds(), src);
 }
 
 bool SkSpecialImage::internal_getBM(SkBitmap* result) {
     const SkSpecialImage_Base* ib = as_SIB(this);
 
     // TODO: need to test offset case! (see skbug.com/4967)
-    return ib->getBitmap(result);
+    return ib->getBitmapDeprecated(result);
 }
 
 SkImageFilter::Proxy* SkSpecialImage::internal_getProxy() {
     SkASSERT(fProxy);
     return fProxy;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 #include "SkImage.h"
 #if SK_SUPPORT_GPU
@@ skipping 34 matching lines @@
         canvas->drawImageRect(fImage, this->subset(),
                               dst, paint, SkCanvas::kStrict_SrcRectConstraint);
     }
 
     bool testingOnlyOnPeekPixels(SkPixmap* pixmap) const override {
         return fImage->peekPixels(pixmap);
     }
 
     GrTexture* onPeekTexture() const override { return as_IB(fImage.get())->peekTexture(); }
 
-    bool getBitmap(SkBitmap* result) const override {
+    bool getBitmapDeprecated(SkBitmap* result) const override {
         return false;
     }
 
     bool testingOnlyOnGetROPixels(SkBitmap* result) const override {
         return false;
     }
 
     SkSpecialSurface* onNewSurface(const SkImageInfo& info) const override {
 #if SK_SUPPORT_GPU
         GrTexture* texture = as_IB(fImage.get())->peekTexture();
@@ skipping 71 matching lines @@
         const void* pixels = fBitmap.getPixels();
         if (pixels) {
             if (pixmap) {
                 pixmap->reset(info, pixels, fBitmap.rowBytes());
             }
             return true;
         }
         return false;
     }
 
-    bool getBitmap(SkBitmap* result) const override {
+    bool getBitmapDeprecated(SkBitmap* result) const override {
         *result = fBitmap;
         return true;
     }
 
     bool testingOnlyOnGetROPixels(SkBitmap* result) const override {
         *result = fBitmap;
         return true;
     }
 
     SkSpecialSurface* onNewSurface(const SkImageInfo& info) const override {
@@ skipping 43 matching lines @@
 
         GrWrapTextureInBitmap(fTexture,
                               fTexture->width(), fTexture->height(), this->isOpaque(), &bm);
 
         canvas->drawBitmapRect(bm, this->subset(),
                                dst, paint, SkCanvas::kStrict_SrcRectConstraint);
     }
 
     GrTexture* onPeekTexture() const override { return fTexture; }
 
-    bool getBitmap(SkBitmap* result) const override {
+    bool getBitmapDeprecated(SkBitmap* result) const override {
         const SkImageInfo info = GrMakeInfoFromTexture(fTexture, 
                                                        this->width(), this->height(),
                                                        this->isOpaque());
         if (!result->setInfo(info)) {
             return false;
         }
 
         result->setPixelRef(new SkGrPixelRef(info, fTexture))->unref();
         return true;
     }
@@ skipping 44 matching lines @@
 
 SkSpecialImage* SkSpecialImage::NewFromGpu(SkImageFilter::Proxy* proxy,
                                            const SkIRect& subset,
                                            uint32_t uniqueID,
                                            GrTexture* tex,
                                            SkAlphaType at) {
     return nullptr;
 }
 
 #endif