hide lockpixels api behind flag

guarded by SK_SUPPORT_OBSOLETE_LOCKPIXELS

needs https://codereview.chromium.org/2820873002/# to land first
Bug: skia:6481
Change-Id: I1c39902cbf6fe99f622adfa8192733b95f7fea09

Change-Id: I1c39902cbf6fe99f622adfa8192733b95f7fea09
Reviewed-on: https://skia-review.googlesource.com/13580
Reviewed-by: Florin Malita <fmalita@chromium.org>
Reviewed-by: Leon Scroggins <scroggo@google.com>
Commit-Queue: Mike Reed <reed@google.com>

5 files changed, 0 insertions, 10 deletions

diff --git a/tools/debugger/SkDrawCommand.cpp b/tools/debugger/SkDrawCommand.cpp
index 691a4f8012..e386f46f22 100644
--- a/tools/debugger/SkDrawCommand.cpp
+++ b/tools/debugger/SkDrawCommand.cpp
@@ -889,9 +889,7 @@ static sk_sp<SkImage> load_image(const Json::Value& jsonImage, UrlDataManager& u
 
 bool SkDrawCommand::flatten(const SkBitmap& bitmap, Json::Value* target,
                             UrlDataManager& urlDataManager) {
-    bitmap.lockPixels();
     sk_sp<SkImage> image(SkImage::MakeFromBitmap(bitmap));
-    bitmap.unlockPixels();
     (*target)[SKDEBUGCANVAS_ATTRIBUTE_COLOR] = Json::Value(color_type_name(bitmap.colorType()));
     (*target)[SKDEBUGCANVAS_ATTRIBUTE_ALPHA] = Json::Value(alpha_type_name(bitmap.alphaType()));
     bool success = flatten(*image, target, urlDataManager);
diff --git a/tools/picture_utils.cpp b/tools/picture_utils.cpp
index b0fd224a94..27e91ccdeb 100644
--- a/tools/picture_utils.cpp
+++ b/tools/picture_utils.cpp
@@ -26,7 +26,6 @@ namespace sk_tools {
             return;
         }
 
-        SkAutoLockPixels lock(bitmap);
         for (int y = 0; y < bitmap.height(); y++) {
             for (int x = 0; x < bitmap.width(); x++) {
                 *bitmap.getAddr32(x, y) |= (SK_A32_MASK << SK_A32_SHIFT);
@@ -87,7 +86,6 @@ namespace sk_tools {
             bitmap.colorSpace() == srgbColorSpace.get()) {
             // These are premul sRGB 8-bit pixels in SkPMColor order.
             // We want unpremul sRGB 8-bit pixels in RGBA order.  We'll get there via floats.
-            bitmap.lockPixels();
             auto px = (const uint32_t*)bitmap.getPixels();
             if (!px) {
                 return nullptr;
@@ -105,7 +103,6 @@ namespace sk_tools {
         } else if (bitmap.colorType() == kRGBA_F16_SkColorType) {
             // These are premul linear half-float pixels in RGBA order.
             // We want unpremul sRGB 8-bit pixels in RGBA order.  We'll get there via floats.
-            bitmap.lockPixels();
             auto px = (const uint64_t*)bitmap.getPixels();
             if (!px) {
                 return nullptr;
diff --git a/tools/sk_tool_utils.cpp b/tools/sk_tool_utils.cpp
index f8236bfa45..9a4bb2ba8c 100644
--- a/tools/sk_tool_utils.cpp
+++ b/tools/sk_tool_utils.cpp
@@ -225,8 +225,6 @@ void set_portable_typeface(SkPaint* paint, const char* name, SkFontStyle style)
 void write_pixels(SkCanvas* canvas, const SkBitmap& bitmap, int x, int y,
                   SkColorType colorType, SkAlphaType alphaType) {
     SkBitmap tmp(bitmap);
-    tmp.lockPixels();
-
     const SkImageInfo info = SkImageInfo::Make(tmp.width(), tmp.height(), colorType, alphaType);
 
     canvas->writePixels(info, tmp.getPixels(), tmp.rowBytes(), x, y);
diff --git a/tools/skdiff/skdiff.cpp b/tools/skdiff/skdiff.cpp
index ae6d72cd7a..c7ddf7dca5 100644
--- a/tools/skdiff/skdiff.cpp
+++ b/tools/skdiff/skdiff.cpp
@@ -163,8 +163,6 @@ void compute_diff(DiffRecord* dr, DiffMetricProc diffFunction, const int colorTh
         return;
     }
 
-    SkAutoLockPixels alpDiff(dr->fDifference.fBitmap);
-    SkAutoLockPixels alpWhite(dr->fWhite.fBitmap);
     int mismatchedPixels = 0;
     int totalMismatchA = 0;
     int totalMismatchR = 0;
diff --git a/tools/skdiff/skdiff_utils.cpp b/tools/skdiff/skdiff_utils.cpp
index f8eed908b7..05e1c50388 100644
--- a/tools/skdiff/skdiff_utils.cpp
+++ b/tools/skdiff/skdiff_utils.cpp
@@ -71,7 +71,6 @@ bool get_bitmap(sk_sp<SkData> fileBits, DiffResource& resource, bool sizeOnly) {
 
 /** Thanks to PNG, we need to force all pixels 100% opaque. */
 static void force_all_opaque(const SkBitmap& bitmap) {
-   SkAutoLockPixels lock(bitmap);
    for (int y = 0; y < bitmap.height(); y++) {
        for (int x = 0; x < bitmap.width(); x++) {
            *bitmap.getAddr32(x, y) |= (SK_A32_MASK << SK_A32_SHIFT);