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

Unified Diff: Source/WebKit/chromium/tests/GraphicsContextTest.cpp

Issue 14160005: Track the region where text is painted. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: fixed build on win and mac Created 7 years, 7 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/WebKit/chromium/src/WebFontImpl.cpp ('k') | Source/core/html/canvas/CanvasRenderingContext2D.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebKit/chromium/tests/GraphicsContextTest.cpp
diff --git a/Source/WebKit/chromium/tests/GraphicsContextTest.cpp b/Source/WebKit/chromium/tests/GraphicsContextTest.cpp
index 398817d5241c6947ca730db02e1b6342a9904d38..00e51f670d7c98520620a6fb4a051b75ec3656dd 100644
--- a/Source/WebKit/chromium/tests/GraphicsContextTest.cpp
+++ b/Source/WebKit/chromium/tests/GraphicsContextTest.cpp
@@ -705,11 +705,13 @@ TEST(PlatformContextSkiaTest, trackOpaqueRoundedRectTest)
TEST(PlatformContextSkiaTest, trackOpaqueTextTest)
{
+ int width = 200, height = 200;
SkBitmap bitmap;
- bitmap.setConfig(SkBitmap::kARGB_8888_Config, 200, 200);
+ bitmap.setConfig(SkBitmap::kARGB_8888_Config, width, height);
bitmap.allocPixels();
bitmap.eraseColor(0);
SkCanvas canvas(bitmap);
+ SkRect textRect = SkRect::MakeWH(width, height);
GraphicsContext context(&canvas);
context.setTrackOpaqueRegion(true);
@@ -734,11 +736,11 @@ TEST(PlatformContextSkiaTest, trackOpaqueTextTest)
EXPECT_EQ_RECT(IntRect(50, 50, 50, 50), context.opaqueRegion().asRect());
EXPECT_PIXELS_MATCH(bitmap, context.opaqueRegion().asRect());
- context.drawPosText("A", 1, &point, opaquePaint);
+ context.drawPosText("A", 1, &point, textRect, opaquePaint);
EXPECT_EQ_RECT(IntRect(50, 50, 50, 50), context.opaqueRegion().asRect());
EXPECT_PIXELS_MATCH(bitmap, context.opaqueRegion().asRect());
- context.drawPosText("A", 1, &point, alphaPaint);
+ context.drawPosText("A", 1, &point, textRect, alphaPaint);
EXPECT_EQ_RECT(IntRect(0, 0, 0, 0), context.opaqueRegion().asRect());
EXPECT_PIXELS_MATCH(bitmap, context.opaqueRegion().asRect());
@@ -746,11 +748,11 @@ TEST(PlatformContextSkiaTest, trackOpaqueTextTest)
EXPECT_EQ_RECT(IntRect(50, 50, 50, 50), context.opaqueRegion().asRect());
EXPECT_PIXELS_MATCH(bitmap, context.opaqueRegion().asRect());
- context.drawPosTextH("A", 1, &pointX, 0, opaquePaint);
+ context.drawPosTextH("A", 1, &pointX, 0, textRect, opaquePaint);
EXPECT_EQ_RECT(IntRect(50, 50, 50, 50), context.opaqueRegion().asRect());
EXPECT_PIXELS_MATCH(bitmap, context.opaqueRegion().asRect());
- context.drawPosTextH("A", 1, &pointX, 0, alphaPaint);
+ context.drawPosTextH("A", 1, &pointX, 0, textRect, alphaPaint);
EXPECT_EQ_RECT(IntRect(0, 0, 0, 0), context.opaqueRegion().asRect());
EXPECT_PIXELS_MATCH(bitmap, context.opaqueRegion().asRect());
@@ -758,11 +760,11 @@ TEST(PlatformContextSkiaTest, trackOpaqueTextTest)
EXPECT_EQ_RECT(IntRect(50, 50, 50, 50), context.opaqueRegion().asRect());
EXPECT_PIXELS_MATCH(bitmap, context.opaqueRegion().asRect());
- context.drawTextOnPath("A", 1, path, 0, opaquePaint);
+ context.drawTextOnPath("A", 1, path, textRect, 0, opaquePaint);
EXPECT_EQ_RECT(IntRect(50, 50, 50, 50), context.opaqueRegion().asRect());
EXPECT_PIXELS_MATCH(bitmap, context.opaqueRegion().asRect());
- context.drawTextOnPath("A", 1, path, 0, alphaPaint);
+ context.drawTextOnPath("A", 1, path, textRect, 0, alphaPaint);
EXPECT_EQ_RECT(IntRect(0, 0, 0, 0), context.opaqueRegion().asRect());
EXPECT_PIXELS_MATCH(bitmap, context.opaqueRegion().asRect());
}
« no previous file with comments | « Source/WebKit/chromium/src/WebFontImpl.cpp ('k') | Source/core/html/canvas/CanvasRenderingContext2D.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698