resolved conflicts for merge of 5369b769 to master

Change-Id: Iccb2ce948321534e05d67e64dc40a38332adb1a7

1 files changed, 4 insertions, 8 deletions

diff --git a/libs/hwui/DisplayList.h b/libs/hwui/DisplayList.h
index 43dabdb1c60f..e168786b34ef 100644
--- a/libs/hwui/DisplayList.h
+++ b/libs/hwui/DisplayList.h
@@ -78,18 +78,14 @@ public:
     OpenGLRenderer& mRenderer;
     const int mReplayFlags;
 
-    // Allocator with the lifetime of a single frame.
-    // replay uses an Allocator owned by the struct, while defer shares the DeferredDisplayList's Allocator
+    // Allocator with the lifetime of a single frame. replay uses an Allocator owned by the struct,
+    // while defer shares the DeferredDisplayList's Allocator
+    // TODO: move this allocator to be owned by object with clear frame lifecycle
     LinearAllocator * const mAllocator;
 
     SkPath* allocPathForFrame() {
-        mTempPaths.push_back(SkPath());
-        return &mTempPaths.back();
+        return mRenderer.allocPathForFrame();
     }
-
-private:
-    // Paths kept alive for the duration of the frame
-    std::vector<SkPath> mTempPaths;
 };
 
 struct DeferStateStruct : public PlaybackStateStruct {