Clean up Skia GrContext caches in GLRenderer

This CL adds GrContext that used in GLRenderer for filtering to cache
controller and adds ClientBecameBusy/ClientBecameNotBusy to support
cleaning GrContext caches.

Bug: 1004924
Change-Id: I97e69ca5f05a41f2663eb02935468e3a9bbc852d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1824252
Commit-Queue: Vasiliy Telezhnikov <vasilyt@chromium.org>
Reviewed-by: Jonathan Backer <backer@chromium.org>
Cr-Commit-Position: refs/heads/master@{#700240}

components/viz/service/display/direct_renderer.h

@@ -69,6 +69,7 @@ class VIZ_SERVICE_EXPORT DirectRenderer {
 
   // Public interface implemented by subclasses.
   virtual void SwapBuffers(std::vector<ui::LatencyInfo> latency_info) = 0;
+  virtual void SwapBuffersSkipped() {}
   virtual void SwapBuffersComplete() {}
   virtual void DidReceiveTextureInUseResponses(
       const gpu::TextureInUseResponses& responses) {}

components/viz/service/display/display.cc

@@ -637,6 +637,8 @@ bool Display::DrawAndSwap() {
       }
     }
 
+    renderer_->SwapBuffersSkipped();
+
     TRACE_EVENT_ASYNC_END1("viz,benchmark", "Graphics.Pipeline.DrawAndSwap",
                            swapped_trace_id_, "status", "canceled");
     --swapped_trace_id_;

components/viz/service/display/gl_renderer.cc

@@ -378,9 +378,13 @@ GLRenderer::GLRenderer(
 GLRenderer::~GLRenderer() {
   CleanupSharedObjects();
 
+  auto* context_provider = output_surface_->context_provider();
+  auto* cache_controller = context_provider->CacheController();
+
+  if (context_busy_) {
+    cache_controller->ClientBecameNotBusy(std::move(context_busy_));
+  }
   if (context_visibility_) {
-    auto* context_provider = output_surface_->context_provider();
-    auto* cache_controller = context_provider->CacheController();
     cache_controller->ClientBecameNotVisibleDuringShutdown(
         std::move(context_visibility_));
   }
@@ -479,6 +483,12 @@ void GLRenderer::ClearFramebuffer() {
 void GLRenderer::BeginDrawingFrame() {
   TRACE_EVENT0("viz", "GLRenderer::BeginDrawingFrame");
 
+  if (!context_busy_) {
+    context_busy_ = output_surface_->context_provider()
+                        ->CacheController()
+                        ->ClientBecameBusy();
+  }
+
   scoped_refptr<ResourceFence> read_lock_fence;
   if (use_sync_query_) {
     read_lock_fence = sync_queries_.StartNewFrame();
@@ -2957,6 +2967,18 @@ void GLRenderer::SwapBuffers(std::vector<ui::LatencyInfo> latency_info) {
   output_surface_->SwapBuffers(std::move(output_frame));
 
   swap_buffer_rect_ = gfx::Rect();
+
+  if (context_busy_) {
+    output_surface_->context_provider()->CacheController()->ClientBecameNotBusy(
+        std::move(context_busy_));
+  }
+}
+
+void GLRenderer::SwapBuffersSkipped() {
+  if (context_busy_) {
+    output_surface_->context_provider()->CacheController()->ClientBecameNotBusy(
+        std::move(context_busy_));
+  }
 }
 
 void GLRenderer::SwapBuffersComplete() {

components/viz/service/display/gl_renderer.h

@@ -69,6 +69,7 @@ class VIZ_SERVICE_EXPORT GLRenderer : public DirectRenderer {
   bool use_swap_with_bounds() const { return use_swap_with_bounds_; }
 
   void SwapBuffers(std::vector<ui::LatencyInfo> latency_info) override;
+  void SwapBuffersSkipped() override;
   void SwapBuffersComplete() override;
 
   void DidReceiveTextureInUseResponses(
@@ -386,6 +387,7 @@ class VIZ_SERVICE_EXPORT GLRenderer : public DirectRenderer {
   gpu::gles2::GLES2Interface* gl_;
   gpu::ContextSupport* context_support_;
   std::unique_ptr<ContextCacheController::ScopedVisibility> context_visibility_;
+  std::unique_ptr<ContextCacheController::ScopedBusy> context_busy_;
 
   TextureDeleter texture_deleter_;
   GLRendererCopier copier_;

components/viz/service/display_embedder/viz_process_context_provider.cc

@@ -172,6 +172,7 @@ class GrContext* VizProcessContextProvider::GrContext() {
   gr_context_ = std::make_unique<skia_bindings::GrContextForGLES2Interface>(
       ContextGL(), ContextSupport(), ContextCapabilities(),
       max_resource_cache_bytes, max_glyph_cache_texture_bytes);
+  cache_controller_->SetGrContext(gr_context_->get());
   return gr_context_->get();
 }