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
diff --git a/libs/hwui/DisplayList.cpp b/libs/hwui/DisplayList.cpp
index 317e395..4540bec 100644
--- a/libs/hwui/DisplayList.cpp
+++ b/libs/hwui/DisplayList.cpp
@@ -49,18 +49,21 @@
resourceCache.decrementRefcountLocked(patchResources.itemAt(i));
}
- for (size_t i = 0; i < sourcePaths.size(); i++) {
- resourceCache.decrementRefcountLocked(sourcePaths.itemAt(i));
- }
-
resourceCache.unlock();
+ for (size_t i = 0; i < pathResources.size(); i++) {
+ const SkPath* path = pathResources.itemAt(i);
+ if (path->unique() && Caches::hasInstance()) {
+ Caches::getInstance().pathCache.removeDeferred(path);
+ }
+ delete path;
+ }
+
bitmapResources.clear();
patchResources.clear();
- sourcePaths.clear();
+ pathResources.clear();
paints.clear();
regions.clear();
- paths.clear();
}
size_t DisplayListData::addChild(DrawRenderNodeOp* op) {