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

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

Issue 540033002: use tryAllocPixels to check the result, allocPixels to require success (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 3 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') | Source/platform/graphics/ImageLayerChromiumTest.cpp » ('j') | 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 0fc10ec267106941a8c4fd679fa04e9a8247386a..fe18ecc722515bab7c72bec37a99dab507061de7 100644
--- a/Source/platform/graphics/GraphicsContextTest.cpp
+++ b/Source/platform/graphics/GraphicsContextTest.cpp
@@ -69,7 +69,7 @@ namespace {
TEST(GraphicsContextTest, trackOpaqueTest)
{
SkBitmap bitmap;
- ASSERT_TRUE(bitmap.allocN32Pixels(400, 400));
+ bitmap.allocN32Pixels(400, 400);
bitmap.eraseColor(0);
SkCanvas canvas(bitmap);
@@ -127,7 +127,7 @@ TEST(GraphicsContextTest, trackOpaqueTest)
TEST(GraphicsContextTest, trackOpaqueClipTest)
{
SkBitmap bitmap;
- ASSERT_TRUE(bitmap.allocN32Pixels(400, 400));
+ bitmap.allocN32Pixels(400, 400);
SkCanvas canvas(bitmap);
GraphicsContext context(&canvas);
@@ -221,7 +221,7 @@ TEST(GraphicsContextTest, trackOpaqueClipTest)
TEST(GraphicsContextTest, trackImageMask)
{
SkBitmap bitmap;
- ASSERT_TRUE(bitmap.allocN32Pixels(400, 400));
+ bitmap.allocN32Pixels(400, 400);
bitmap.eraseColor(0);
SkCanvas canvas(bitmap);
@@ -258,7 +258,7 @@ TEST(GraphicsContextTest, trackImageMask)
TEST(GraphicsContextTest, trackImageMaskWithOpaqueRect)
{
SkBitmap bitmap;
- ASSERT_TRUE(bitmap.allocN32Pixels(400, 400));
+ bitmap.allocN32Pixels(400, 400);
bitmap.eraseColor(0);
SkCanvas canvas(bitmap);
@@ -298,7 +298,7 @@ TEST(GraphicsContextTest, trackImageMaskWithOpaqueRect)
TEST(GraphicsContextTest, trackOpaqueJoinTest)
{
SkBitmap bitmap;
- ASSERT_TRUE(bitmap.allocN32Pixels(400, 400));
+ bitmap.allocN32Pixels(400, 400);
SkCanvas canvas(bitmap);
GraphicsContext context(&canvas);
@@ -355,7 +355,7 @@ TEST(GraphicsContextTest, trackOpaqueJoinTest)
TEST(GraphicsContextTest, trackOpaqueLineTest)
{
SkBitmap bitmap;
- ASSERT_TRUE(bitmap.allocN32Pixels(200, 200));
+ bitmap.allocN32Pixels(200, 200);
bitmap.eraseColor(0);
SkCanvas canvas(bitmap);
@@ -449,7 +449,7 @@ TEST(GraphicsContextTest, trackOpaqueLineTest)
TEST(GraphicsContextTest, trackOpaquePathTest)
{
SkBitmap bitmap;
- ASSERT_TRUE(bitmap.allocN32Pixels(200, 200));
+ bitmap.allocN32Pixels(200, 200);
SkCanvas canvas(bitmap);
GraphicsContext context(&canvas);
@@ -507,7 +507,7 @@ TEST(GraphicsContextTest, trackOpaquePathTest)
TEST(GraphicsContextTest, trackOpaqueImageTest)
{
SkBitmap bitmap;
- ASSERT_TRUE(bitmap.allocN32Pixels(200, 200));
+ bitmap.allocN32Pixels(200, 200);
SkCanvas canvas(bitmap);
GraphicsContext context(&canvas);
@@ -517,7 +517,7 @@ TEST(GraphicsContextTest, trackOpaqueImageTest)
Color alpha(0.0f, 0.0f, 0.0f, 0.0f);
SkBitmap opaqueBitmap;
- ASSERT_TRUE(opaqueBitmap.allocN32Pixels(10, 10, true /* opaque */));
+ opaqueBitmap.allocN32Pixels(10, 10, true /* opaque */);
for (int y = 0; y < opaqueBitmap.height(); ++y)
for (int x = 0; x < opaqueBitmap.width(); ++x)
@@ -526,7 +526,7 @@ TEST(GraphicsContextTest, trackOpaqueImageTest)
EXPECT_TRUE(opaqueImage->currentFrameKnownToBeOpaque());
SkBitmap alphaBitmap;
- ASSERT_TRUE(alphaBitmap.allocN32Pixels(10, 10));
+ alphaBitmap.allocN32Pixels(10, 10);
for (int y = 0; y < alphaBitmap.height(); ++y)
for (int x = 0; x < alphaBitmap.width(); ++x)
@@ -589,7 +589,7 @@ TEST(GraphicsContextTest, trackOpaqueImageTest)
TEST(GraphicsContextTest, trackOpaqueOvalTest)
{
SkBitmap bitmap;
- ASSERT_TRUE(bitmap.allocN32Pixels(200, 200));
+ bitmap.allocN32Pixels(200, 200);
bitmap.eraseColor(0);
SkCanvas canvas(bitmap);
@@ -645,7 +645,7 @@ TEST(GraphicsContextTest, trackOpaqueOvalTest)
TEST(GraphicsContextTest, trackOpaqueRoundedRectTest)
{
SkBitmap bitmap;
- ASSERT_TRUE(bitmap.allocN32Pixels(200, 200));
+ bitmap.allocN32Pixels(200, 200);
SkCanvas canvas(bitmap);
GraphicsContext context(&canvas);
@@ -690,7 +690,7 @@ TEST(GraphicsContextTest, trackOpaqueTextTest)
{
int width = 200, height = 200;
SkBitmap bitmap;
- ASSERT_TRUE(bitmap.allocN32Pixels(width, height));
+ bitmap.allocN32Pixels(width, height);
bitmap.eraseColor(0);
SkCanvas canvas(bitmap);
SkRect textRect = SkRect::MakeWH(width, height);
@@ -734,7 +734,7 @@ TEST(GraphicsContextTest, trackOpaqueTextTest)
TEST(GraphicsContextTest, trackOpaqueWritePixelsTest)
{
SkBitmap bitmap;
- ASSERT_TRUE(bitmap.allocN32Pixels(200, 200));
+ bitmap.allocN32Pixels(200, 200);
bitmap.eraseColor(0);
SkCanvas canvas(bitmap);
@@ -744,13 +744,13 @@ TEST(GraphicsContextTest, trackOpaqueWritePixelsTest)
Color opaque(1.0f, 0.0f, 0.0f, 1.0f);
SkBitmap opaqueBitmap;
- ASSERT_TRUE(opaqueBitmap.allocN32Pixels(10, 10, true /* opaque */));
+ opaqueBitmap.allocN32Pixels(10, 10, true /* opaque */);
for (int y = 0; y < opaqueBitmap.height(); ++y)
for (int x = 0; x < opaqueBitmap.width(); ++x)
*opaqueBitmap.getAddr32(x, y) = 0xFFFFFFFF;
SkBitmap alphaBitmap;
- ASSERT_TRUE(alphaBitmap.allocN32Pixels(10, 10));
+ alphaBitmap.allocN32Pixels(10, 10);
for (int y = 0; y < alphaBitmap.height(); ++y)
for (int x = 0; x < alphaBitmap.width(); ++x)
*alphaBitmap.getAddr32(x, y) = 0x00000000;
@@ -786,7 +786,7 @@ TEST(GraphicsContextTest, trackOpaqueWritePixelsTest)
TEST(GraphicsContextTest, trackOpaqueDrawBitmapTest)
{
SkBitmap bitmap;
- ASSERT_TRUE(bitmap.allocN32Pixels(200, 200));
+ bitmap.allocN32Pixels(200, 200);
bitmap.eraseColor(0);
SkCanvas canvas(bitmap);
@@ -796,13 +796,13 @@ TEST(GraphicsContextTest, trackOpaqueDrawBitmapTest)
Color opaque(1.0f, 0.0f, 0.0f, 1.0f);
SkBitmap opaqueBitmap;
- ASSERT_TRUE(opaqueBitmap.allocN32Pixels(10, 10, true /* opaque */));
+ opaqueBitmap.allocN32Pixels(10, 10, true /* opaque */);
for (int y = 0; y < opaqueBitmap.height(); ++y)
for (int x = 0; x < opaqueBitmap.width(); ++x)
*opaqueBitmap.getAddr32(x, y) = 0xFFFFFFFF;
SkBitmap alphaBitmap;
- ASSERT_TRUE(alphaBitmap.allocN32Pixels(10, 10));
+ alphaBitmap.allocN32Pixels(10, 10);
for (int y = 0; y < alphaBitmap.height(); ++y)
for (int x = 0; x < alphaBitmap.width(); ++x)
*alphaBitmap.getAddr32(x, y) = 0x00000000;
@@ -838,7 +838,7 @@ TEST(GraphicsContextTest, trackOpaqueDrawBitmapTest)
TEST(GraphicsContextTest, trackOpaqueDrawBitmapRectTest)
{
SkBitmap bitmap;
- ASSERT_TRUE(bitmap.allocN32Pixels(200, 200));
+ bitmap.allocN32Pixels(200, 200);
bitmap.eraseColor(0);
SkCanvas canvas(bitmap);
@@ -848,13 +848,13 @@ TEST(GraphicsContextTest, trackOpaqueDrawBitmapRectTest)
Color opaque(1.0f, 0.0f, 0.0f, 1.0f);
SkBitmap opaqueBitmap;
- ASSERT_TRUE(opaqueBitmap.allocN32Pixels(10, 10, true /* opaque */));
+ opaqueBitmap.allocN32Pixels(10, 10, true /* opaque */);
for (int y = 0; y < opaqueBitmap.height(); ++y)
for (int x = 0; x < opaqueBitmap.width(); ++x)
*opaqueBitmap.getAddr32(x, y) = 0xFFFFFFFF;
SkBitmap alphaBitmap;
- ASSERT_TRUE(alphaBitmap.allocN32Pixels(10, 10));
+ alphaBitmap.allocN32Pixels(10, 10);
for (int y = 0; y < alphaBitmap.height(); ++y)
for (int x = 0; x < alphaBitmap.width(); ++x)
*alphaBitmap.getAddr32(x, y) = 0x00000000;
@@ -886,7 +886,7 @@ TEST(GraphicsContextTest, trackOpaqueDrawBitmapRectTest)
TEST(GraphicsContextTest, contextTransparencyLayerTest)
{
SkBitmap bitmap;
- ASSERT_TRUE(bitmap.allocN32Pixels(400, 400));
+ bitmap.allocN32Pixels(400, 400);
bitmap.eraseColor(0);
SkCanvas canvas(bitmap);
@@ -920,7 +920,7 @@ TEST(GraphicsContextTest, contextTransparencyLayerTest)
TEST(GraphicsContextTest, UnboundedDrawsAreClipped)
{
SkBitmap bitmap;
- ASSERT_TRUE(bitmap.allocN32Pixels(400, 400));
+ bitmap.allocN32Pixels(400, 400);
bitmap.eraseColor(0);
SkCanvas canvas(bitmap);
@@ -965,7 +965,7 @@ TEST(GraphicsContextTest, UnboundedDrawsAreClipped)
TEST(GraphicsContextTest, PreserveOpaqueOnlyMattersForFirstLayer)
{
SkBitmap bitmap;
- ASSERT_TRUE(bitmap.allocN32Pixels(400, 400));
+ bitmap.allocN32Pixels(400, 400);
bitmap.eraseColor(0);
SkCanvas canvas(bitmap);
@@ -1045,7 +1045,7 @@ TEST(GraphicsContextTest, PreserveOpaqueOnlyMattersForFirstLayer)
TEST(GraphicsContextTest, OpaqueRegionForLayerWithNonRectDeviceClip)
{
SkBitmap bitmap;
- ASSERT_TRUE(bitmap.allocN32Pixels(100, 100));
+ bitmap.allocN32Pixels(100, 100);
bitmap.eraseColor(0);
SkCanvas canvas(bitmap);
@@ -1085,7 +1085,7 @@ TEST(GraphicsContextTest, OpaqueRegionForLayerWithNonRectDeviceClip)
TEST(GraphicsContextTest, OpaqueRegionForLayerWithRectDeviceClip)
{
SkBitmap bitmap;
- ASSERT_TRUE(bitmap.allocN32Pixels(100, 100));
+ bitmap.allocN32Pixels(100, 100);
bitmap.eraseColor(0);
SkCanvas canvas(bitmap);
@@ -1123,7 +1123,7 @@ TEST(GraphicsContextTest, OpaqueRegionForLayerWithRectDeviceClip)
TEST(GraphicsContextTest, RecordingTotalMatrix)
{
SkBitmap bitmap;
- ASSERT_TRUE(bitmap.allocN32Pixels(400, 400));
+ bitmap.allocN32Pixels(400, 400);
bitmap.eraseColor(0);
SkCanvas canvas(bitmap);
GraphicsContext context(&canvas);
« no previous file with comments | « Source/platform/graphics/GraphicsContext.cpp ('k') | Source/platform/graphics/ImageLayerChromiumTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698