test (and fix) clip_restriction in canvas

BUG=skia:

Change-Id: I86d25d0fd82be35d01471fba59f77b360be5373c
Reviewed-on: https://skia-review.googlesource.com/9995
Reviewed-by: Derek Sollenberger <djsollen@google.com>
Commit-Queue: Derek Sollenberger <djsollen@google.com>

1 files changed, 4 insertions, 11 deletions

diff --git a/bench/PDFBench.cpp b/bench/PDFBench.cpp
index e0d4934bce..3716ff3be0 100644
--- a/bench/PDFBench.cpp
+++ b/bench/PDFBench.cpp
@@ -17,16 +17,9 @@
 #include "SkStream.h"
 
 namespace {
-struct NullWStream : public SkWStream {
-    NullWStream() : fN(0) {}
-    bool write(const void*, size_t n) override { fN += n; return true; }
-    size_t bytesWritten() const override { return fN; }
-    size_t fN;
-};
-
 struct WStreamWriteTextBenchmark : public Benchmark {
     std::unique_ptr<SkWStream> fWStream;
-    WStreamWriteTextBenchmark() : fWStream(new NullWStream) {}
+    WStreamWriteTextBenchmark() : fWStream(new SkNullWStream) {}
     const char* onGetName() override { return "WStreamWriteText"; }
     bool isSuitableFor(Backend backend) override {
         return backend == kNonRendering_Backend;
@@ -53,7 +46,7 @@ DEF_BENCH(return new WStreamWriteTextBenchmark;)
 namespace {
 static void test_pdf_object_serialization(const sk_sp<SkPDFObject> object) {
     // SkDebugWStream wStream;
-    NullWStream wStream;
+    SkNullWStream wStream;
     SkPDFObjNumMap objNumMap;
     objNumMap.addObjectRecursively(object.get());
     for (int i = 0; i < objNumMap.objects().count(); ++i) {
@@ -220,7 +213,7 @@ struct PDFShaderBench : public Benchmark {
     void onDraw(int loops, SkCanvas*) final {
         SkASSERT(fShader);
         while (loops-- > 0) {
-            NullWStream nullStream;
+            SkNullWStream nullStream;
             SkPDFDocument doc(&nullStream, nullptr, 72,
                               SkDocument::PDFMetadata(), nullptr, false);
             sk_sp<SkPDFObject> shader(
@@ -233,7 +226,7 @@ struct PDFShaderBench : public Benchmark {
 
 struct WritePDFTextBenchmark : public Benchmark {
     std::unique_ptr<SkWStream> fWStream;
-    WritePDFTextBenchmark() : fWStream(new NullWStream) {}
+    WritePDFTextBenchmark() : fWStream(new SkNullWStream) {}
     const char* onGetName() override { return "WritePDFText"; }
     bool isSuitableFor(Backend backend) override {
         return backend == kNonRendering_Backend;