add serialprocs to MultiDocument, hide redundant methods

Bug: skia:
Change-Id: I6521e93af79439bd8c1d2f5130a68492044a2ee9
Reviewed-on: https://skia-review.googlesource.com/87788
Reviewed-by: Wei Li <weili@chromium.org>
Reviewed-by: Hal Canary <halcanary@google.com>
Commit-Queue: Mike Reed <reed@google.com>

1 files changed, 6 insertions, 4 deletions

diff --git a/tests/SerialProcsTest.cpp b/tests/SerialProcsTest.cpp
index 0d13c035ec..c408dc7eb6 100644
--- a/tests/SerialProcsTest.cpp
+++ b/tests/SerialProcsTest.cpp
@@ -70,11 +70,11 @@ DEF_TEST(serial_procs_image, reporter) {
 
     for (size_t i = 0; i < SK_ARRAY_COUNT(sprocs); ++i) {
         sproc.fImageProc = sprocs[i];
-        auto data = pic->serialize(sproc);
+        auto data = pic->serialize(&sproc);
         REPORTER_ASSERT(reporter, data);
 
         dproc.fImageProc = dprocs[i];
-        auto new_pic = SkPicture::MakeFromData(data, dproc);
+        auto new_pic = SkPicture::MakeFromData(data.get(), &dproc);
         REPORTER_ASSERT(reporter, data);
 
         auto dst_img = picture_to_image(new_pic);
@@ -140,9 +140,11 @@ static void test_pictures(skiatest::Reporter* reporter, sk_sp<SkPicture> p0, int
         ctx.fSkipMe = p0.get();
     }
 
-    auto d0 = p0->serialize(makes(array_serial_proc, &ctx));
+    SkSerialProcs sprocs = makes(array_serial_proc, &ctx);
+    auto d0 = p0->serialize(&sprocs);
     REPORTER_ASSERT(reporter, ctx.fArray.count() == count);
-    p0 = SkPicture::MakeFromData(d0.get(), maked(array_deserial_proc, &ctx));
+    SkDeserialProcs dprocs = maked(array_deserial_proc, &ctx);
+    p0 = SkPicture::MakeFromData(d0.get(), &dprocs);
     REPORTER_ASSERT(reporter, ctx.fArray.count() == 0);
 }