Revert of Rename SkDrawPictureCallback to SkPicture::AbortCallback

include/core/SkPicture.h

 /*
  * Copyright 2007 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkPicture_DEFINED
 #define SkPicture_DEFINED
 
+#include "SkBitmap.h"
+#include "SkDrawPictureCallback.h"
 #include "SkImageDecoder.h"
 #include "SkRefCnt.h"
 #include "SkTDArray.h"
 
 #if SK_SUPPORT_GPU
 class GrContext;
 #endif
 
-class SkBitmap;
 class SkBBoxHierarchy;
 class SkCanvas;
 class SkData;
 class SkPictureData;
 class SkPixelSerializer;
 class SkStream;
 class SkWStream;
 
 struct SkPictInfo;
 
@@ skipping 63 matching lines @@
      *  decoding, the decoder must be set on the SkReadBuffer parameter by calling
      *  SkReadBuffer::setBitmapDecoder() before calling SkPicture::CreateFromBuffer().
      *  @param SkReadBuffer Serialized picture data.
      *  @return A new SkPicture representing the serialized data, or NULL if the buffer is
      *          invalid.
      */
     static SkPicture* CreateFromBuffer(SkReadBuffer&);
 
     ~SkPicture();
 
-    /**
-    *  Subclasses of this can be passed to playback(). During the playback
-    *  of the picture, this callback will periodically be invoked. If its
-    *  abort() returns true, then picture playback will be interrupted.
-    *
-    *  The resulting drawing is undefined, as there is no guarantee how often the
-    *  callback will be invoked. If the abort happens inside some level of nested
-    *  calls to save(), restore will automatically be called to return the state
-    *  to the same level it was before the playback call was made.
-    */
-    class AbortCallback {
-    public:
-        AbortCallback() {}
-        virtual ~AbortCallback() {}
-
-        virtual bool abort() = 0;
-    };
-
     /** Replays the drawing commands on the specified canvas. Note that
         this has the effect of unfurling this picture into the destination
         canvas. Using the SkCanvas::drawPicture entry point gives the destination
         canvas the option of just taking a ref.
         @param canvas the canvas receiving the drawing commands.
         @param callback a callback that allows interruption of playback
     */
-    void playback(SkCanvas* canvas, AbortCallback* = NULL) const;
+    void playback(SkCanvas* canvas, SkDrawPictureCallback* = NULL) const;
 
     /** Return the cull rect used when creating this picture: { 0, 0, cullWidth, cullHeight }.
         It does not necessarily reflect the bounds of what has been recorded into the picture.
         @return the cull rect used to create this picture
     */
     SkRect cullRect() const { return fCullRect; }
 
     /** Return a non-zero, unique value representing the picture.
      */
     uint32_t uniqueID() const { return fUniqueID; }
@@ skipping 167 matching lines @@
 
     friend class SkPictureRecorder;            // SkRecord-based constructor.
     friend class GrLayerHoister;               // access to fRecord
     friend class ReplaceDraw;
     friend class SkPictureUtils;
     friend class SkRecordedDrawable;
 };
 SK_COMPILE_ASSERT(sizeof(SkPicture) <= 96, SkPictureSize);
 
 #endif