Merge "Fix NPE in makeTransformCanvas" (396dfa89) · Commits · e / os / android_frameworks_base

libs/hwui/pipeline/skia/SkiaRecordingCanvas.cpp

+5 −3

Original line number	Diff line number	Diff line
		@@ -46,10 +46,12 @@ void SkiaRecordingCanvas::initDisplayList(uirenderer::RenderNode* renderNode, in

		mDisplayList->attachRecorder(&mRecorder, SkIRect::MakeWH(width, height));
		SkCanvas* canvas = &mRecorder;
		if (renderNode) {
		mWrappedCanvas = makeTransformCanvas(&mRecorder, renderNode->usageHint());
		if (mWrappedCanvas) {
		canvas = mWrappedCanvas.get();
		}
		}
		SkiaCanvas::reset(canvas);
		}