commit 1434ce1aa94da1944056332e3287a320b8408144
author Mike Reed <reed@google.com> Sun Jul 12 13:14:10 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Sun Jul 12 17:48:59 2020 +0000
tree b1fbe00015332c1cb17f2a30e0ce8e7653cc9b88
parent ed15b1c39b8be9bf60197baf7819602aacd06679

Can we remove volatile from skbitmap?

Change-Id: I0faa324b91f2c291be56f5126361ffe7fd54eb65
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/302037
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>

src/gpu/GrBitmapTextureMaker.cpp

diff --git a/src/gpu/GrBitmapTextureMaker.cpp b/src/gpu/GrBitmapTextureMaker.cpp
index 795562b..566621d 100644
--- a/src/gpu/GrBitmapTextureMaker.cpp
+++ b/src/gpu/GrBitmapTextureMaker.cpp
@@ -46,7 +46,7 @@
         , fBudgeted(cachePolicy == GrImageTexGenPolicy::kNew_Uncached_Unbudgeted
                             ? SkBudgeted::kNo
                             : SkBudgeted::kYes) {
-    if (!bitmap.isVolatile() && cachePolicy == GrImageTexGenPolicy::kDraw) {
+    if (/*!bitmap.isVolatile() && */ cachePolicy == GrImageTexGenPolicy::kDraw) {
         SkIPoint origin = bitmap.pixelRefOrigin();
         SkIRect subset = SkIRect::MakeXYWH(origin.fX, origin.fY, bitmap.width(),
                                            bitmap.height());