From 88d90714fad0fed2739fb8c5f90fe814c8a274ef Mon Sep 17 00:00:00 2001 From: Mike Klein Date: Sat, 27 Jan 2018 17:30:04 +0000 Subject: Revert "hide picture virtuals (no public callers)" This reverts commit 8005bff7e631a269f0dfaae93ff9963dc0e5ff39. Reason for revert: hwui, flutter, and headless blink in G3 all still using these. Original change's description: > hide picture virtuals (no public callers) > > This prepares the way for a clean impl of a "placeholder" picture that never unrolls > > Bug: skia: > Change-Id: I3b5785c5c94432b54e9a7dc280b2a6e716592473 > Reviewed-on: https://skia-review.googlesource.com/100260 > Commit-Queue: Mike Reed > Reviewed-by: Mike Klein TBR=mtklein@chromium.org,mtklein@google.com,reed@google.com Change-Id: I385789dd420588ea9a9390c8a44c6ecb96c7f358 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia: Reviewed-on: https://skia-review.googlesource.com/100880 Reviewed-by: Mike Klein Commit-Queue: Mike Klein --- tests/SerializationTest.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'tests/SerializationTest.cpp') diff --git a/tests/SerializationTest.cpp b/tests/SerializationTest.cpp index b9c8a378ff..2543870667 100644 --- a/tests/SerializationTest.cpp +++ b/tests/SerializationTest.cpp @@ -17,7 +17,6 @@ #include "SkMatrixPriv.h" #include "SkOSFile.h" #include "SkReadBuffer.h" -#include "SkPicturePriv.h" #include "SkPictureRecorder.h" #include "SkShaderBase.h" #include "SkTableColorFilter.h" @@ -543,7 +542,7 @@ DEF_TEST(Serialization, reporter) { // Serialize picture SkBinaryWriteBuffer writer; - SkPicturePriv::Flatten(writer, pict.get()); + pict->flatten(writer); size_t size = writer.bytesWritten(); SkAutoTMalloc data(size); writer.writeToMemory(static_cast(data.get())); -- cgit v1.2.3