Deprecate SkPicture::clone().

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 "SkBlurImageFilter.h"
 #include "SkCanvas.h"
 #include "SkColorPriv.h"
@@ skipping 1256 matching lines @@
     context.fReporter = reporter;
     SkSetErrorCallback(assert_one_parse_error_cb, &context);
     SkMemoryStream pictureStream(picture1);
     SkClearLastError();
     SkAutoUnref pictureFromStream(SkPicture::CreateFromStream(&pictureStream, NULL));
     REPORTER_ASSERT(reporter, pictureFromStream.get() != NULL);
     SkClearLastError();
     SkSetErrorCallback(NULL, NULL);
 }
 
-static void test_clone_empty(skiatest::Reporter* reporter) {
-    // This is a regression test for crbug.com/172062
-    // Before the fix, we used to crash accessing a null pointer when we
-    // had a picture with no paints. This test passes by not crashing.
-    {
-        SkPictureRecorder recorder;
-        recorder.beginRecording(1, 1);
-        SkAutoTUnref<SkPicture> picture(recorder.endRecording());
-        SkAutoTUnref<SkPicture> destPicture(picture->clone());
-        REPORTER_ASSERT(reporter, NULL != destPicture);
-    }
-}
-
 static void test_draw_empty(skiatest::Reporter* reporter) {
     SkBitmap result;
     make_bm(&result, 2, 2, SK_ColorBLACK, false);
 
     SkCanvas canvas(result);
 
     {
         // stock SkPicture
         SkPictureRecorder recorder;
         recorder.beginRecording(1, 1);
@@ skipping 249 matching lines @@
 
     // both pictures should have different ids
     REPORTER_ASSERT(reporter, hasData->uniqueID() != empty.uniqueID());
 
     // test out copy constructor
     SkPicture copyWithData(*hasData);
     REPORTER_ASSERT(reporter, hasData->uniqueID() == copyWithData.uniqueID());
 
     SkPicture emptyCopy(empty);
     REPORTER_ASSERT(reporter, empty.uniqueID() != emptyCopy.uniqueID());
-
-    // test out clone
-    {
-        SkAutoTUnref<SkPicture> cloneWithData(hasData->clone());
-        REPORTER_ASSERT(reporter, hasData->uniqueID() == cloneWithData->uniqueID());
-
-        SkAutoTUnref<SkPicture> emptyClone(empty.clone());
-        REPORTER_ASSERT(reporter, empty.uniqueID() != emptyClone->uniqueID());
-    }
 }
 
 DEF_TEST(Picture, reporter) {
 #ifdef SK_DEBUG
     test_deleting_empty_playback();
     test_serializing_empty_picture();
 #else
     test_bad_bitmap();
 #endif
     test_unbalanced_save_restores(reporter);
     test_peephole();
 #if SK_SUPPORT_GPU
     test_gpu_veto(reporter);
 #endif
     test_gatherpixelrefs(reporter);
     test_gatherpixelrefsandrects(reporter);
     test_bitmap_with_encoded_data(reporter);
-    test_clone_empty(reporter);
     test_draw_empty(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 26 matching lines @@
     SkAutoTUnref<SkPicture> picture(recorder.endRecording());
 }
 
 DEF_TEST(Canvas_EmptyBitmap, r) {
     SkBitmap dst;
     dst.allocN32Pixels(10, 10);
     SkCanvas canvas(dst);
 
     test_draw_bitmaps(&canvas);
 }