commit 89305751baacd6e3b98da4e8b7393e2393af7283
author Chris Dalton <csmartdalton@google.com> Thu Nov 01 10:52:34 2018 -0600
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Nov 01 17:30:25 2018 +0000
tree 8eb8628c99fe873572264da7a7c36f93b3ce5bcb
parent 4e1f0225dbeff0505d88b8a11d3db01141903676

Call GrContext::performDeferredCleanup from viewer

Bug: skia:
Change-Id: I723c5efdd746d6182dee0511795f7eca3b6066d3
Reviewed-on: https://skia-review.googlesource.com/c/167180
Reviewed-by: Brian Osman <brianosman@google.com>
Reviewed-by: Jim Van Verth <jvanverth@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>

tools/sk_app/Window.cpp

diff --git a/tools/sk_app/Window.cpp b/tools/sk_app/Window.cpp
index 862ee1a..7359b31 100644
--- a/tools/sk_app/Window.cpp
+++ b/tools/sk_app/Window.cpp
@@ -130,7 +130,7 @@
     return fWindowContext->stencilBits();
 }
 
-const GrContext* Window::getGrContext() const {
+GrContext* Window::getGrContext() const {
     if (!fWindowContext) {
         return nullptr;
     }

tools/sk_app/Window.h

diff --git a/tools/sk_app/Window.h b/tools/sk_app/Window.h
index 29d90c6..e1fb0ad 100644
--- a/tools/sk_app/Window.h
+++ b/tools/sk_app/Window.h
@@ -183,7 +183,7 @@
     int stencilBits() const;
 
     // Returns null if there is not a GPU backend or if the backend is not yet created.
-    const GrContext* getGrContext() const;
+    GrContext* getGrContext() const;
 
 protected:
     Window();

tools/viewer/Viewer.cpp

diff --git a/tools/viewer/Viewer.cpp b/tools/viewer/Viewer.cpp
index 2bc8ee3..bf779e9 100644
--- a/tools/viewer/Viewer.cpp
+++ b/tools/viewer/Viewer.cpp
@@ -1215,6 +1215,11 @@
     fCommands.drawHelp(canvas);
 
     this->drawImGui();
+
+    if (GrContext* ctx = fWindow->getGrContext()) {
+        // Clean out cache items that haven't been used in more than 10 seconds.
+        ctx->performDeferredCleanup(std::chrono::seconds(10));
+    }
 }
 
 void Viewer::onResize(int width, int height) {