Commit 7c8b77b7 authored by fmalita@chromium.org's avatar fmalita@chromium.org

Remove unused GC::writePixels() wrapper.

(only used in unit tests)

R=schenney@chromium.org,senorblanco@chromium.org

Review URL: https://codereview.chromium.org/657293004

git-svn-id: svn://svn.chromium.org/blink/trunk@183846 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent b870117d
...@@ -1202,18 +1202,6 @@ void GraphicsContext::writePixels(const SkImageInfo& info, const void* pixels, s ...@@ -1202,18 +1202,6 @@ void GraphicsContext::writePixels(const SkImageInfo& info, const void* pixels, s
} }
} }
void GraphicsContext::writePixels(const SkBitmap& bitmap, int x, int y)
{
if (contextDisabled())
return;
if (!bitmap.getTexture()) {
SkAutoLockPixels alp(bitmap);
if (bitmap.getPixels())
writePixels(bitmap.info(), bitmap.getPixels(), bitmap.rowBytes(), x, y);
}
}
void GraphicsContext::drawBitmap(const SkBitmap& bitmap, SkScalar left, SkScalar top, const SkPaint* paint) void GraphicsContext::drawBitmap(const SkBitmap& bitmap, SkScalar left, SkScalar top, const SkPaint* paint)
{ {
ASSERT(m_canvas); ASSERT(m_canvas);
......
...@@ -285,7 +285,6 @@ public: ...@@ -285,7 +285,6 @@ public:
// These methods write to the canvas and modify the opaque region, if tracked. // These methods write to the canvas and modify the opaque region, if tracked.
// Also drawLine(const IntPoint& point1, const IntPoint& point2) and fillRoundedRect // Also drawLine(const IntPoint& point1, const IntPoint& point2) and fillRoundedRect
void writePixels(const SkImageInfo&, const void* pixels, size_t rowBytes, int x, int y); void writePixels(const SkImageInfo&, const void* pixels, size_t rowBytes, int x, int y);
void writePixels(const SkBitmap&, int x, int y);
void drawBitmap(const SkBitmap&, SkScalar, SkScalar, const SkPaint* = 0); void drawBitmap(const SkBitmap&, SkScalar, SkScalar, const SkPaint* = 0);
void drawBitmapRect(const SkBitmap&, const SkRect*, const SkRect&, const SkPaint* = 0); void drawBitmapRect(const SkBitmap&, const SkRect*, const SkRect&, const SkPaint* = 0);
void drawOval(const SkRect&, const SkPaint&); void drawOval(const SkRect&, const SkPaint&);
......
...@@ -759,6 +759,12 @@ TEST(GraphicsContextTest, trackOpaqueTextTest) ...@@ -759,6 +759,12 @@ TEST(GraphicsContextTest, trackOpaqueTextTest)
EXPECT_PIXELS_MATCH(bitmap, context.opaqueRegion().asRect()); 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) TEST(GraphicsContextTest, trackOpaqueWritePixelsTest)
{ {
SkBitmap bitmap; SkBitmap bitmap;
...@@ -786,7 +792,7 @@ TEST(GraphicsContextTest, trackOpaqueWritePixelsTest) ...@@ -786,7 +792,7 @@ TEST(GraphicsContextTest, trackOpaqueWritePixelsTest)
SkPaint paint; SkPaint paint;
paint.setXfermodeMode(SkXfermode::kSrc_Mode); 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_EQ_RECT(IntRect(50, 50, 10, 10), context.opaqueRegion().asRect());
EXPECT_PIXELS_MATCH(bitmap, context.opaqueRegion().asRect()); EXPECT_PIXELS_MATCH(bitmap, context.opaqueRegion().asRect());
...@@ -794,19 +800,19 @@ TEST(GraphicsContextTest, trackOpaqueWritePixelsTest) ...@@ -794,19 +800,19 @@ TEST(GraphicsContextTest, trackOpaqueWritePixelsTest)
EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), context.opaqueRegion().asRect()); EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), context.opaqueRegion().asRect());
EXPECT_PIXELS_MATCH(bitmap, 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_EQ_RECT(IntRect(10, 10, 90, 90), context.opaqueRegion().asRect());
EXPECT_PIXELS_MATCH(bitmap, 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_EQ_RECT(IntRect(10, 11, 90, 89), context.opaqueRegion().asRect());
EXPECT_PIXELS_MATCH(bitmap, 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_EQ_RECT(IntRect(10, 11, 90, 89), context.opaqueRegion().asRect());
EXPECT_PIXELS_MATCH(bitmap, 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_EQ_RECT(IntRect(11, 11, 89, 89), context.opaqueRegion().asRect());
EXPECT_PIXELS_MATCH(bitmap, context.opaqueRegion().asRect()); EXPECT_PIXELS_MATCH(bitmap, context.opaqueRegion().asRect());
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment