Revert of Rename SkDrawPictureCallback to SkPicture::AbortCallback

include/core/SkDrawPictureCallback.h

Index: include/core/SkDrawPictureCallback.h
diff --git a/include/core/SkDrawPictureCallback.h b/include/core/SkDrawPictureCallback.h
index ea30f59a24c0227b1c99c00b1ff13528102c8721..d5a360ee8ee08029d44705912051b3906240be64 100644
--- a/include/core/SkDrawPictureCallback.h
+++ b/include/core/SkDrawPictureCallback.h
@@ -10,9 +10,6 @@
 
 #include "SkTypes.h"
 
-#ifdef SK_LEGACY_DRAWPICTURECALLBACK
-#include "SkPicture.h"
-
 /**
  *  Subclasses of this can be passed to canvas.drawPicture(). During the drawing
  *  of the picture, this callback will periodically be invoked. If its
@@ -23,12 +20,12 @@
  *  calls to save(), restore will automatically be called to return the state
  *  to the same level it was before the drawPicture call was made.
  */
-class SK_API SkDrawPictureCallback : public SkPicture::AbortCallback {
+class SK_API SkDrawPictureCallback {
 public:
+    SkDrawPictureCallback() {}
+    virtual ~SkDrawPictureCallback() {}
+
     virtual bool abortDrawing() = 0;
+};
 
-    bool abort() SK_OVERRIDE { return this->abortDrawing(); }
-};
-#endif
-
-#endif // SkDrawPictureCallback_DEFINED
+#endif//SkDrawPictureCallback_DEFINED