Revert of Rename SkDrawPictureCallback to SkPicture::AbortCallback

src/core/SkRecordDraw.cpp

Index: src/core/SkRecordDraw.cpp
diff --git a/src/core/SkRecordDraw.cpp b/src/core/SkRecordDraw.cpp
index a59d325eefc50fd4db4d31bab19cf56700815a0b..6b1de4c6132c64e78ce82c9216a028761e9e930a 100644
--- a/src/core/SkRecordDraw.cpp
+++ b/src/core/SkRecordDraw.cpp
@@ -15,7 +15,7 @@
                   SkCanvasDrawable* const drawables[],
                   int drawableCount,
                   const SkBBoxHierarchy* bbh,
-                  SkPicture::AbortCallback* callback) {
+                  SkDrawPictureCallback* callback) {
     SkAutoCanvasRestore saveRestore(canvas, true /*save now, restore at exit*/);
 
     if (bbh) {
@@ -34,7 +34,7 @@
 
         SkRecords::Draw draw(canvas, drawablePicts, drawables, drawableCount);
         for (int i = 0; i < ops.count(); i++) {
-            if (callback && callback->abort()) {
+            if (callback && callback->abortDrawing()) {
                 return;
             }
             // This visit call uses the SkRecords::Draw::operator() to call
@@ -46,7 +46,7 @@
         // Draw all ops.
         SkRecords::Draw draw(canvas, drawablePicts, drawables, drawableCount);
         for (unsigned i = 0; i < record.count(); i++) {
-            if (callback && callback->abort()) {
+            if (callback && callback->abortDrawing()) {
                 return;
             }
             // This visit call uses the SkRecords::Draw::operator() to call