Index: src/gpu/SkGpuDevice.h |
diff --git a/src/gpu/SkGpuDevice.h b/src/gpu/SkGpuDevice.h |
index 0b1e6a3cd9a32b2f92d63c2cb31be9655fdd7a78..d341b39ed6d26aca2cf135f050fd2ac7343d900a 100644 |
--- a/src/gpu/SkGpuDevice.h |
+++ b/src/gpu/SkGpuDevice.h |
@@ -81,7 +81,10 @@ public: |
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; |
@@ -141,7 +144,6 @@ public: |
void onAttachToCanvas(SkCanvas* canvas) override; |
void onDetachFromCanvas() override; |
- const SkBitmap& onAccessBitmap() override; |
bool onAccessPixels(SkPixmap*) override; |
// for debugging purposes only |
@@ -161,8 +163,7 @@ private: |
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 { |