Chromium Code Reviews| Index: Source/platform/graphics/GraphicsContextTest.cpp |
| diff --git a/Source/platform/graphics/GraphicsContextTest.cpp b/Source/platform/graphics/GraphicsContextTest.cpp |
| index fe8b95e939a8b6b9ff9302c82b5914cec334658a..136a442936d3d093877e79b6df1431265472ec96 100644 |
| --- a/Source/platform/graphics/GraphicsContextTest.cpp |
| +++ b/Source/platform/graphics/GraphicsContextTest.cpp |
| @@ -786,7 +786,11 @@ TEST(GraphicsContextTest, trackOpaqueWritePixelsTest) |
| SkPaint paint; |
| paint.setXfermodeMode(SkXfermode::kSrc_Mode); |
| - context.writePixels(opaqueBitmap, 50, 50); |
| + { |
|
Stephen White
2014/10/16 21:48:33
Nit: maybe we should make writePixels a helper fun
f(malita)
2014/10/16 22:02:19
Thanks, done.
|
| + SkAutoLockPixels locker(opaqueBitmap); |
| + context.writePixels(opaqueBitmap.info(), opaqueBitmap.getPixels(), opaqueBitmap.rowBytes(), |
| + 50, 50); |
| + } |
| EXPECT_EQ_RECT(IntRect(50, 50, 10, 10), context.opaqueRegion().asRect()); |
| EXPECT_PIXELS_MATCH(bitmap, context.opaqueRegion().asRect()); |
| @@ -794,19 +798,35 @@ TEST(GraphicsContextTest, trackOpaqueWritePixelsTest) |
| EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), context.opaqueRegion().asRect()); |
| EXPECT_PIXELS_MATCH(bitmap, context.opaqueRegion().asRect()); |
| - context.writePixels(alphaBitmap, 10, 0); |
| + { |
| + SkAutoLockPixels locker(alphaBitmap); |
| + context.writePixels(alphaBitmap.info(), alphaBitmap.getPixels(), alphaBitmap.rowBytes(), |
| + 10, 0); |
| + } |
| EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), context.opaqueRegion().asRect()); |
| EXPECT_PIXELS_MATCH(bitmap, context.opaqueRegion().asRect()); |
| - context.writePixels(alphaBitmap, 10, 1); |
| + { |
| + SkAutoLockPixels locker(alphaBitmap); |
| + context.writePixels(alphaBitmap.info(), alphaBitmap.getPixels(), alphaBitmap.rowBytes(), |
| + 10, 1); |
| + } |
| EXPECT_EQ_RECT(IntRect(10, 11, 90, 89), context.opaqueRegion().asRect()); |
| EXPECT_PIXELS_MATCH(bitmap, context.opaqueRegion().asRect()); |
| - context.writePixels(alphaBitmap, 0, 10); |
| + { |
| + SkAutoLockPixels locker(alphaBitmap); |
| + context.writePixels(alphaBitmap.info(), alphaBitmap.getPixels(), alphaBitmap.rowBytes(), |
| + 0, 10); |
| + } |
| EXPECT_EQ_RECT(IntRect(10, 11, 90, 89), context.opaqueRegion().asRect()); |
| EXPECT_PIXELS_MATCH(bitmap, context.opaqueRegion().asRect()); |
| - context.writePixels(alphaBitmap, 1, 10); |
| + { |
| + SkAutoLockPixels locker(alphaBitmap); |
| + context.writePixels(alphaBitmap.info(), alphaBitmap.getPixels(), alphaBitmap.rowBytes(), |
| + 1, 10); |
| + } |
| EXPECT_EQ_RECT(IntRect(11, 11, 89, 89), context.opaqueRegion().asRect()); |
| EXPECT_PIXELS_MATCH(bitmap, context.opaqueRegion().asRect()); |
| } |