1 files changed, 29 insertions, 3 deletions
diff --git a/tests/PipeTest.cpp b/tests/PipeTest.cpp
index 37242232d4..7790c1695d 100644
--- a/tests/PipeTest.cpp
+++ b/tests/PipeTest.cpp
@@ -10,16 +10,40 @@
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkGPipe.h"
+#include "SkPaint.h"
+#include "SkShader.h"
 #include "Test.h"
 
 // Ensures that the pipe gracefully handles drawing an invalid bitmap.
-static void testDrawingBadBitmap(skiatest::Reporter* reporter, SkCanvas* pipeCanvas) {
+static void testDrawingBadBitmap(SkCanvas* pipeCanvas) {
     SkBitmap badBitmap;
     badBitmap.setConfig(SkBitmap::kNo_Config, 5, 5);
     pipeCanvas->drawBitmap(badBitmap, 0, 0);
 }
 
-static void test_pipeTests(skiatest::Reporter* reporter) {
+// Ensure that pipe gracefully handles attempting to draw after endRecording is called on the
+// SkGPipeWriter.
+static void testDrawingAfterEndRecording(SkCanvas* canvas) {
+    PipeController pc(canvas);
+    SkGPipeWriter writer;
+    SkCanvas* pipeCanvas = writer.startRecording(&pc, SkGPipeWriter::kCrossProcess_Flag);
+    writer.endRecording();
+
+    SkBitmap bm;
+    bm.setConfig(SkBitmap::kARGB_8888_Config, 2, 2);
+    bm.allocPixels();
+    bm.eraseColor(0);
+
+    SkShader* shader = SkShader::CreateBitmapShader(bm, SkShader::kClamp_TileMode,
+                                                    SkShader::kClamp_TileMode);
+    SkPaint paint;
+    paint.setShader(shader)->unref();
+    pipeCanvas->drawPaint(paint);
+
+    pipeCanvas->drawBitmap(bm, 0, 0);
+}
+
+static void test_pipeTests(skiatest::Reporter*) {
     SkBitmap bitmap;
     bitmap.setConfig(SkBitmap::kARGB_8888_Config, 64, 64);
     SkCanvas canvas(bitmap);
@@ -27,8 +51,10 @@ static void test_pipeTests(skiatest::Reporter* reporter) {
     PipeController pipeController(&canvas);
     SkGPipeWriter writer;
     SkCanvas* pipeCanvas = writer.startRecording(&pipeController);
-    testDrawingBadBitmap(reporter, pipeCanvas);
+    testDrawingBadBitmap(pipeCanvas);
     writer.endRecording();
+
+    testDrawingAfterEndRecording(&canvas);
 }
 
 #include "TestClassDef.h"