From b154792a39a2fa9bfade621c1a30c8232129e151 Mon Sep 17 00:00:00 2001 From: Ady Abraham Date: Mon, 10 May 2021 21:20:25 -0700 Subject: [PATCH] HWUI: mSerialContext needs to outlive other serializing members mSerialContext is used as the serialization context, and need to outlive mOpenMultiPicStream and mMultiPic and those are referencing it in SkSharingSerialContext SkSharingSerialContext::serializeImage Test: https://buganizer.corp.google.com/issues/182710292#comment16 Bug: 183049238 Change-Id: I25842e492d5efd7a7532964bddca61559d50ebe1 --- libs/hwui/pipeline/skia/SkiaPipeline.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/hwui/pipeline/skia/SkiaPipeline.h b/libs/hwui/pipeline/skia/SkiaPipeline.h index 100bfb6b159a6..46580358aaf51 100644 --- a/libs/hwui/pipeline/skia/SkiaPipeline.h +++ b/libs/hwui/pipeline/skia/SkiaPipeline.h @@ -137,9 +137,10 @@ private: int mCaptureSequence = 0; // Multi frame serialization stream and writer used when serializing more than one frame. + std::unique_ptr mSerialContext; // Must be declared before any other + // serializing member std::unique_ptr mOpenMultiPicStream; sk_sp mMultiPic; - std::unique_ptr mSerialContext; /** * mRecorder holds the current picture recorder when serializing in either SingleFrameSKP or