Make RTree handle the case where the playback canvas has empty clip bounds

tests/PictureTest.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBBoxHierarchy.h"
 #include "SkBlurImageFilter.h"
 #include "SkCanvas.h"
@@ skipping 1517 matching lines @@
         // RTree
         SkRTreeFactory factory;
         SkPictureRecorder recorder;
         recorder.beginRecording(1, 1, &factory);
         SkAutoTUnref<SkPicture> picture(recorder.endRecording());
 
         canvas.drawPicture(picture);
     }
 }
 
+static void test_draw_empty_clip(skiatest::Reporter* reporter) {
+    SkBitmap result;
+    make_bm(&result, 2, 2, SK_ColorGREEN, false);
+
+    // Test playing a non-empty picture into a canvas with an empty clip
+    SkCanvas destinationCanvas(result);
+    destinationCanvas.clipRect(SkRect::MakeXYWH(10, 10, 1, 1), SkRegion::kIntersect_Op);
+    SkPaint paint;
+
+    {
+        // stock SkPicture
+        SkPictureRecorder recorder;
+        SkCanvas* canvas = recorder.beginRecording(3, 3);

[reed1, 2014/10/28 17:39:51]

we seem to make this picture three times, but only wi/ diff opts to the "begin"
method. Can we refactor this to not have so much copy/paste? It might also make
it easy to later extend for other bbox options (or diff picture content).

+        canvas->drawRect(SkRect::MakeXYWH(0, 0, 3, 3), paint);
+        SkAutoTUnref<SkPicture> picture(recorder.endRecording());
+
+        destinationCanvas.drawPicture(picture);
+        REPORTER_ASSERT(reporter, SK_ColorGREEN == result.getColor(0, 0));
+    }
+
+    {
+        // tile grid
+        SkTileGridFactory::TileGridInfo gridInfo;
+        gridInfo.fMargin.setEmpty();
+        gridInfo.fOffset.setZero();
+        gridInfo.fTileInterval.set(1, 1);
+
+        SkTileGridFactory factory(gridInfo);
+        SkPictureRecorder recorder;
+        SkCanvas* canvas = recorder.beginRecording(3, 3, &factory);
+        canvas->drawRect(SkRect::MakeXYWH(0, 0, 3, 3), paint);
+        SkAutoTUnref<SkPicture> picture(recorder.endRecording());
+
+        destinationCanvas.drawPicture(picture);
+        REPORTER_ASSERT(reporter, SK_ColorGREEN == result.getColor(0, 0));
+    }
+
+    {
+        // RTree
+        SkRTreeFactory factory;
+        SkPictureRecorder recorder;
+        SkCanvas* canvas = recorder.beginRecording(3, 3, &factory);
+        canvas->drawRect(SkRect::MakeXYWH(0, 0, 3, 3), paint);
+        SkAutoTUnref<SkPicture> picture(recorder.endRecording());
+
+        destinationCanvas.drawPicture(picture);
+        REPORTER_ASSERT(reporter, SK_ColorGREEN == result.getColor(0, 0));
+    }
+}
+
 static void test_clip_bound_opt(skiatest::Reporter* reporter) {
     // Test for crbug.com/229011
     SkRect rect1 = SkRect::MakeXYWH(SkIntToScalar(4), SkIntToScalar(4),
                                     SkIntToScalar(2), SkIntToScalar(2));
     SkRect rect2 = SkRect::MakeXYWH(SkIntToScalar(7), SkIntToScalar(7),
                                     SkIntToScalar(1), SkIntToScalar(1));
     SkRect rect3 = SkRect::MakeXYWH(SkIntToScalar(6), SkIntToScalar(6),
                                     SkIntToScalar(1), SkIntToScalar(1));
 
     SkPath invPath;
@@ skipping 211 matching lines @@
     test_peephole();
 #if SK_SUPPORT_GPU
     test_gpu_veto(reporter);
 #endif
     test_has_text(reporter);
     test_analysis(reporter);
     test_gatherpixelrefs(reporter);
     test_gatherpixelrefsandrects(reporter);
     test_bitmap_with_encoded_data(reporter);
     test_draw_empty(reporter);
+    test_draw_empty_clip(reporter);
     test_clip_bound_opt(reporter);
     test_clip_expansion(reporter);
     test_hierarchical(reporter);
     test_gen_id(reporter);
 }
 
 #if SK_SUPPORT_GPU
 DEF_GPUTEST(GPUPicture, reporter, factory) {
     test_gpu_picture_optimization(reporter, factory);
 }
@@ skipping 141 matching lines @@
 
     // The picture shares the immutable pixels but copies the mutable ones.
     REPORTER_ASSERT(r, mut.pixelRef()->unique());
     REPORTER_ASSERT(r, !immut.pixelRef()->unique());
 
     // When the picture goes away, it's just our bitmaps holding the refs.
     pic.reset(NULL);
     REPORTER_ASSERT(r, mut.pixelRef()->unique());
     REPORTER_ASSERT(r, immut.pixelRef()->unique());
 }