clean up SkPicture include

Get SkPicture.h ready for documenting.

- remove private methods
- move private forward declarations
- name parameters

R=reed@google.com, bsalomon@google.com

Bug: skia:6898
Change-Id: I28829111203d8ae2a4661cf02c99023403aa0df0
Reviewed-on: https://skia-review.googlesource.com/134120
Reviewed-by: Brian Salomon <bsalomon@google.com>
Reviewed-by: Cary Clark <caryclark@skia.org>
Commit-Queue: Cary Clark <caryclark@google.com>

1 files changed, 3 insertions, 2 deletions

diff --git a/src/core/SkPictureData.cpp b/src/core/SkPictureData.cpp
index 4d927380cc..3d34b27bf6 100644
--- a/src/core/SkPictureData.cpp
+++ b/src/core/SkPictureData.cpp
@@ -12,6 +12,7 @@
 #include "SkMakeUnique.h"
 #include "SkPictureData.h"
 #include "SkPictureRecord.h"
+#include "SkPicturePriv.h"
 #include "SkReadBuffer.h"
 #include "SkTextBlob.h"
 #include "SkTypeface.h"
@@ -232,7 +233,7 @@ void SkPictureData::flatten(SkWriteBuffer& buffer) const {
     if (!fPictures.empty()) {
         write_tag_size(buffer, SK_PICT_PICTURE_TAG, fPictures.count());
         for (const auto& pic : fPictures) {
-            pic->flatten(buffer);
+            SkPicturePriv::Flatten(pic, buffer);
         }
     }
 
@@ -440,7 +441,7 @@ void SkPictureData::parseBufferTag(SkReadBuffer& buffer, uint32_t tag, uint32_t
             fOpData = std::move(data);
         } break;
         case SK_PICT_PICTURE_TAG:
-            new_array_from_buffer(buffer, size, fPictures, SkPicture::MakeFromBuffer);
+            new_array_from_buffer(buffer, size, fPictures, SkPicturePriv::MakeFromBuffer);
             break;
         case SK_PICT_DRAWABLE_TAG:
             new_array_from_buffer(buffer, size, fDrawables, create_drawable_from_buffer);