Deprecate SkDevice::accessBitmap method

src/gpu/SkGpuDevice.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkGpuDevice.h"
 
 #include "GrBlurUtils.h"
@@ skipping 164 matching lines @@
 
     return sk_sp<SkGpuDevice>(new SkGpuDevice(std::move(drawContext),
                                               info.width(), info.height(), flags));
 }
 
 SkGpuDevice::SkGpuDevice(sk_sp<GrDrawContext> drawContext, int width, int height, unsigned flags) 
     : INHERITED(drawContext->surfaceProps())
     , fContext(SkRef(drawContext->accessRenderTarget()->getContext()))
     , fRenderTarget(drawContext->renderTarget())
     , fDrawContext(std::move(drawContext)) {
+    fSize.set(width, height);
     fOpaque = SkToBool(flags & kIsOpaque_Flag);
 
-    SkAlphaType at = fOpaque ? kOpaque_SkAlphaType : kPremul_SkAlphaType;
-    SkImageInfo info = fRenderTarget->surfacePriv().info(at).makeWH(width, height);
-    SkPixelRef* pr = new SkGrPixelRef(info, fRenderTarget.get());
-    fLegacyBitmap.setInfo(info);
-    fLegacyBitmap.setPixelRef(pr)->unref();
-
     if (flags & kNeedClear_Flag) {
         this->clearAll();
     }
 }
 
 sk_sp<GrDrawContext> SkGpuDevice::CreateDrawContext(GrContext* context,
                                                     SkBudgeted budgeted,
                                                     const SkImageInfo& origInfo,
                                                     int sampleCount,
                                                     const SkSurfaceProps* surfaceProps) {
@@ skipping 74 matching lines @@
     GrPixelConfig config = SkImageInfo2GrPixelConfig(info, *fContext->caps());
     if (kUnknown_GrPixelConfig == config) {
         return false;
     }
     uint32_t flags = 0;
     if (kUnpremul_SkAlphaType == info.alphaType()) {
         flags = GrContext::kUnpremul_PixelOpsFlag;
     }
     fRenderTarget->writePixels(x, y, info.width(), info.height(), config, pixels, rowBytes, flags);
 
-    // need to bump our genID for compatibility with clients that "know" we have a bitmap
-    fLegacyBitmap.notifyPixelsChanged();
-
     return true;
 }
 
-const SkBitmap& SkGpuDevice::onAccessBitmap() {
-    ASSERT_SINGLE_OWNER
-    return fLegacyBitmap;
-}
-
 bool SkGpuDevice::onAccessPixels(SkPixmap* pmap) {
     ASSERT_SINGLE_OWNER
-    // For compatibility with clients the know we're backed w/ a bitmap, and want to inspect its
-    // genID. When we can hide/remove that fact, we can eliminate this call to notify.
-    // ... ugh.
-    fLegacyBitmap.notifyPixelsChanged();
     return false;
 }
 
 void SkGpuDevice::onAttachToCanvas(SkCanvas* canvas) {
     ASSERT_SINGLE_OWNER
     INHERITED::onAttachToCanvas(canvas);
 
     // Canvas promises that this ptr is valid until onDetachFromCanvas is called
     fClipStack.reset(SkRef(canvas->getClipStack()));
 }
@@ skipping 49 matching lines @@
         }
         newDC->copySurface(fDrawContext->asTexture().get(),
                            SkIRect::MakeWH(this->width(), this->height()),
                            SkIPoint::Make(0, 0));
     }
 
     SkASSERT(fDrawContext->accessRenderTarget() != newDC->accessRenderTarget());
 
     fRenderTarget = newDC->renderTarget();
 
-#ifdef SK_DEBUG
-    SkImageInfo info = fRenderTarget->surfacePriv().info(fOpaque ? kOpaque_SkAlphaType :
-                                                                   kPremul_SkAlphaType);
-    SkASSERT(info == fLegacyBitmap.info());
-#endif
-    SkPixelRef* pr = new SkGrPixelRef(fLegacyBitmap.info(), fRenderTarget.get());
-    fLegacyBitmap.setPixelRef(pr)->unref();
-
     fDrawContext = newDC;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 void SkGpuDevice::drawPaint(const SkDraw& draw, const SkPaint& paint) {
     ASSERT_SINGLE_OWNER
     CHECK_SHOULD_DRAW(draw);
     GR_CREATE_TRACE_MARKER_CONTEXT("SkGpuDevice", "drawPaint", fContext);
 
@@ skipping 1500 matching lines @@
 }
 
 SkImageFilterCache* SkGpuDevice::getImageFilterCache() {
     ASSERT_SINGLE_OWNER
     // We always return a transient cache, so it is freed after each
     // filter traversal.
     return SkImageFilterCache::Create(kDefaultImageFilterCacheSize);
 }
 
 #endif