diff options
| author |  Cary Clark <caryclark@skia.org> | 2018-06-11 16:25:43 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-12 13:56:33 +0000 |
| commit | efd99cc92817710117db9924772943b8b78c2fe5 (patch) | |
| tree | 255256584f7d3d326736c3cc345b9d6c2850bdb2 /fuzz | |
| parent | e73d7d84d7702d4b3d4a938f8b18d12924889d7b (diff) | |
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>
Diffstat (limited to 'fuzz')
| -rw-r--r-- | fuzz/FuzzCanvas.cpp | 3 | ||||
| -rw-r--r-- | fuzz/fuzz.cpp | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/fuzz/FuzzCanvas.cpp b/fuzz/FuzzCanvas.cpp index 7ca14d2223..903eb29858 100644 --- a/fuzz/FuzzCanvas.cpp +++ b/fuzz/FuzzCanvas.cpp @@ -18,6 +18,7 @@ #include "SkMaskFilter.h" #include "SkNullCanvas.h" #include "SkPathEffect.h" +#include "SkPicturePriv.h" #include "SkPictureRecorder.h" #include "SkPoint3.h" #include "SkRSXform.h" @@ -1734,7 +1735,7 @@ DEF_FUZZ(RasterN32CanvasViaSerialization, fuzz) { sk_sp<SkData> data = pic->serialize(); if (!data) { fuzz->signalBug(); } SkReadBuffer rb(data->data(), data->size()); - auto deserialized = SkPicture::MakeFromBuffer(rb); + auto deserialized = SkPicturePriv::MakeFromBuffer(rb); if (!deserialized) { fuzz->signalBug(); } auto surface = SkSurface::MakeRasterN32Premul(kCanvasSize.width(), kCanvasSize.height()); SkASSERT(surface && surface->getCanvas()); diff --git a/fuzz/fuzz.cpp b/fuzz/fuzz.cpp index ce0119c1a9..96d2a25daa 100644 --- a/fuzz/fuzz.cpp +++ b/fuzz/fuzz.cpp @@ -17,7 +17,7 @@ #include "SkOSPath.h" #include "SkPaint.h" #include "SkPath.h" -#include "SkPicture.h" +#include "SkPicturePriv.h" #include "SkPipe.h" #include "SkReadBuffer.h" #include "SkStream.h" @@ -604,7 +604,7 @@ static void fuzz_img(sk_sp<SkData> bytes, uint8_t scale, uint8_t mode) { static void fuzz_skp(sk_sp<SkData> bytes) { SkReadBuffer buf(bytes->data(), bytes->size()); SkDebugf("Decoding\n"); - sk_sp<SkPicture> pic(SkPicture::MakeFromBuffer(buf)); + sk_sp<SkPicture> pic(SkPicturePriv::MakeFromBuffer(buf)); if (!pic) { SkDebugf("[terminated] Couldn't decode as a picture.\n"); return; |