From 4edb5d219eb99aa1e8fbe5e37260d3b34314e54b Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Mon, 17 Apr 2017 11:02:51 -0400 Subject: 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 Reviewed-by: Leon Scroggins Commit-Queue: Mike Reed --- bench/BitmapBench.cpp | 3 --- bench/GameBench.cpp | 2 -- bench/RepeatTileBench.cpp | 3 --- bench/TileBench.cpp | 1 - 4 files changed, 9 deletions(-) (limited to 'bench') diff --git a/bench/BitmapBench.cpp b/bench/BitmapBench.cpp index fdf17e90b1..2fd480bb7a 100644 --- a/bench/BitmapBench.cpp +++ b/bench/BitmapBench.cpp @@ -47,9 +47,6 @@ static void convertToIndex666(const SkBitmap& src, SkBitmap* dst, SkAlphaType aT dst->allocPixels(SkImageInfo::Make(src.width(), src.height(), kIndex_8_SkColorType, aType), SkColorTable::Make(storage, 216)); - SkAutoLockPixels alps(src); - SkAutoLockPixels alpd(*dst); - for (int y = 0; y < src.height(); y++) { const SkPMColor* srcP = src.getAddr32(0, y); uint8_t* dstP = dst->getAddr8(0, y); diff --git a/bench/GameBench.cpp b/bench/GameBench.cpp index bd7d11465d..dfd0aa1649 100644 --- a/bench/GameBench.cpp +++ b/bench/GameBench.cpp @@ -250,7 +250,6 @@ private: static int kCheckSize = 16; fCheckerboard.allocN32Pixels(kCheckerboardWidth, kCheckerboardHeight); - SkAutoLockPixels lock(fCheckerboard); for (int y = 0; y < kCheckerboardHeight; ++y) { int even = (y / kCheckSize) % 2; @@ -283,7 +282,6 @@ private: } fAtlas.allocN32Pixels(kTotAtlasWidth, kTotAtlasHeight); - SkAutoLockPixels lock(fAtlas); for (int y = 0; y < kTotAtlasHeight; ++y) { int colorY = y / (kAtlasCellHeight + kAtlasSpacer); diff --git a/bench/RepeatTileBench.cpp b/bench/RepeatTileBench.cpp index df58a14d10..550603143d 100644 --- a/bench/RepeatTileBench.cpp +++ b/bench/RepeatTileBench.cpp @@ -66,9 +66,6 @@ static void convert_to_index666(const SkBitmap& src, SkBitmap* dst) { kIndex_8_SkColorType, kOpaque_SkAlphaType), SkColorTable::Make(storage, 216)); - SkAutoLockPixels alps(src); - SkAutoLockPixels alpd(*dst); - for (int y = 0; y < src.height(); y++) { const SkPMColor* srcP = src.getAddr32(0, y); uint8_t* dstP = dst->getAddr8(0, y); diff --git a/bench/TileBench.cpp b/bench/TileBench.cpp index 3093016f72..cd2654611b 100644 --- a/bench/TileBench.cpp +++ b/bench/TileBench.cpp @@ -18,7 +18,6 @@ static void create_gradient(SkBitmap* bm) { float deltaB = 255.0f / height; float blue = 255.0f; - SkAutoLockPixels lock(*bm); for (int y = 0; y < height; y++) { *bm->getAddr32(0, y) = SkColorSetRGB(0, 0, (U8CPU) blue); blue -= deltaB; -- cgit v1.2.3