commit 079455c739e1de212c677ac42ca97f52d99d46b0
author Robert Phillips <robertphillips@google.com> Tue Aug 11 15:18:46 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Aug 12 13:30:56 2020 +0000
tree edfbbd3dc6f41ef71be180be622f9fac7ecb54ee
parent 9487e9b2a049b07ddd02bdec39af65cdb8b9b16d

Make the GrSmallPathAtlasMgr a flush-time object

This will allow the small path renderer to be used w/ DDLs.

This is broken out of the omnibus CL:

https://skia-review.googlesource.com/c/skia/+/307776 (Split the small path renderer into record-time and flush-time pieces)

Bug: 1108408
Change-Id: I64cc6ff677d0aead7cf2f097c0e7fbb15b49d49d
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/309304
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

src/gpu/GrDirectContext.cpp

diff --git a/src/gpu/GrDirectContext.cpp b/src/gpu/GrDirectContext.cpp
index 4ae1831..6f04a5f 100644
--- a/src/gpu/GrDirectContext.cpp
+++ b/src/gpu/GrDirectContext.cpp
@@ -59,16 +59,25 @@
 
 void GrDirectContext::abandonContext() {
     INHERITED::abandonContext();
+    if (fSmallPathAtlasMgr) {
+        fSmallPathAtlasMgr->reset();
+    }
     fAtlasManager->freeAll();
 }
 
 void GrDirectContext::releaseResourcesAndAbandonContext() {
     INHERITED::releaseResourcesAndAbandonContext();
+    if (fSmallPathAtlasMgr) {
+        fSmallPathAtlasMgr->reset();
+    }
     fAtlasManager->freeAll();
 }
 
 void GrDirectContext::freeGpuResources() {
     this->flushAndSubmit();
+    if (fSmallPathAtlasMgr) {
+        fSmallPathAtlasMgr->reset();
+    }
     fAtlasManager->freeAll();
 
     INHERITED::freeGpuResources();
@@ -115,8 +124,17 @@
 }
 
 GrSmallPathAtlasMgr* GrDirectContext::onGetSmallPathAtlasMgr() {
-    // The small path renderer atlas will be created here
-    return nullptr;
+    if (!fSmallPathAtlasMgr) {
+        fSmallPathAtlasMgr = std::make_unique<GrSmallPathAtlasMgr>();
+
+        this->priv().addOnFlushCallbackObject(fSmallPathAtlasMgr.get());
+    }
+
+    if (!fSmallPathAtlasMgr->initAtlas(this->proxyProvider(), this->caps())) {
+        return nullptr;
+    }
+
+    return fSmallPathAtlasMgr.get();
 }
 
 #ifdef SK_GL