summaryrefslogtreecommitdiffstats
path: root/skia/ext/platform_canvas_unittest.cc
diff options
context:
space:
mode:
authormtklein <mtklein@chromium.org>2015-02-20 09:05:22 -0800
committerCommit bot <commit-bot@chromium.org>2015-02-20 17:06:14 +0000
commita880fc0fc068d6da6e1ee1628827ffdd480de342 (patch)
treeb96a38cfbf19537f17f4fcc0b605dc0d93342c64 /skia/ext/platform_canvas_unittest.cc
parent1b2552acec5513c6974460d5e7ced2f80e5f94e8 (diff)
downloadchromium_src-a880fc0fc068d6da6e1ee1628827ffdd480de342.zip
chromium_src-a880fc0fc068d6da6e1ee1628827ffdd480de342.tar.gz
chromium_src-a880fc0fc068d6da6e1ee1628827ffdd480de342.tar.bz2
SkPixelRef::isLocked() is becoming debug-only.
(It rarely, if ever, makes sense to call isLocked() unless you've already locked the thing. We're keeping it only as a concession for asserts.) BUG= Review URL: https://codereview.chromium.org/924943008 Cr-Commit-Position: refs/heads/master@{#317339}
Diffstat (limited to 'skia/ext/platform_canvas_unittest.cc')
-rw-r--r--skia/ext/platform_canvas_unittest.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/skia/ext/platform_canvas_unittest.cc b/skia/ext/platform_canvas_unittest.cc
index 9ab5667..530d722 100644
--- a/skia/ext/platform_canvas_unittest.cc
+++ b/skia/ext/platform_canvas_unittest.cc
@@ -418,7 +418,9 @@ TEST(PlatformBitmapTest, PlatformBitmap) {
EXPECT_EQ(kN32_SkColorType, // Same for all platforms.
platform_bitmap->GetBitmap().colorType());
EXPECT_TRUE(platform_bitmap->GetBitmap().lockPixelsAreWritable());
+#if defined(SK_DEBUG)
EXPECT_TRUE(platform_bitmap->GetBitmap().pixelRef()->isLocked());
+#endif
EXPECT_TRUE(platform_bitmap->GetBitmap().pixelRef()->unique());
*(platform_bitmap->GetBitmap().getAddr32(10, 20)) = 0xDEED1020;