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

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

Issue 14160005: Track the region where text is painted. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebase with TOT Created 7 years, 8 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
Index: Source/WebKit/chromium/tests/PlatformContextSkiaTest.cpp
diff --git a/Source/WebKit/chromium/tests/PlatformContextSkiaTest.cpp b/Source/WebKit/chromium/tests/PlatformContextSkiaTest.cpp
index 760144cee7552fb5438dd74ef9a733bd5b0739c0..02346f371eb18aee21b12b3cbf4c81e0452352a6 100644
--- a/Source/WebKit/chromium/tests/PlatformContextSkiaTest.cpp
+++ b/Source/WebKit/chromium/tests/PlatformContextSkiaTest.cpp
@@ -759,11 +759,13 @@ TEST(PlatformContextSkiaTest, trackOpaqueIRectTest)
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);
PlatformContextSkia platformContext(&canvas);
platformContext.setTrackOpaqueRegion(true);
@@ -789,11 +791,11 @@ TEST(PlatformContextSkiaTest, trackOpaqueTextTest)
EXPECT_EQ_RECT(IntRect(50, 50, 50, 50), platformContext.opaqueRegion().asRect());
EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
- platformContext.drawPosText("A", 1, &point, opaquePaint);
+ platformContext.drawPosText("A", 1, &point, textRect, opaquePaint);
EXPECT_EQ_RECT(IntRect(50, 50, 50, 50), platformContext.opaqueRegion().asRect());
EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
- platformContext.drawPosText("A", 1, &point, alphaPaint);
+ platformContext.drawPosText("A", 1, &point, textRect, alphaPaint);
EXPECT_EQ_RECT(IntRect(0, 0, 0, 0), platformContext.opaqueRegion().asRect());
EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
@@ -801,11 +803,11 @@ TEST(PlatformContextSkiaTest, trackOpaqueTextTest)
EXPECT_EQ_RECT(IntRect(50, 50, 50, 50), platformContext.opaqueRegion().asRect());
EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
- platformContext.drawPosTextH("A", 1, &pointX, 0, opaquePaint);
+ platformContext.drawPosTextH("A", 1, &pointX, 0, textRect, opaquePaint);
EXPECT_EQ_RECT(IntRect(50, 50, 50, 50), platformContext.opaqueRegion().asRect());
EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
- platformContext.drawPosTextH("A", 1, &pointX, 0, alphaPaint);
+ platformContext.drawPosTextH("A", 1, &pointX, 0, textRect, alphaPaint);
EXPECT_EQ_RECT(IntRect(0, 0, 0, 0), platformContext.opaqueRegion().asRect());
EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
@@ -813,11 +815,11 @@ TEST(PlatformContextSkiaTest, trackOpaqueTextTest)
EXPECT_EQ_RECT(IntRect(50, 50, 50, 50), platformContext.opaqueRegion().asRect());
EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
- platformContext.drawTextOnPath("A", 1, path, 0, opaquePaint);
+ platformContext.drawTextOnPath("A", 1, path, textRect, 0, opaquePaint);
EXPECT_EQ_RECT(IntRect(50, 50, 50, 50), platformContext.opaqueRegion().asRect());
EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
- platformContext.drawTextOnPath("A", 1, path, 0, alphaPaint);
+ platformContext.drawTextOnPath("A", 1, path, textRect, 0, alphaPaint);
EXPECT_EQ_RECT(IntRect(0, 0, 0, 0), platformContext.opaqueRegion().asRect());
EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
}

Powered by Google App Engine
This is Rietveld 408576698