Alter SkCanvas::drawPicture (devirtualize, take const SkPicture, take pointer)

tests/ImageFilterTest.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBicubicImageFilter.h"
 #include "SkBitmap.h"
 #include "SkBitmapDevice.h"
@@ skipping 473 matching lines @@
     recordingCanvas->saveLayer(NULL, &paint);
     SkPaint solidPaint;
     solidPaint.setColor(0xFFFFFFFF);
     recordingCanvas->save();
     recordingCanvas->scale(SkIntToScalar(10), SkIntToScalar(10));
     recordingCanvas->drawRect(SkRect::Make(SkIRect::MakeWH(100, 100)), solidPaint);
     recordingCanvas->restore(); // scale
     recordingCanvas->restore(); // saveLayer
     SkAutoTUnref<SkPicture> picture(recorder.endRecording());
 
-    canvas.drawPicture(*picture);
+    canvas.drawPicture(picture);
 }
 
 DEF_TEST(ImageFilterPictureImageFilterTest, reporter) {
 
     SkRTreeFactory factory;
     SkPictureRecorder recorder;
     SkCanvas* recordingCanvas = recorder.beginRecording(1, 1, &factory, 0);
 
     // Create an SkPicture which simply draws a green 1x1 rectangle.
     SkPaint greenPaint;
@@ skipping 17 matching lines @@
     outerCanvas->drawRect(SkRect::Make(SkIRect::MakeWH(1, 1)), redPaintWithFilter);
     SkAutoTUnref<SkPicture> outerPicture(outerRecorder.endRecording());
 
     SkBitmap bitmap;
     bitmap.allocN32Pixels(1, 1);
     SkBitmapDevice device(bitmap);
     SkCanvas canvas(&device);
 
     // The result here should be green, since the filter replaces the primitive's red interior.
     canvas.clear(0x0);
-    canvas.drawPicture(*outerPicture);
+    canvas.drawPicture(outerPicture);
     uint32_t pixel = *bitmap.getAddr32(0, 0);
     REPORTER_ASSERT(reporter, pixel == SK_ColorGREEN);
 
     // Check that, for now, SkPictureImageFilter does not serialize or
     // deserialize its contained picture when the filter is serialized
     // cross-process. Do this by "laundering" it through SkValidatingReadBuffer.
     SkAutoTUnref<SkData> data(SkValidatingSerializeFlattenable(imageFilter.get()));
     SkAutoTUnref<SkFlattenable> flattenable(SkValidatingDeserializeFlattenable(
         data->data(), data->size(), SkImageFilter::GetFlattenableType()));
     SkImageFilter* unflattenedFilter = static_cast<SkImageFilter*>(flattenable.get());
 
     redPaintWithFilter.setImageFilter(unflattenedFilter);
     SkPictureRecorder crossProcessRecorder;
     SkCanvas* crossProcessCanvas = crossProcessRecorder.beginRecording(1, 1, &factory, 0);
     crossProcessCanvas->drawRect(SkRect::Make(SkIRect::MakeWH(1, 1)), redPaintWithFilter);
     SkAutoTUnref<SkPicture> crossProcessPicture(crossProcessRecorder.endRecording());
 
     canvas.clear(0x0);
-    canvas.drawPicture(*crossProcessPicture);
+    canvas.drawPicture(crossProcessPicture);
     pixel = *bitmap.getAddr32(0, 0);
     // The result here should not be green, since the filter draws nothing.
     REPORTER_ASSERT(reporter, pixel != SK_ColorGREEN);
 }
 
 DEF_TEST(ImageFilterEmptySaveLayerTest, reporter) {
 
     // Even when there's an empty saveLayer()/restore(), ensure that an image
     // filter or color filter which affects transparent black still draws.
 
@@ skipping 15 matching lines @@
     colorFilterPaint.setColorFilter(green.get());
 
     SkRect bounds = SkRect::MakeWH(10, 10);
 
     SkCanvas* recordingCanvas = recorder.beginRecording(10, 10, &factory, 0);
     recordingCanvas->saveLayer(&bounds, &imageFilterPaint);
     recordingCanvas->restore();
     SkAutoTUnref<SkPicture> picture(recorder.endRecording());
 
     canvas.clear(0);
-    canvas.drawPicture(*picture);
+    canvas.drawPicture(picture);
     uint32_t pixel = *bitmap.getAddr32(0, 0);
     REPORTER_ASSERT(reporter, pixel == SK_ColorGREEN);
 
     recordingCanvas = recorder.beginRecording(10, 10, &factory, 0);
     recordingCanvas->saveLayer(NULL, &imageFilterPaint);
     recordingCanvas->restore();
     SkAutoTUnref<SkPicture> picture2(recorder.endRecording());
 
     canvas.clear(0);
-    canvas.drawPicture(*picture2);
+    canvas.drawPicture(picture2);
     pixel = *bitmap.getAddr32(0, 0);
     REPORTER_ASSERT(reporter, pixel == SK_ColorGREEN);
 
     recordingCanvas = recorder.beginRecording(10, 10, &factory, 0);
     recordingCanvas->saveLayer(&bounds, &colorFilterPaint);
     recordingCanvas->restore();
     SkAutoTUnref<SkPicture> picture3(recorder.endRecording());
 
     canvas.clear(0);
-    canvas.drawPicture(*picture3);
+    canvas.drawPicture(picture3);
     pixel = *bitmap.getAddr32(0, 0);
     REPORTER_ASSERT(reporter, pixel == SK_ColorGREEN);
 }
 
 static void test_huge_blur(SkBaseDevice* device, skiatest::Reporter* reporter) {
     SkCanvas canvas(device);
 
     SkBitmap bitmap;
     bitmap.allocN32Pixels(100, 100);
     bitmap.eraseARGB(0, 0, 0, 0);
@@ skipping 135 matching lines @@
 }
 
 DEF_GPUTEST(XfermodeImageFilterCroppedInputGPU, reporter, factory) {
     GrContext* context = factory->get(static_cast<GrContextFactory::GLContextType>(0));
     SkAutoTUnref<SkGpuDevice> device(SkGpuDevice::Create(context,
                                                          SkImageInfo::MakeN32Premul(1, 1),
                                                          0));
     test_xfermode_cropped_input(device, reporter);
 }
 #endif