Deprecate SkDevice::accessBitmap method

src/gpu/SkGpuDevice.h

 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkGpuDevice_DEFINED
 #define SkGpuDevice_DEFINED
 
@@ skipping 63 matching lines @@
     GrContext* context() const override { return fContext; }
 
     // set all pixels to 0
     void clearAll();
 
     void replaceDrawContext(bool shouldRetainContent);
 
     GrDrawContext* accessDrawContext() override;
 
     SkImageInfo imageInfo() const override {
-        return fLegacyBitmap.info();
+        SkAlphaType at = fOpaque ? kOpaque_SkAlphaType : kPremul_SkAlphaType;
+        SkImageInfo info = fRenderTarget->surfacePriv().info(at).makeWH(fSize.fWidth, 

[reed1, 2016/07/21 14:13:59]

We could land this right-away, on its own, correct?

[robertphillips, 2016/07/21 14:16:51]

Acknowledged.

+                                                                        fSize.fHeight);
+        return info;
     }
 
     void drawPaint(const SkDraw&, const SkPaint& paint) override;
     virtual void drawPoints(const SkDraw&, SkCanvas::PointMode mode, size_t count,
                             const SkPoint[], const SkPaint& paint) override;
     virtual void drawRect(const SkDraw&, const SkRect& r,
                           const SkPaint& paint) override;
     virtual void drawRRect(const SkDraw&, const SkRRect& r,
                            const SkPaint& paint) override;
     virtual void drawDRRect(const SkDraw& draw, const SkRRect& outer,
@@ skipping 39 matching lines @@
                      int left, int top, const SkPaint& paint) override;
     sk_sp<SkSpecialImage> makeSpecial(const SkBitmap&) override;
     sk_sp<SkSpecialImage> makeSpecial(const SkImage*) override;
     sk_sp<SkSpecialImage> snapSpecial() override;
 
     void flush() override;
 
     void onAttachToCanvas(SkCanvas* canvas) override;
     void onDetachFromCanvas() override;
 
-    const SkBitmap& onAccessBitmap() override;
     bool onAccessPixels(SkPixmap*) override;
 
     // for debugging purposes only
     void drawTexture(GrTexture*, const SkRect& dst, const SkPaint&);
 
 protected:
     bool onReadPixels(const SkImageInfo&, void*, size_t, int, int) override;
     bool onWritePixels(const SkImageInfo&, const void*, size_t, int, int) override;
     bool onShouldDisableLCD(const SkPaint&) const final;
 
 private:
     // We want these unreffed in DrawContext, RenderTarget, GrContext order.
     SkAutoTUnref<GrContext>         fContext;
     sk_sp<GrRenderTarget>           fRenderTarget;
     sk_sp<GrDrawContext>            fDrawContext;
 
     SkAutoTUnref<const SkClipStack> fClipStack;
     SkIPoint                        fClipOrigin;
     GrClipStackClip                 fClip;
-    // remove when our clients don't rely on accessBitmap()
-    SkBitmap                        fLegacyBitmap;
+    SkISize                         fSize;
     bool                            fOpaque;
 
     enum Flags {
         kNeedClear_Flag = 1 << 0,  //!< Surface requires an initial clear
         kIsOpaque_Flag  = 1 << 1,  //!< Hint from client that rendering to this device will be
                                    //   opaque even if the config supports alpha.
     };
     static bool CheckAlphaTypeAndGetFlags(const SkImageInfo* info, InitContents init,
                                           unsigned* flags);
 
@@ skipping 92 matching lines @@
                                                   const SkImageInfo&,
                                                   int sampleCount,
                                                   const SkSurfaceProps*);
 
     friend class GrAtlasTextContext;
     friend class SkSurface_Gpu;      // for access to surfaceProps
     typedef SkBaseDevice INHERITED;
 };
 
 #endif