Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1367)

Unified Diff: Source/platform/graphics/GraphicsContextTest.cpp

Issue 657293004: Remove unused GC::writePixels() wrapper. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: unit test helper Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/platform/graphics/GraphicsContext.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/platform/graphics/GraphicsContextTest.cpp
diff --git a/Source/platform/graphics/GraphicsContextTest.cpp b/Source/platform/graphics/GraphicsContextTest.cpp
index fe8b95e939a8b6b9ff9302c82b5914cec334658a..0dff662a9f70870d0ec31c288991bb6d27d06b82 100644
--- a/Source/platform/graphics/GraphicsContextTest.cpp
+++ b/Source/platform/graphics/GraphicsContextTest.cpp
@@ -759,6 +759,12 @@ TEST(GraphicsContextTest, trackOpaqueTextTest)
EXPECT_PIXELS_MATCH(bitmap, context.opaqueRegion().asRect());
}
+static inline void writePixels(GraphicsContext* context, const SkBitmap& bm, int x, int y)
+{
+ SkAutoLockPixels locker(bm);
+ context->writePixels(bm.info(), bm.getPixels(), bm.rowBytes(), x, y);
+}
+
TEST(GraphicsContextTest, trackOpaqueWritePixelsTest)
{
SkBitmap bitmap;
@@ -786,7 +792,7 @@ TEST(GraphicsContextTest, trackOpaqueWritePixelsTest)
SkPaint paint;
paint.setXfermodeMode(SkXfermode::kSrc_Mode);
- context.writePixels(opaqueBitmap, 50, 50);
+ writePixels(&context, opaqueBitmap, 50, 50);
EXPECT_EQ_RECT(IntRect(50, 50, 10, 10), context.opaqueRegion().asRect());
EXPECT_PIXELS_MATCH(bitmap, context.opaqueRegion().asRect());
@@ -794,19 +800,19 @@ 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);
+ writePixels(&context, alphaBitmap, 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);
+ writePixels(&context, alphaBitmap, 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);
+ writePixels(&context, alphaBitmap, 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);
+ writePixels(&context, alphaBitmap, 1, 10);
EXPECT_EQ_RECT(IntRect(11, 11, 89, 89), context.opaqueRegion().asRect());
EXPECT_PIXELS_MATCH(bitmap, context.opaqueRegion().asRect());
}
« no previous file with comments | « Source/platform/graphics/GraphicsContext.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698