AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Prevent unbounded invalidator growth on SkPathRef from GrSWPathRenderer

Browse Source 
Bug: b/149684076
Change-Id: I8edb871c26296da9cc76ab57f9fd9c09d5ebcae5
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/272654
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
This commit is contained in:
Brian Salomon 2020-02-24 09:39:32 -05:00 committed by Skia Commit-Bot
parent 8da5c3d450
commit 4282d2992c
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/gpu/GrSoftwarePathRenderer.cpp
View File

@ -377,9 +377,27 @@ bool GrSoftwarePathRenderer::onDrawPath(const DrawPathArgs& args) {
}
if (useCache) {
SkASSERT(view.origin() == kTopLeft_GrSurfaceOrigin);
// We will add an invalidator to the path so that if the path goes away we will
// delete or recycle the mask texture. We also invalidate the other way: If the mask
// goes away we signal that the invalidator on the path can be removed. This prevents
// unbounded growth of invalidators on long lived paths.
auto invalidator =
sk_make_sp<PathInvalidator>(maskKey, args.fContext->priv().contextID());
auto invalidateInvalidator = [](const void* ptr, void* /*context*/) {
auto invalidator = reinterpret_cast<const sk_sp<PathInvalidator>*>(ptr);
(*invalidator)->markShouldUnregisterFromPath();
delete invalidator;
};
auto data = SkData::MakeWithProc(new sk_sp<PathInvalidator>(invalidator),
sizeof(sk_sp<PathInvalidator>),
invalidateInvalidator,
nullptr);
maskKey.setCustomData(std::move(data));
fProxyProvider->assignUniqueKeyToProxy(maskKey, view.asTextureProxy());
args.fShape->addGenIDChangeListener(
sk_make_sp<PathInvalidator>(maskKey, args.fContext->priv().contextID()));
args.fShape->addGenIDChangeListener(std::move(invalidator));
}
}
SkASSERT(view);