diff options
| author |  robertphillips <robertphillips@google.com> | 2016-07-21 07:17:54 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-07-21 07:17:54 -0700 |
| commit | 1f3923e4e5bf9afb9e52a15ced30e3854af73f7b (patch) | |
| tree | b3d9484a73598754f40e74b67971f49e32b44a23 /src/gpu/SkGpuDevice.h | |
| parent | afbf71dd924c7bb46ccdac49e7408b4b088563ff (diff) | |
Deprecate SkDevice::accessBitmap method
Relies on https://codereview.chromium.org/2162423003/ (Add SK_SUPPORT_LEGACY_ACCESSBITMAP Skia guard) landing in Chromium first.
Calved off: https://codereview.chromium.org/2163323002/ (Add desired width & height to drawContext (as opposed to using the width & height of the RT))
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2168483003
Review-Url: https://codereview.chromium.org/2168483003
Diffstat (limited to 'src/gpu/SkGpuDevice.h')
| -rw-r--r-- | src/gpu/SkGpuDevice.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/gpu/SkGpuDevice.h b/src/gpu/SkGpuDevice.h index 0b1e6a3cd9..d341b39ed6 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, + 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 { |