diff options
| author |  Cary Clark <caryclark@skia.org> | 2018-02-07 15:51:00 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-02-08 13:34:49 +0000 |
| commit | 4f5a79c676757c0f218156077fb0575d46a6583c (patch) | |
| tree | 476f8be1a88454c728d6928c4821d71cb82e2de4 /gm | |
| parent | 4150eea6c49ecec882a8d3e1c61d6a25fcd1e905 (diff) | |
remove kRW_LegacyBitmapMode
experiment to see if there are any unknown dependencies
on kRW_LegacyBitmapMode
R=reed@google.com,fmalita@chromium.org,bungeman@google.com
Bug: skia:5615
Change-Id: I2cc578570ac18cd31c3520e1bd801f4a7a669347
Reviewed-on: https://skia-review.googlesource.com/105283
Reviewed-by: Florin Malita <fmalita@chromium.org>
Reviewed-by: Mike Reed <reed@google.com>
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Cary Clark <caryclark@google.com>
Diffstat (limited to 'gm')
| -rw-r--r-- | gm/crosscontextimage.cpp | 2 | ||||
| -rw-r--r-- | gm/drawbitmaprect.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gm/crosscontextimage.cpp b/gm/crosscontextimage.cpp index 03203c498c..19760c45e4 100644 --- a/gm/crosscontextimage.cpp +++ b/gm/crosscontextimage.cpp @@ -30,7 +30,7 @@ DEF_SIMPLE_GM(cross_context_image, canvas, 512 * 3 + 60, 512 + 128 + 30) { SkBitmap bmp; SkPixmap pixmap; - SkAssertResult(encodedImage->asLegacyBitmap(&bmp, SkImage::kRO_LegacyBitmapMode) && + SkAssertResult(encodedImage->asLegacyBitmap(&bmp) && bmp.peekPixels(&pixmap)); sk_sp<SkImage> crossContextRaster = SkImage::MakeCrossContextFromPixmap( diff --git a/gm/drawbitmaprect.cpp b/gm/drawbitmaprect.cpp index 200a3971e8..6b5f6d9920 100644 --- a/gm/drawbitmaprect.cpp +++ b/gm/drawbitmaprect.cpp @@ -79,7 +79,7 @@ static sk_sp<SkImage> makebm(SkCanvas* origCanvas, SkBitmap* resultBM, int w, in SkBitmap tempBM; - image->asLegacyBitmap(&tempBM, SkImage::kRO_LegacyBitmapMode); + image->asLegacyBitmap(&tempBM); // Let backends know we won't change this, so they don't have to deep copy it defensively. tempBM.setImmutable(); |