From 51f2d606dcbfba3cc5b03dfea37c1304b91c232f Mon Sep 17 00:00:00 2001
From: John Reck <jreck@google.com>
Date: Wed, 6 Apr 2016 07:50:47 -0700
Subject: 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
---
 libs/hwui/RenderNode.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'libs/hwui/RenderNode.cpp')

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);
     }
 }
 
-- 
cgit v1.2.3-59-g8ed1b