ImageBuffer-less SVG masking and clipping.

Source/core/platform/graphics/GraphicsContextTest.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
@@ skipping 197 matching lines @@
     context.restore();
 
     // Another non-rectangular clip.
     context.save();
     context.clip(IntRect(30, 30, 20, 20));
     context.clipOut(IntRect(30, 30, 10, 10));
     context.fillRect(FloatRect(10, 10, 90, 90), opaque, CompositeSourceOver);
     EXPECT_EQ_RECT(IntRect(), context.opaqueRegion().asRect());
     EXPECT_PIXELS_MATCH(bitmap, context.opaqueRegion().asRect());
     context.restore();
-
-    OwnPtr<ImageBuffer> alphaImage = ImageBuffer::create(IntSize(100, 100));
-    alphaImage->context()->fillRect(IntRect(0, 0, 100, 100), alpha);
-
-    // Clipping with a non-opaque Image (there is no way to mark an ImageBuffer as opaque today).
-    context.save();
-    context.clipToImageBuffer(alphaImage.get(), FloatRect(30, 30, 10, 10));
-    context.fillRect(FloatRect(10, 10, 90, 90), opaque, CompositeSourceOver);
-    context.restore();
-    EXPECT_EQ_RECT(IntRect(), context.opaqueRegion().asRect());
-    EXPECT_PIXELS_MATCH(bitmap, context.opaqueRegion().asRect());
 }
 
 TEST(GraphicsContextTest, trackImageMask)
 {
     SkBitmap bitmap;
     bitmap.setConfig(SkBitmap::kARGB_8888_Config, 400, 400);
     bitmap.allocPixels();
     bitmap.eraseColor(0);
     SkCanvas canvas(bitmap);
 
@@ skipping 13 matching lines @@
 
     context.setCompositeOperation(CompositeDestinationIn);
     context.beginTransparencyLayer(1);
 
     OwnPtr<ImageBuffer> alphaImage = ImageBuffer::create(IntSize(100, 100));
     alphaImage->context()->fillRect(IntRect(0, 0, 100, 100), alpha);
 
     context.setCompositeOperation(CompositeSourceOver);
     context.drawImageBuffer(alphaImage.get(), FloatRect(10, 10, 10, 10));
 
-    context.endTransparencyLayer();
-    context.endTransparencyLayer();
+    context.endLayer();
+    context.endLayer();
 
     EXPECT_EQ_RECT(IntRect(), context.opaqueRegion().asRect());
     EXPECT_PIXELS_MATCH_EXACT(bitmap, context.opaqueRegion().asRect());
 }
 
 TEST(GraphicsContextTest, trackImageMaskWithOpaqueRect)
 {
     SkBitmap bitmap;
     bitmap.setConfig(SkBitmap::kARGB_8888_Config, 400, 400);
     bitmap.allocPixels();
@@ skipping 19 matching lines @@
 
     OwnPtr<ImageBuffer> alphaImage = ImageBuffer::create(IntSize(100, 100));
     alphaImage->context()->fillRect(IntRect(0, 0, 100, 100), alpha);
 
     context.setCompositeOperation(CompositeSourceOver);
     context.drawImageBuffer(alphaImage.get(), FloatRect(10, 10, 10, 10));
 
     // We can't have an opaque mask actually, but we can pretend here like it would look if we did.
     context.fillRect(FloatRect(12, 12, 3, 3), opaque, CompositeSourceOver);
 
-    context.endTransparencyLayer();
-    context.endTransparencyLayer();
+    context.endLayer();
+    context.endLayer();
 
     EXPECT_EQ_RECT(IntRect(12, 12, 3, 3), context.opaqueRegion().asRect());
     EXPECT_PIXELS_MATCH_EXACT(bitmap, context.opaqueRegion().asRect());
 }
 
 TEST(GraphicsContextTest, trackOpaqueJoinTest)
 {
     SkBitmap bitmap;
     bitmap.setConfig(SkBitmap::kARGB_8888_Config, 400, 400);
     bitmap.allocPixels();
@@ skipping 638 matching lines @@
     EXPECT_EQ_RECT(IntRect(20, 20, 10, 10), context.opaqueRegion().asRect());
     EXPECT_PIXELS_MATCH(bitmap, context.opaqueRegion().asRect());
 
     context.clearRect(FloatRect(20, 20, 10, 10));
     EXPECT_EQ_RECT(IntRect(), context.opaqueRegion().asRect());
 
     context.beginTransparencyLayer(0.5);
     context.save();
     context.fillRect(FloatRect(20, 20, 10, 10), opaque, CompositeSourceOver);
     context.restore();
-    context.endTransparencyLayer();
+    context.endLayer();
     EXPECT_EQ_RECT(IntRect(), context.opaqueRegion().asRect());
 
     context.clearRect(FloatRect(20, 20, 10, 10));
     EXPECT_EQ_RECT(IntRect(), context.opaqueRegion().asRect());
 
     context.beginTransparencyLayer(0.5);
     context.fillRect(FloatRect(20, 20, 10, 10), opaque, CompositeSourceOver);
-    context.endTransparencyLayer();
+    context.endLayer();
     EXPECT_EQ_RECT(IntRect(), context.opaqueRegion().asRect());
 }
 
 TEST(GraphicsContextTest, UnboundedDrawsAreClipped)
 {
     SkBitmap bitmap;
     bitmap.setConfig(SkBitmap::kARGB_8888_Config, 400, 400);
     bitmap.allocPixels();
     bitmap.eraseColor(0);
     SkCanvas canvas(bitmap);
@@ skipping 78 matching lines @@
 
     // This should not destroy the device opaqueness.
     context.fillRect(FloatRect(10, 10, 40, 40), opaque, CompositeSourceOver);
 
     // This should not destroy the device opaqueness either.
     context.setFillColor(opaque);
     path.moveTo(FloatPoint(10, 10));
     path.addLineTo(FloatPoint(40, 40));
     context.strokePath(path);
 
-    context.endTransparencyLayer();
-    context.endTransparencyLayer();
+    context.endLayer();
+    context.endLayer();
     EXPECT_EQ_RECT(IntRect(10, 10, 40, 40), context.opaqueRegion().asRect());
     EXPECT_PIXELS_MATCH_EXACT(bitmap, context.opaqueRegion().asRect());
 
     // Now begin a layer that does not preserve opaque and draw through it to the device.
     context.setCompositeOperation(CompositeSourceOut);
     context.beginTransparencyLayer(0.5);
 
     // This should destroy the device opaqueness.
     context.fillRect(FloatRect(10, 10, 40, 40), opaque, CompositeSourceOver);
 
-    context.endTransparencyLayer();
+    context.endLayer();
     EXPECT_EQ_RECT(IntRect(), context.opaqueRegion().asRect());
     EXPECT_PIXELS_MATCH_EXACT(bitmap, context.opaqueRegion().asRect());
 
     // Now we draw with a path for which it cannot compute fast bounds. This should destroy the entire opaque region.
 
     context.setCompositeOperation(CompositeSourceOut);
     context.beginTransparencyLayer(0.5);
 
     // This should nuke the device opaqueness.
     context.setFillColor(opaque);
     path.moveTo(FloatPoint(10, 10));
     path.addLineTo(FloatPoint(40, 40));
     context.strokePath(path);
 
-    context.endTransparencyLayer();
+    context.endLayer();
     EXPECT_EQ_RECT(IntRect(), context.opaqueRegion().asRect());
     EXPECT_PIXELS_MATCH_EXACT(bitmap, context.opaqueRegion().asRect());
 }
 
 } // namespace