diff options
author | John Reck <jreck@google.com> | 2016-04-06 07:50:47 -0700 |
---|---|---|
committer | John Reck <jreck@google.com> | 2016-04-07 14:10:43 -0700 |
commit | 51f2d606dcbfba3cc5b03dfea37c1304b91c232f (patch) | |
tree | 110249f497eddafcb33ba8aed6989bd965b2a7da /libs/hwui/RenderNode.cpp | |
parent | 3397c88f7900d8db677204cdbe9e7a5dc26e453a (diff) |
Fix some edge cases
Bug: 27709981
This desperately needs a refactor, but to keep
the current (really needed & nice) behavior of
dispatching after sync finishes would be difficult
to handle cleanly without lots of ripping so... #yolo
Change-Id: I831a06c6ae7412a062720d68ecbe3085190f0258
Diffstat (limited to 'libs/hwui/RenderNode.cpp')
-rw-r--r-- | libs/hwui/RenderNode.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/hwui/RenderNode.cpp b/libs/hwui/RenderNode.cpp index 957848628059..ea06fcd092ce 100644 --- a/libs/hwui/RenderNode.cpp +++ b/libs/hwui/RenderNode.cpp @@ -81,14 +81,14 @@ RenderNode::~RenderNode() { #endif } -void RenderNode::setStagingDisplayList(DisplayList* displayList) { +void RenderNode::setStagingDisplayList(DisplayList* displayList, TreeObserver* observer) { mNeedsDisplayListSync = true; delete mStagingDisplayList; mStagingDisplayList = displayList; // If mParentCount == 0 we are the sole reference to this RenderNode, // so immediately free the old display list if (!mParentCount && !mStagingDisplayList) { - deleteDisplayList(nullptr); + deleteDisplayList(observer); } } |