Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix NPE in makeTransformCanvas"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-07-10 17:11:24 +00:00
committed by Android (Google) Code Review
parent a977a37c85 b91ec50287
commit 396dfa8995
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libs/hwui/pipeline/skia/SkiaRecordingCanvas.cpp
View File

@@ -46,9 +46,11 @@ void SkiaRecordingCanvas::initDisplayList(uirenderer::RenderNode* renderNode, in
mDisplayList->attachRecorder(&mRecorder, SkIRect::MakeWH(width, height));
SkCanvas* canvas = &mRecorder;
mWrappedCanvas = makeTransformCanvas(&mRecorder, renderNode->usageHint());
if (mWrappedCanvas) {
canvas = mWrappedCanvas.get();
if (renderNode) {
mWrappedCanvas = makeTransformCanvas(&mRecorder, renderNode->usageHint());
if (mWrappedCanvas) {
canvas = mWrappedCanvas.get();
}
}
SkiaCanvas::reset(canvas);
}