diff options
author | 2024-04-12 17:43:17 +0000 | |
---|---|---|
committer | 2024-04-12 17:43:21 +0000 | |
commit | a63d809bd17eb7b0e20b3116e1e4df58b4ec173d (patch) | |
tree | cb175d8db31270f7e34f37e3ac7f39272d6294d8 | |
parent | 1eb863477109a5ddc8387b43f7f2a008f5686095 (diff) |
[base] Use public version of SkMultiPictureDocument.h
This was moved in https://skia-review.googlesource.com/c/skia/+/764971
Change-Id: Id4d251386fc09807af0e54e36acc0a60834788ae
-rw-r--r-- | libs/hwui/pipeline/skia/SkiaPipeline.cpp | 4 | ||||
-rw-r--r-- | libs/hwui/pipeline/skia/SkiaPipeline.h | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/libs/hwui/pipeline/skia/SkiaPipeline.cpp b/libs/hwui/pipeline/skia/SkiaPipeline.cpp index 34932b1b1e25..dc669a5eca73 100644 --- a/libs/hwui/pipeline/skia/SkiaPipeline.cpp +++ b/libs/hwui/pipeline/skia/SkiaPipeline.cpp @@ -24,7 +24,6 @@ #include <SkImageAndroid.h> #include <SkImageInfo.h> #include <SkMatrix.h> -#include <SkMultiPictureDocument.h> #include <SkOverdrawCanvas.h> #include <SkOverdrawColorFilter.h> #include <SkPicture.h> @@ -38,6 +37,7 @@ #include <android-base/properties.h> #include <gui/TraceUtils.h> #include <include/android/SkSurfaceAndroid.h> +#include <include/docs/SkMultiPictureDocument.h> #include <include/encode/SkPngEncoder.h> #include <include/gpu/ganesh/SkSurfaceGanesh.h> #include <unistd.h> @@ -185,7 +185,7 @@ bool SkiaPipeline::setupMultiFrameCapture() { // we need to keep it until after mMultiPic.close() // procs is passed as a pointer, but just as a method of having an optional default. // procs doesn't need to outlive this Make call. - mMultiPic = SkMakeMultiPictureDocument(mOpenMultiPicStream.get(), &procs, + mMultiPic = SkMultiPictureDocument::Make(mOpenMultiPicStream.get(), &procs, [sharingCtx = mSerialContext.get()](const SkPicture* pic) { SkSharingSerialContext::collectNonTextureImagesFromPicture(pic, sharingCtx); }); diff --git a/libs/hwui/pipeline/skia/SkiaPipeline.h b/libs/hwui/pipeline/skia/SkiaPipeline.h index cf14b1f9ebe3..823b209017a5 100644 --- a/libs/hwui/pipeline/skia/SkiaPipeline.h +++ b/libs/hwui/pipeline/skia/SkiaPipeline.h @@ -18,7 +18,6 @@ #include <SkColorSpace.h> #include <SkDocument.h> -#include <SkMultiPictureDocument.h> #include <SkSurface.h> #include "Lighting.h" |