diff options
| author | Derek Sollenberger <djsollen@google.com> | 2015-02-12 14:10:21 -0500 |
|---|---|---|
| committer | Derek Sollenberger <djsollen@google.com> | 2015-03-13 08:05:55 -0400 |
| commit | ee248599d49a15fc207c5aeb0b90ec263cc1d600 (patch) | |
| tree | abb62a362ef1962a3097a586b638c1d7efc93a31 /libs/hwui/DisplayList.h | |
| parent | 247dc6e125783b31f5c9a2cbccb34bd2ac575e6d (diff) | |
Refactor DisplayList path caching.
This removes dependence on SkPath ptrs that HWUI does not control
the lifecycle of. This clears up some errors where the paths are
not generated from Java, but rather the Skia test suites.
Cherry-pick of a change that originally landed in master-skia and is
dependent on a skia merge (ag/655422).
Change-Id: I41b9797a2b0af5d6b4ea51891565469d4f1d832d
Diffstat (limited to 'libs/hwui/DisplayList.h')
| -rw-r--r-- | libs/hwui/DisplayList.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libs/hwui/DisplayList.h b/libs/hwui/DisplayList.h index 011b5096c695..3178584dea5a 100644 --- a/libs/hwui/DisplayList.h +++ b/libs/hwui/DisplayList.h @@ -134,12 +134,11 @@ public: int projectionReceiveIndex; Vector<const SkBitmap*> bitmapResources; + Vector<const SkPath*> pathResources; Vector<const Res_png_9patch*> patchResources; std::vector<std::unique_ptr<const SkPaint>> paints; std::vector<std::unique_ptr<const SkRegion>> regions; - std::vector<std::unique_ptr<const SkPath>> paths; - SortedVector<const SkPath*> sourcePaths; Vector<Functor*> functors; const Vector<Chunk>& getChunks() const { |