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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 14550002: Making GraphicsContext the owner of PlatformContext. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix the Windows build. 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
« Source/WebKit/chromium/src/painting/GraphicsContextBuilder.h ('K') | « Source/WebKit/chromium/src/painting/GraphicsContextBuilder.h ('k') | Source/WebKit/chromium/tests/TransparencyWinTest.cpp » ('j') | Source/core/page/FrameView.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebKit/chromium/tests/PlatformContextSkiaTest.cpp
diff --git a/Source/WebKit/chromium/tests/PlatformContextSkiaTest.cpp b/Source/WebKit/chromium/tests/PlatformContextSkiaTest.cpp
index 04aeb8b580f43f465ec8c37229f4bbd6ea50e403..64224edec3b500ed2d6b5e56fbfa9cf4c54bf960 100644
--- a/Source/WebKit/chromium/tests/PlatformContextSkiaTest.cpp
+++ b/Source/WebKit/chromium/tests/PlatformContextSkiaTest.cpp
@@ -72,56 +72,56 @@ TEST(PlatformContextSkiaTest, trackOpaqueTest)
bitmap.eraseColor(0);
SkCanvas canvas(bitmap);
- PlatformContextSkia platformContext(&canvas);
- platformContext.setTrackOpaqueRegion(true);
- GraphicsContext context(&platformContext);
+ GraphicsContext context(&canvas);
+ PlatformContextSkia* platformContext = context.platformContext();
+ platformContext->setTrackOpaqueRegion(true);
Color opaque(1.0f, 0.0f, 0.0f, 1.0f);
Color alpha(0.0f, 0.0f, 0.0f, 0.0f);
context.fillRect(FloatRect(10, 10, 90, 90), opaque, ColorSpaceDeviceRGB, CompositeSourceOver);
- EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
context.fillRect(FloatRect(10, 10, 90, 90), alpha, ColorSpaceDeviceRGB, CompositeSourceOver);
- EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
context.fillRect(FloatRect(99, 13, 10, 90), opaque, ColorSpaceDeviceRGB, CompositePlusLighter);
- EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
context.fillRect(FloatRect(99, 13, 10, 90), opaque, ColorSpaceDeviceRGB, CompositeSourceIn);
- EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
context.fillRect(FloatRect(99, 13, 10, 90), alpha, ColorSpaceDeviceRGB, CompositeSourceIn);
- EXPECT_EQ_RECT(IntRect(10, 10, 89, 90), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(10, 10, 89, 90), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
context.fillRect(FloatRect(8, 8, 3, 90), opaque, ColorSpaceDeviceRGB, CompositeSourceOut);
- EXPECT_EQ_RECT(IntRect(11, 10, 88, 90), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(11, 10, 88, 90), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
context.fillRect(FloatRect(30, 30, 290, 290), opaque, ColorSpaceDeviceRGB, CompositeSourceOver);
- EXPECT_EQ_RECT(IntRect(30, 30, 290, 290), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(30, 30, 290, 290), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
context.fillRect(FloatRect(40, 20, 290, 50), opaque, ColorSpaceDeviceRGB, CompositeSourceOver);
- EXPECT_EQ_RECT(IntRect(30, 30, 290, 290), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(30, 30, 290, 290), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
context.fillRect(FloatRect(10, 10, 390, 50), opaque, ColorSpaceDeviceRGB, CompositeSourceIn);
- EXPECT_EQ_RECT(IntRect(30, 30, 290, 290), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(30, 30, 290, 290), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
context.fillRect(FloatRect(10, 10, 390, 50), alpha, ColorSpaceDeviceRGB);
- EXPECT_EQ_RECT(IntRect(30, 30, 290, 290), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(30, 30, 290, 290), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
context.fillRect(FloatRect(10, 10, 390, 50), opaque, ColorSpaceDeviceRGB, CompositeSourceOver);
- EXPECT_EQ_RECT(IntRect(30, 10, 290, 310), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(30, 10, 290, 310), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
}
TEST(PlatformContextSkiaTest, trackOpaqueClipTest)
@@ -131,72 +131,72 @@ TEST(PlatformContextSkiaTest, trackOpaqueClipTest)
bitmap.allocPixels();
SkCanvas canvas(bitmap);
- PlatformContextSkia platformContext(&canvas);
- platformContext.setTrackOpaqueRegion(true);
- GraphicsContext context(&platformContext);
+ GraphicsContext context(&canvas);
+ PlatformContextSkia* platformContext = context.platformContext();
+ platformContext->setTrackOpaqueRegion(true);
Color opaque(1.0f, 0.0f, 0.0f, 1.0f);
Color alpha(0.0f, 0.0f, 0.0f, 0.0f);
context.fillRect(FloatRect(10, 10, 90, 90), opaque, ColorSpaceDeviceRGB, CompositeSourceOver);
- EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
context.clearRect(FloatRect(10, 10, 90, 90));
- EXPECT_EQ_RECT(IntRect(), platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(), platformContext->opaqueRegion().asRect());
context.save();
context.clip(FloatRect(0, 0, 10, 10));
context.fillRect(FloatRect(10, 10, 90, 90), opaque, ColorSpaceDeviceRGB, CompositeSourceOver);
- EXPECT_EQ_RECT(IntRect(), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
context.restore();
context.clearRect(FloatRect(10, 10, 90, 90));
- EXPECT_EQ_RECT(IntRect(), platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(), platformContext->opaqueRegion().asRect());
context.save();
context.clip(FloatRect(20, 20, 10, 10));
context.fillRect(FloatRect(10, 10, 90, 90), opaque, ColorSpaceDeviceRGB, CompositeSourceOver);
- EXPECT_EQ_RECT(IntRect(20, 20, 10, 10), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(20, 20, 10, 10), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
context.clearRect(FloatRect(10, 10, 90, 90));
- EXPECT_EQ_RECT(IntRect(), platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(), platformContext->opaqueRegion().asRect());
// The intersection of the two clips becomes empty.
context.clip(FloatRect(30, 20, 10, 10));
context.fillRect(FloatRect(10, 10, 90, 90), opaque, ColorSpaceDeviceRGB, CompositeSourceOver);
- EXPECT_EQ_RECT(IntRect(), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
context.restore();
context.clearRect(FloatRect(10, 10, 90, 90));
- EXPECT_EQ_RECT(IntRect(), platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(), platformContext->opaqueRegion().asRect());
// The transform and the clip need to interact correctly (transform first)
context.save();
context.translate(10, 10);
context.clip(FloatRect(20, 20, 10, 10));
context.fillRect(FloatRect(10, 10, 90, 90), opaque, ColorSpaceDeviceRGB, CompositeSourceOver);
- EXPECT_EQ_RECT(IntRect(30, 30, 10, 10), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(30, 30, 10, 10), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
context.restore();
context.clearRect(FloatRect(10, 10, 90, 90));
- EXPECT_EQ_RECT(IntRect(), platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(), platformContext->opaqueRegion().asRect());
// The transform and the clip need to interact correctly (clip first)
context.save();
context.clip(FloatRect(20, 20, 10, 10));
context.translate(10, 10);
context.fillRect(FloatRect(10, 10, 90, 90), opaque, ColorSpaceDeviceRGB, CompositeSourceOver);
- EXPECT_EQ_RECT(IntRect(20, 20, 10, 10), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(20, 20, 10, 10), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
context.restore();
context.clearRect(FloatRect(10, 10, 90, 90));
- EXPECT_EQ_RECT(IntRect(), platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(), platformContext->opaqueRegion().asRect());
Path path;
path.moveTo(FloatPoint(0, 0));
@@ -206,8 +206,8 @@ TEST(PlatformContextSkiaTest, trackOpaqueClipTest)
context.save();
context.clipPath(path, RULE_EVENODD);
context.fillRect(FloatRect(10, 10, 90, 90), opaque, ColorSpaceDeviceRGB, CompositeSourceOver);
- EXPECT_EQ_RECT(IntRect(), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
context.restore();
// Another non-rectangular clip.
@@ -215,8 +215,8 @@ TEST(PlatformContextSkiaTest, trackOpaqueClipTest)
context.clip(IntRect(30, 30, 20, 20));
context.clipOut(IntRect(30, 30, 10, 10));
context.fillRect(FloatRect(10, 10, 90, 90), opaque, ColorSpaceDeviceRGB, CompositeSourceOver);
- EXPECT_EQ_RECT(IntRect(), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
context.restore();
OwnPtr<ImageBuffer> alphaImage = ImageBuffer::create(IntSize(100, 100));
@@ -227,8 +227,8 @@ TEST(PlatformContextSkiaTest, trackOpaqueClipTest)
context.clipToImageBuffer(alphaImage.get(), FloatRect(30, 30, 10, 10));
context.fillRect(FloatRect(10, 10, 90, 90), opaque, ColorSpaceDeviceRGB, CompositeSourceOver);
context.restore();
- EXPECT_EQ_RECT(IntRect(), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
}
TEST(PlatformContextSkiaTest, trackImageMask)
@@ -239,9 +239,9 @@ TEST(PlatformContextSkiaTest, trackImageMask)
bitmap.eraseColor(0);
SkCanvas canvas(bitmap);
- PlatformContextSkia platformContext(&canvas);
- platformContext.setTrackOpaqueRegion(true);
- GraphicsContext context(&platformContext);
+ GraphicsContext context(&canvas);
+ PlatformContextSkia* platformContext = context.platformContext();
+ platformContext->setTrackOpaqueRegion(true);
Color opaque(1.0f, 0.0f, 0.0f, 1.0f);
Color alpha(0.0f, 0.0f, 0.0f, 0.0f);
@@ -266,8 +266,8 @@ TEST(PlatformContextSkiaTest, trackImageMask)
context.endTransparencyLayer();
context.endTransparencyLayer();
- EXPECT_EQ_RECT(IntRect(), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH_EXACT(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH_EXACT(bitmap, platformContext->opaqueRegion().asRect());
}
TEST(PlatformContextSkiaTest, trackImageMaskWithOpaqueRect)
@@ -278,9 +278,9 @@ TEST(PlatformContextSkiaTest, trackImageMaskWithOpaqueRect)
bitmap.eraseColor(0);
SkCanvas canvas(bitmap);
- PlatformContextSkia platformContext(&canvas);
- platformContext.setTrackOpaqueRegion(true);
- GraphicsContext context(&platformContext);
+ GraphicsContext context(&canvas);
+ PlatformContextSkia* platformContext = context.platformContext();
+ platformContext->setTrackOpaqueRegion(true);
Color opaque(1.0f, 0.0f, 0.0f, 1.0f);
Color alpha(0.0f, 0.0f, 0.0f, 0.0f);
@@ -308,8 +308,8 @@ TEST(PlatformContextSkiaTest, trackImageMaskWithOpaqueRect)
context.endTransparencyLayer();
context.endTransparencyLayer();
- EXPECT_EQ_RECT(IntRect(12, 12, 3, 3), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH_EXACT(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(12, 12, 3, 3), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH_EXACT(bitmap, platformContext->opaqueRegion().asRect());
}
TEST(PlatformContextSkiaTest, trackOpaqueJoinTest)
@@ -319,56 +319,56 @@ TEST(PlatformContextSkiaTest, trackOpaqueJoinTest)
bitmap.allocPixels();
SkCanvas canvas(bitmap);
- PlatformContextSkia platformContext(&canvas);
- platformContext.setTrackOpaqueRegion(true);
- GraphicsContext context(&platformContext);
+ GraphicsContext context(&canvas);
+ PlatformContextSkia* platformContext = context.platformContext();
+ platformContext->setTrackOpaqueRegion(true);
Color opaque(1.0f, 0.0f, 0.0f, 1.0f);
Color alpha(0.0f, 0.0f, 0.0f, 0.0f);
context.fillRect(FloatRect(20, 20, 10, 10), opaque, ColorSpaceDeviceRGB, CompositeSourceOver);
- EXPECT_EQ_RECT(IntRect(20, 20, 10, 10), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(20, 20, 10, 10), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
// Doesn't join
context.fillRect(FloatRect(31, 20, 10, 10), opaque, ColorSpaceDeviceRGB, CompositeSourceOver);
- EXPECT_EQ_RECT(IntRect(20, 20, 10, 10), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(20, 20, 10, 10), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
// Does join
context.fillRect(FloatRect(30, 20, 10, 10), opaque, ColorSpaceDeviceRGB, CompositeSourceOver);
- EXPECT_EQ_RECT(IntRect(20, 20, 20, 10), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(20, 20, 20, 10), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
// Doesn't join
context.fillRect(FloatRect(20, 31, 20, 10), opaque, ColorSpaceDeviceRGB, CompositeSourceOver);
- EXPECT_EQ_RECT(IntRect(20, 20, 20, 10), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(20, 20, 20, 10), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
// Does join
context.fillRect(FloatRect(20, 30, 20, 10), opaque, ColorSpaceDeviceRGB, CompositeSourceOver);
- EXPECT_EQ_RECT(IntRect(20, 20, 20, 20), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(20, 20, 20, 20), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
// Doesn't join
context.fillRect(FloatRect(9, 20, 10, 20), opaque, ColorSpaceDeviceRGB, CompositeSourceOver);
- EXPECT_EQ_RECT(IntRect(20, 20, 20, 20), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(20, 20, 20, 20), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
// Does join
context.fillRect(FloatRect(10, 20, 10, 20), opaque, ColorSpaceDeviceRGB, CompositeSourceOver);
- EXPECT_EQ_RECT(IntRect(10, 20, 30, 20), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(10, 20, 30, 20), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
// Doesn't join
context.fillRect(FloatRect(10, 9, 30, 10), opaque, ColorSpaceDeviceRGB, CompositeSourceOver);
- EXPECT_EQ_RECT(IntRect(10, 20, 30, 20), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(10, 20, 30, 20), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
// Does join
context.fillRect(FloatRect(10, 10, 30, 10), opaque, ColorSpaceDeviceRGB, CompositeSourceOver);
- EXPECT_EQ_RECT(IntRect(10, 10, 30, 30), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(10, 10, 30, 30), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
}
TEST(PlatformContextSkiaTest, trackOpaqueLineTest)
@@ -379,9 +379,9 @@ TEST(PlatformContextSkiaTest, trackOpaqueLineTest)
bitmap.eraseColor(0);
SkCanvas canvas(bitmap);
- PlatformContextSkia platformContext(&canvas);
- platformContext.setTrackOpaqueRegion(true);
- GraphicsContext context(&platformContext);
+ GraphicsContext context(&canvas);
+ PlatformContextSkia* platformContext = context.platformContext();
+ platformContext->setTrackOpaqueRegion(true);
Color opaque(1.0f, 0.0f, 0.0f, 1.0f);
Color alpha(0.0f, 0.0f, 0.0f, 0.0f);
@@ -394,8 +394,8 @@ TEST(PlatformContextSkiaTest, trackOpaqueLineTest)
context.setCompositeOperation(CompositeSourceOver);
context.fillRect(FloatRect(10, 10, 90, 90), opaque, ColorSpaceDeviceRGB, CompositeSourceOver);
- EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
context.setCompositeOperation(CompositeSourceIn);
@@ -403,36 +403,36 @@ TEST(PlatformContextSkiaTest, trackOpaqueLineTest)
context.setStrokeColor(alpha, ColorSpaceDeviceRGB);
context.drawLine(IntPoint(0, 0), IntPoint(100, 0));
context.restore();
- EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
context.save();
context.setStrokeColor(opaque, ColorSpaceDeviceRGB);
context.drawLine(IntPoint(0, 10), IntPoint(100, 10));
context.restore();
- EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
context.save();
context.setStrokeColor(alpha, ColorSpaceDeviceRGB);
context.drawLine(IntPoint(0, 10), IntPoint(100, 10));
context.restore();
- EXPECT_EQ_RECT(IntRect(10, 13, 90, 87), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(10, 13, 90, 87), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
context.save();
context.setStrokeColor(alpha, ColorSpaceDeviceRGB);
context.drawLine(IntPoint(0, 11), IntPoint(100, 11));
context.restore();
- EXPECT_EQ_RECT(IntRect(10, 14, 90, 86), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(10, 14, 90, 86), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
context.setShouldAntialias(true);
context.setCompositeOperation(CompositeSourceOver);
context.fillRect(FloatRect(10, 10, 90, 90), opaque, ColorSpaceDeviceRGB, CompositeSourceOver);
- EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
context.setCompositeOperation(CompositeSourceIn);
@@ -440,31 +440,31 @@ TEST(PlatformContextSkiaTest, trackOpaqueLineTest)
context.setStrokeColor(alpha, ColorSpaceDeviceRGB);
context.drawLine(IntPoint(0, 0), IntPoint(100, 0));
context.restore();
- EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
context.setShouldAntialias(false);
context.save();
context.setStrokeColor(opaque, ColorSpaceDeviceRGB);
context.drawLine(IntPoint(0, 10), IntPoint(100, 10));
context.restore();
- EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
context.setShouldAntialias(true);
context.save();
context.setStrokeColor(opaque, ColorSpaceDeviceRGB);
context.drawLine(IntPoint(0, 10), IntPoint(100, 10));
context.restore();
- EXPECT_EQ_RECT(IntRect(10, 13, 90, 87), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(10, 13, 90, 87), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
context.save();
context.setStrokeColor(alpha, ColorSpaceDeviceRGB);
context.drawLine(IntPoint(0, 11), IntPoint(100, 11));
context.restore();
- EXPECT_EQ_RECT(IntRect(10, 14, 90, 86), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(10, 14, 90, 86), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
}
TEST(PlatformContextSkiaTest, trackOpaquePathTest)
@@ -474,16 +474,16 @@ TEST(PlatformContextSkiaTest, trackOpaquePathTest)
bitmap.allocPixels();
SkCanvas canvas(bitmap);
- PlatformContextSkia platformContext(&canvas);
- platformContext.setTrackOpaqueRegion(true);
- GraphicsContext context(&platformContext);
+ GraphicsContext context(&canvas);
+ PlatformContextSkia* platformContext = context.platformContext();
+ platformContext->setTrackOpaqueRegion(true);
Color opaque(1.0f, 0.0f, 0.0f, 1.0f);
Color alpha(0.0f, 0.0f, 0.0f, 0.0f);
context.fillRect(FloatRect(10, 10, 90, 90), opaque, ColorSpaceDeviceRGB, CompositeSourceOver);
- EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
context.setShouldAntialias(false);
context.setMiterLimit(1);
@@ -498,32 +498,32 @@ TEST(PlatformContextSkiaTest, trackOpaquePathTest)
path.moveTo(FloatPoint(0, 0));
path.addLineTo(FloatPoint(100, 0));
context.fillPath(path);
- EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
path.clear();
context.setFillColor(opaque, ColorSpaceDeviceRGB);
path.moveTo(FloatPoint(0, 10));
path.addLineTo(FloatPoint(100, 13));
context.fillPath(path);
- EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
path.clear();
context.setFillColor(alpha, ColorSpaceDeviceRGB);
path.moveTo(FloatPoint(0, 10));
path.addLineTo(FloatPoint(100, 13));
context.fillPath(path);
- EXPECT_EQ_RECT(IntRect(10, 13, 90, 87), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(10, 13, 90, 87), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
path.clear();
context.setFillColor(alpha, ColorSpaceDeviceRGB);
path.moveTo(FloatPoint(0, 14));
path.addLineTo(FloatPoint(100, 10));
context.fillPath(path);
- EXPECT_EQ_RECT(IntRect(10, 14, 90, 86), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(10, 14, 90, 86), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
path.clear();
}
@@ -534,9 +534,9 @@ TEST(PlatformContextSkiaTest, trackOpaqueImageTest)
bitmap.allocPixels();
SkCanvas canvas(bitmap);
- PlatformContextSkia platformContext(&canvas);
- platformContext.setTrackOpaqueRegion(true);
- GraphicsContext context(&platformContext);
+ GraphicsContext context(&canvas);
+ PlatformContextSkia* platformContext = context.platformContext();
+ platformContext->setTrackOpaqueRegion(true);
Color opaque(1.0f, 0.0f, 0.0f, 1.0f);
Color alpha(0.0f, 0.0f, 0.0f, 0.0f);
@@ -564,55 +564,55 @@ TEST(PlatformContextSkiaTest, trackOpaqueImageTest)
EXPECT_FALSE(alphaImage->currentFrameKnownToBeOpaque());
context.fillRect(FloatRect(10, 10, 90, 90), opaque, ColorSpaceDeviceRGB, CompositeSourceOver);
- EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
context.drawImage(opaqueImage.get(), ColorSpaceDeviceRGB, IntPoint(0, 0));
- EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
context.drawImage(alphaImage.get(), ColorSpaceDeviceRGB, IntPoint(0, 0));
- EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
context.drawImage(opaqueImage.get(), ColorSpaceDeviceRGB, IntPoint(5, 5));
- EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
context.drawImage(alphaImage.get(), ColorSpaceDeviceRGB, IntPoint(5, 5));
- EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
context.drawImage(opaqueImage.get(), ColorSpaceDeviceRGB, IntPoint(10, 10));
- EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
context.drawImage(alphaImage.get(), ColorSpaceDeviceRGB, IntPoint(10, 10));
- EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
context.drawImage(alphaImage.get(), ColorSpaceDeviceRGB, IntPoint(20, 10), CompositeSourceIn);
- EXPECT_EQ_RECT(IntRect(10, 20, 90, 80), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(10, 20, 90, 80), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
context.save();
context.setAlpha(0.5);
context.drawImage(opaqueImage.get(), ColorSpaceDeviceRGB, IntPoint(25, 15), CompositeSourceIn);
context.restore();
- EXPECT_EQ_RECT(IntRect(10, 25, 90, 75), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(10, 25, 90, 75), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
context.fillRect(FloatRect(10, 10, 90, 90), opaque, ColorSpaceDeviceRGB, CompositeSourceOver);
- EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
context.drawImage(alphaImage.get(), ColorSpaceDeviceRGB, IntPoint(10, 20), CompositeSourceIn);
- EXPECT_EQ_RECT(IntRect(20, 10, 80, 90), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(20, 10, 80, 90), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
context.save();
context.setAlpha(0.5);
context.drawImage(opaqueImage.get(), ColorSpaceDeviceRGB, IntPoint(15, 25), CompositeSourceIn);
context.restore();
- EXPECT_EQ_RECT(IntRect(25, 10, 75, 90), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(25, 10, 75, 90), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
}
TEST(PlatformContextSkiaTest, trackOpaqueOvalTest)
@@ -623,23 +623,23 @@ TEST(PlatformContextSkiaTest, trackOpaqueOvalTest)
bitmap.eraseColor(0);
SkCanvas canvas(bitmap);
- PlatformContextSkia platformContext(&canvas);
- platformContext.setTrackOpaqueRegion(true);
- GraphicsContext context(&platformContext);
+ GraphicsContext context(&canvas);
+ PlatformContextSkia* platformContext = context.platformContext();
+ platformContext->setTrackOpaqueRegion(true);
Color opaque(1.0f, 0.0f, 0.0f, 1.0f);
Color alpha(0.0f, 0.0f, 0.0f, 0.0f);
- EXPECT_EQ_RECT(IntRect(0, 0, 0, 0), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(0, 0, 0, 0), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
context.drawEllipse(IntRect(10, 10, 90, 90));
- EXPECT_EQ_RECT(IntRect(0, 0, 0, 0), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(0, 0, 0, 0), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
context.fillRect(FloatRect(10, 10, 90, 90), opaque, ColorSpaceDeviceRGB, CompositeSourceOver);
- EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
context.setCompositeOperation(CompositeSourceIn);
@@ -647,25 +647,25 @@ TEST(PlatformContextSkiaTest, trackOpaqueOvalTest)
context.setFillColor(opaque, ColorSpaceDeviceRGB);
context.drawEllipse(IntRect(10, 10, 50, 30));
- EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
context.setFillColor(alpha, ColorSpaceDeviceRGB);
context.drawEllipse(IntRect(10, 10, 30, 50));
- EXPECT_EQ_RECT(IntRect(40, 10, 60, 90), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(40, 10, 60, 90), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
context.setShouldAntialias(true);
context.setFillColor(opaque, ColorSpaceDeviceRGB);
context.drawEllipse(IntRect(10, 10, 50, 30));
- EXPECT_EQ_RECT(IntRect(40, 41, 60, 59), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(40, 41, 60, 59), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
context.setFillColor(alpha, ColorSpaceDeviceRGB);
context.drawEllipse(IntRect(20, 10, 30, 50));
- EXPECT_EQ_RECT(IntRect(51, 41, 49, 59), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(51, 41, 49, 59), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
}
TEST(PlatformContextSkiaTest, trackOpaqueRoundedRectTest)
@@ -676,43 +676,43 @@ TEST(PlatformContextSkiaTest, trackOpaqueRoundedRectTest)
bitmap.eraseColor(0);
SkCanvas canvas(bitmap);
- PlatformContextSkia platformContext(&canvas);
- platformContext.setTrackOpaqueRegion(true);
- GraphicsContext context(&platformContext);
+ GraphicsContext context(&canvas);
+ PlatformContextSkia* platformContext = context.platformContext();
+ platformContext->setTrackOpaqueRegion(true);
Color opaque(1.0f, 0.0f, 0.0f, 1.0f);
Color alpha(0.0f, 0.0f, 0.0f, 0.0f);
IntSize radii(10, 10);
- EXPECT_EQ_RECT(IntRect(0, 0, 0, 0), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(0, 0, 0, 0), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
context.fillRoundedRect(IntRect(10, 10, 90, 90), radii, radii, radii, radii, opaque, ColorSpaceDeviceRGB);
- EXPECT_EQ_RECT(IntRect(0, 0, 0, 0), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(0, 0, 0, 0), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
context.fillRect(FloatRect(10, 10, 90, 90), opaque, ColorSpaceDeviceRGB, CompositeSourceOver);
- EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
context.setCompositeOperation(CompositeSourceIn);
context.setShouldAntialias(false);
context.fillRoundedRect(IntRect(10, 10, 50, 30), radii, radii, radii, radii, opaque, ColorSpaceDeviceRGB);
- EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
context.fillRoundedRect(IntRect(10, 10, 30, 50), radii, radii, radii, radii, alpha, ColorSpaceDeviceRGB);
- EXPECT_EQ_RECT(IntRect(40, 10, 60, 90), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(40, 10, 60, 90), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
context.fillRoundedRect(IntRect(10, 0, 50, 30), radii, radii, radii, radii, alpha, ColorSpaceDeviceRGB);
- EXPECT_EQ_RECT(IntRect(40, 30, 60, 70), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(40, 30, 60, 70), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
context.fillRoundedRect(IntRect(30, 0, 70, 50), radii, radii, radii, radii, opaque, ColorSpaceDeviceRGB);
- EXPECT_EQ_RECT(IntRect(40, 30, 60, 70), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(40, 30, 60, 70), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
}
TEST(PlatformContextSkiaTest, trackOpaqueIRectTest)
@@ -723,9 +723,9 @@ TEST(PlatformContextSkiaTest, trackOpaqueIRectTest)
bitmap.eraseColor(0);
SkCanvas canvas(bitmap);
- PlatformContextSkia platformContext(&canvas);
- platformContext.setTrackOpaqueRegion(true);
- GraphicsContext context(&platformContext);
+ GraphicsContext context(&canvas);
+ PlatformContextSkia* platformContext = context.platformContext();
+ platformContext->setTrackOpaqueRegion(true);
Color opaque(1.0f, 0.0f, 0.0f, 1.0f);
Color alpha(0.0f, 0.0f, 0.0f, 0.0f);
@@ -737,24 +737,24 @@ TEST(PlatformContextSkiaTest, trackOpaqueIRectTest)
alphaPaint.setColor(alpha.rgb());
alphaPaint.setXfermodeMode(SkXfermode::kSrc_Mode);
- EXPECT_EQ_RECT(IntRect(0, 0, 0, 0), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(0, 0, 0, 0), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
- platformContext.drawIRect(SkIRect::MakeXYWH(10, 10, 90, 90), opaquePaint);
- EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ platformContext->drawIRect(SkIRect::MakeXYWH(10, 10, 90, 90), opaquePaint);
+ EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
- platformContext.drawIRect(SkIRect::MakeXYWH(0, 0, 100, 10), alphaPaint);
- EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ platformContext->drawIRect(SkIRect::MakeXYWH(0, 0, 100, 10), alphaPaint);
+ EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
- platformContext.drawIRect(SkIRect::MakeXYWH(0, 0, 100, 20), alphaPaint);
- EXPECT_EQ_RECT(IntRect(10, 20, 90, 80), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ platformContext->drawIRect(SkIRect::MakeXYWH(0, 0, 100, 20), alphaPaint);
+ EXPECT_EQ_RECT(IntRect(10, 20, 90, 80), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
- platformContext.drawIRect(SkIRect::MakeXYWH(50, 0, 50, 100), alphaPaint);
- EXPECT_EQ_RECT(IntRect(10, 20, 40, 80), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ platformContext->drawIRect(SkIRect::MakeXYWH(50, 0, 50, 100), alphaPaint);
+ EXPECT_EQ_RECT(IntRect(10, 20, 40, 80), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
}
TEST(PlatformContextSkiaTest, trackOpaqueTextTest)
@@ -765,9 +765,9 @@ TEST(PlatformContextSkiaTest, trackOpaqueTextTest)
bitmap.eraseColor(0);
SkCanvas canvas(bitmap);
- PlatformContextSkia platformContext(&canvas);
- platformContext.setTrackOpaqueRegion(true);
- GraphicsContext context(&platformContext);
+ GraphicsContext context(&canvas);
+ PlatformContextSkia* platformContext = context.platformContext();
+ platformContext->setTrackOpaqueRegion(true);
Color opaque(1.0f, 0.0f, 0.0f, 1.0f);
Color alpha(0.0f, 0.0f, 0.0f, 0.0f);
@@ -786,40 +786,40 @@ TEST(PlatformContextSkiaTest, trackOpaqueTextTest)
path.lineTo(SkPoint::Make(100, 0));
context.fillRect(FloatRect(50, 50, 50, 50), opaque, ColorSpaceDeviceRGB, CompositeSourceOver);
- EXPECT_EQ_RECT(IntRect(50, 50, 50, 50), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(50, 50, 50, 50), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
- platformContext.drawPosText("A", 1, &point, opaquePaint);
- EXPECT_EQ_RECT(IntRect(50, 50, 50, 50), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ platformContext->drawPosText("A", 1, &point, 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);
- EXPECT_EQ_RECT(IntRect(0, 0, 0, 0), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ platformContext->drawPosText("A", 1, &point, alphaPaint);
+ EXPECT_EQ_RECT(IntRect(0, 0, 0, 0), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
context.fillRect(FloatRect(50, 50, 50, 50), opaque, ColorSpaceDeviceRGB, CompositeSourceOver);
- EXPECT_EQ_RECT(IntRect(50, 50, 50, 50), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ 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);
- 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);
+ 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);
- EXPECT_EQ_RECT(IntRect(0, 0, 0, 0), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ platformContext->drawPosTextH("A", 1, &pointX, 0, alphaPaint);
+ EXPECT_EQ_RECT(IntRect(0, 0, 0, 0), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
context.fillRect(FloatRect(50, 50, 50, 50), opaque, ColorSpaceDeviceRGB, CompositeSourceOver);
- EXPECT_EQ_RECT(IntRect(50, 50, 50, 50), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ 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);
- 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);
+ 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);
- EXPECT_EQ_RECT(IntRect(0, 0, 0, 0), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ platformContext->drawTextOnPath("A", 1, path, 0, alphaPaint);
+ EXPECT_EQ_RECT(IntRect(0, 0, 0, 0), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
}
TEST(PlatformContextSkiaTest, trackOpaqueWritePixelsTest)
@@ -830,9 +830,9 @@ TEST(PlatformContextSkiaTest, trackOpaqueWritePixelsTest)
bitmap.eraseColor(0);
SkCanvas canvas(bitmap);
- PlatformContextSkia platformContext(&canvas);
- platformContext.setTrackOpaqueRegion(true);
- GraphicsContext context(&platformContext);
+ GraphicsContext context(&canvas);
+ PlatformContextSkia* platformContext = context.platformContext();
+ platformContext->setTrackOpaqueRegion(true);
Color opaque(1.0f, 0.0f, 0.0f, 1.0f);
@@ -855,29 +855,29 @@ TEST(PlatformContextSkiaTest, trackOpaqueWritePixelsTest)
SkPaint paint;
paint.setXfermodeMode(SkXfermode::kSrc_Mode);
- platformContext.writePixels(opaqueBitmap, 50, 50);
- EXPECT_EQ_RECT(IntRect(50, 50, 10, 10), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ platformContext->writePixels(opaqueBitmap, 50, 50);
+ EXPECT_EQ_RECT(IntRect(50, 50, 10, 10), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
context.fillRect(FloatRect(10, 10, 90, 90), opaque, ColorSpaceDeviceRGB, CompositeSourceOver);
- EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
- platformContext.writePixels(alphaBitmap, 10, 0);
- EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ platformContext->writePixels(alphaBitmap, 10, 0);
+ EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
- platformContext.writePixels(alphaBitmap, 10, 1);
- EXPECT_EQ_RECT(IntRect(10, 11, 90, 89), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ platformContext->writePixels(alphaBitmap, 10, 1);
+ EXPECT_EQ_RECT(IntRect(10, 11, 90, 89), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
- platformContext.writePixels(alphaBitmap, 0, 10);
- EXPECT_EQ_RECT(IntRect(10, 11, 90, 89), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ platformContext->writePixels(alphaBitmap, 0, 10);
+ EXPECT_EQ_RECT(IntRect(10, 11, 90, 89), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
- platformContext.writePixels(alphaBitmap, 1, 10);
- EXPECT_EQ_RECT(IntRect(11, 11, 89, 89), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ platformContext->writePixels(alphaBitmap, 1, 10);
+ EXPECT_EQ_RECT(IntRect(11, 11, 89, 89), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
}
TEST(PlatformContextSkiaTest, trackOpaqueDrawBitmapTest)
@@ -888,9 +888,9 @@ TEST(PlatformContextSkiaTest, trackOpaqueDrawBitmapTest)
bitmap.eraseColor(0);
SkCanvas canvas(bitmap);
- PlatformContextSkia platformContext(&canvas);
- platformContext.setTrackOpaqueRegion(true);
- GraphicsContext context(&platformContext);
+ GraphicsContext context(&canvas);
+ PlatformContextSkia* platformContext = context.platformContext();
+ platformContext->setTrackOpaqueRegion(true);
Color opaque(1.0f, 0.0f, 0.0f, 1.0f);
@@ -913,29 +913,29 @@ TEST(PlatformContextSkiaTest, trackOpaqueDrawBitmapTest)
SkPaint paint;
paint.setXfermodeMode(SkXfermode::kSrc_Mode);
- platformContext.drawBitmap(opaqueBitmap, 10, 10, &paint);
- EXPECT_EQ_RECT(IntRect(10, 10, 10, 10), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ platformContext->drawBitmap(opaqueBitmap, 10, 10, &paint);
+ EXPECT_EQ_RECT(IntRect(10, 10, 10, 10), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
context.fillRect(FloatRect(10, 10, 90, 90), opaque, ColorSpaceDeviceRGB, CompositeSourceOver);
- EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
- platformContext.drawBitmap(alphaBitmap, 10, 0, &paint);
- EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ platformContext->drawBitmap(alphaBitmap, 10, 0, &paint);
+ EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
- platformContext.drawBitmap(alphaBitmap, 10, 1, &paint);
- EXPECT_EQ_RECT(IntRect(10, 11, 90, 89), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ platformContext->drawBitmap(alphaBitmap, 10, 1, &paint);
+ EXPECT_EQ_RECT(IntRect(10, 11, 90, 89), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
- platformContext.drawBitmap(alphaBitmap, 0, 10, &paint);
- EXPECT_EQ_RECT(IntRect(10, 11, 90, 89), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ platformContext->drawBitmap(alphaBitmap, 0, 10, &paint);
+ EXPECT_EQ_RECT(IntRect(10, 11, 90, 89), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
- platformContext.drawBitmap(alphaBitmap, 1, 10, &paint);
- EXPECT_EQ_RECT(IntRect(11, 11, 89, 89), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ platformContext->drawBitmap(alphaBitmap, 1, 10, &paint);
+ EXPECT_EQ_RECT(IntRect(11, 11, 89, 89), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
}
TEST(PlatformContextSkiaTest, trackOpaqueDrawBitmapRectTest)
@@ -946,9 +946,9 @@ TEST(PlatformContextSkiaTest, trackOpaqueDrawBitmapRectTest)
bitmap.eraseColor(0);
SkCanvas canvas(bitmap);
- PlatformContextSkia platformContext(&canvas);
- platformContext.setTrackOpaqueRegion(true);
- GraphicsContext context(&platformContext);
+ GraphicsContext context(&canvas);
+ PlatformContextSkia* platformContext = context.platformContext();
+ platformContext->setTrackOpaqueRegion(true);
Color opaque(1.0f, 0.0f, 0.0f, 1.0f);
@@ -971,25 +971,25 @@ TEST(PlatformContextSkiaTest, trackOpaqueDrawBitmapRectTest)
SkPaint paint;
paint.setXfermodeMode(SkXfermode::kSrc_Mode);
- platformContext.drawBitmapRect(opaqueBitmap, 0, SkRect::MakeXYWH(10, 10, 90, 90), &paint);
- EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ platformContext->drawBitmapRect(opaqueBitmap, 0, SkRect::MakeXYWH(10, 10, 90, 90), &paint);
+ EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
- platformContext.drawBitmapRect(alphaBitmap, 0, SkRect::MakeXYWH(10, 0, 10, 10), &paint);
- EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ platformContext->drawBitmapRect(alphaBitmap, 0, SkRect::MakeXYWH(10, 0, 10, 10), &paint);
+ EXPECT_EQ_RECT(IntRect(10, 10, 90, 90), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
- platformContext.drawBitmapRect(alphaBitmap, 0, SkRect::MakeXYWH(10, 0, 10, 11), &paint);
- EXPECT_EQ_RECT(IntRect(10, 11, 90, 89), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ platformContext->drawBitmapRect(alphaBitmap, 0, SkRect::MakeXYWH(10, 0, 10, 11), &paint);
+ EXPECT_EQ_RECT(IntRect(10, 11, 90, 89), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
- platformContext.drawBitmapRect(alphaBitmap, 0, SkRect::MakeXYWH(0, 10, 10, 10), &paint);
- EXPECT_EQ_RECT(IntRect(10, 11, 90, 89), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ platformContext->drawBitmapRect(alphaBitmap, 0, SkRect::MakeXYWH(0, 10, 10, 10), &paint);
+ EXPECT_EQ_RECT(IntRect(10, 11, 90, 89), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
- platformContext.drawBitmapRect(alphaBitmap, 0, SkRect::MakeXYWH(0, 10, 11, 10), &paint);
- EXPECT_EQ_RECT(IntRect(11, 11, 89, 89), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ platformContext->drawBitmapRect(alphaBitmap, 0, SkRect::MakeXYWH(0, 10, 11, 10), &paint);
+ EXPECT_EQ_RECT(IntRect(11, 11, 89, 89), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
}
TEST(PlatformContextSkiaTest, contextTransparencyLayerTest)
@@ -1000,33 +1000,33 @@ TEST(PlatformContextSkiaTest, contextTransparencyLayerTest)
bitmap.eraseColor(0);
SkCanvas canvas(bitmap);
- PlatformContextSkia platformContext(&canvas);
- platformContext.setTrackOpaqueRegion(true);
- GraphicsContext context(&platformContext);
+ GraphicsContext context(&canvas);
+ PlatformContextSkia* platformContext = context.platformContext();
+ platformContext->setTrackOpaqueRegion(true);
Color opaque(1.0f, 0.0f, 0.0f, 1.0f);
context.fillRect(FloatRect(20, 20, 10, 10), opaque, ColorSpaceDeviceRGB, CompositeSourceOver);
- EXPECT_EQ_RECT(IntRect(20, 20, 10, 10), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(20, 20, 10, 10), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
context.clearRect(FloatRect(20, 20, 10, 10));
- EXPECT_EQ_RECT(IntRect(), platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(), platformContext->opaqueRegion().asRect());
context.beginTransparencyLayer(0.5);
context.save();
context.fillRect(FloatRect(20, 20, 10, 10), opaque, ColorSpaceDeviceRGB, CompositeSourceOver);
context.restore();
context.endTransparencyLayer();
- EXPECT_EQ_RECT(IntRect(), platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(), platformContext->opaqueRegion().asRect());
context.clearRect(FloatRect(20, 20, 10, 10));
- EXPECT_EQ_RECT(IntRect(), platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(), platformContext->opaqueRegion().asRect());
context.beginTransparencyLayer(0.5);
context.fillRect(FloatRect(20, 20, 10, 10), opaque, ColorSpaceDeviceRGB, CompositeSourceOver);
context.endTransparencyLayer();
- EXPECT_EQ_RECT(IntRect(), platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(), platformContext->opaqueRegion().asRect());
}
TEST(PlatformContextSkiaTest, UnboundedDrawsAreClipped)
@@ -1037,9 +1037,9 @@ TEST(PlatformContextSkiaTest, UnboundedDrawsAreClipped)
bitmap.eraseColor(0);
SkCanvas canvas(bitmap);
- PlatformContextSkia platformContext(&canvas);
- platformContext.setTrackOpaqueRegion(true);
- GraphicsContext context(&platformContext);
+ GraphicsContext context(&canvas);
+ PlatformContextSkia* platformContext = context.platformContext();
+ platformContext->setTrackOpaqueRegion(true);
Color opaque(1.0f, 0.0f, 0.0f, 1.0f);
Color alpha(0.0f, 0.0f, 0.0f, 0.0f);
@@ -1059,8 +1059,8 @@ TEST(PlatformContextSkiaTest, UnboundedDrawsAreClipped)
// Make the device opaque in 10,10 40x40.
context.fillRect(FloatRect(10, 10, 40, 40), opaque, ColorSpaceDeviceRGB, CompositeSourceOver);
- EXPECT_EQ_RECT(IntRect(10, 10, 40, 40), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH_EXACT(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(10, 10, 40, 40), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH_EXACT(bitmap, platformContext->opaqueRegion().asRect());
// Clip to the left edge of the opaque area.
context.clip(IntRect(10, 10, 10, 40));
@@ -1072,8 +1072,8 @@ TEST(PlatformContextSkiaTest, UnboundedDrawsAreClipped)
path.addLineTo(FloatPoint(40, 40));
context.strokePath(path);
- EXPECT_EQ_RECT(IntRect(20, 10, 30, 40), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(20, 10, 30, 40), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH(bitmap, platformContext->opaqueRegion().asRect());
}
TEST(PlatformContextSkiaTest, PreserveOpaqueOnlyMattersForFirstLayer)
@@ -1084,9 +1084,9 @@ TEST(PlatformContextSkiaTest, PreserveOpaqueOnlyMattersForFirstLayer)
bitmap.eraseColor(0);
SkCanvas canvas(bitmap);
- PlatformContextSkia platformContext(&canvas);
- platformContext.setTrackOpaqueRegion(true);
- GraphicsContext context(&platformContext);
+ GraphicsContext context(&canvas);
+ PlatformContextSkia* platformContext = context.platformContext();
+ platformContext->setTrackOpaqueRegion(true);
Color opaque(1.0f, 0.0f, 0.0f, 1.0f);
Color alpha(0.0f, 0.0f, 0.0f, 0.0f);
@@ -1106,8 +1106,8 @@ TEST(PlatformContextSkiaTest, PreserveOpaqueOnlyMattersForFirstLayer)
// Make the device opaque in 10,10 40x40.
context.fillRect(FloatRect(10, 10, 40, 40), opaque, ColorSpaceDeviceRGB, CompositeSourceOver);
- EXPECT_EQ_RECT(IntRect(10, 10, 40, 40), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH_EXACT(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(10, 10, 40, 40), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH_EXACT(bitmap, platformContext->opaqueRegion().asRect());
// Begin a layer that preserves opaque.
context.setCompositeOperation(CompositeSourceOver);
@@ -1128,8 +1128,8 @@ TEST(PlatformContextSkiaTest, PreserveOpaqueOnlyMattersForFirstLayer)
context.endTransparencyLayer();
context.endTransparencyLayer();
- EXPECT_EQ_RECT(IntRect(10, 10, 40, 40), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH_EXACT(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(10, 10, 40, 40), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH_EXACT(bitmap, platformContext->opaqueRegion().asRect());
// Now begin a layer that does not preserve opaque and draw through it to the device.
context.setCompositeOperation(CompositeSourceOut);
@@ -1139,8 +1139,8 @@ TEST(PlatformContextSkiaTest, PreserveOpaqueOnlyMattersForFirstLayer)
context.fillRect(FloatRect(10, 10, 40, 40), opaque, ColorSpaceDeviceRGB, CompositeSourceOver);
context.endTransparencyLayer();
- EXPECT_EQ_RECT(IntRect(), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH_EXACT(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH_EXACT(bitmap, platformContext->opaqueRegion().asRect());
// Now we draw with a path for which it cannot compute fast bounds. This should destroy the entire opaque region.
@@ -1154,8 +1154,8 @@ TEST(PlatformContextSkiaTest, PreserveOpaqueOnlyMattersForFirstLayer)
context.strokePath(path);
context.endTransparencyLayer();
- EXPECT_EQ_RECT(IntRect(), platformContext.opaqueRegion().asRect());
- EXPECT_PIXELS_MATCH_EXACT(bitmap, platformContext.opaqueRegion().asRect());
+ EXPECT_EQ_RECT(IntRect(), platformContext->opaqueRegion().asRect());
+ EXPECT_PIXELS_MATCH_EXACT(bitmap, platformContext->opaqueRegion().asRect());
}
} // namespace
« Source/WebKit/chromium/src/painting/GraphicsContextBuilder.h ('K') | « Source/WebKit/chromium/src/painting/GraphicsContextBuilder.h ('k') | Source/WebKit/chromium/tests/TransparencyWinTest.cpp » ('j') | Source/core/page/FrameView.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698