Flush after ResourcePool deletions complete

cc/trees/layer_tree_host_impl.cc

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/trees/layer_tree_host_impl.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 1430 matching lines @@
 }
 
 void LayerTreeHostImpl::DidReceiveCompositorFrameAck() {
   client_->DidReceiveCompositorFrameAckOnImplThread();
 }
 
 void LayerTreeHostImpl::ReclaimResources(
     const ReturnedResourceArray& resources) {
   // TODO(piman): We may need to do some validation on this ack before
   // processing it.
-  if (resource_provider_)
-    resource_provider_->ReceiveReturnsFromParent(resources);
+  if (!resource_provider_)
+    return;
+
+  resource_provider_->ReceiveReturnsFromParent(resources);
 
   // In OOM, we now might be able to release more resources that were held
   // because they were exported.
   if (resource_pool_) {
     if (resource_pool_->memory_usage_bytes()) {
       const size_t kMegabyte = 1024 * 1024;
 
       // This is a good time to log memory usage. A chunk of work has just
       // completed but none of the memory used for that work has likely been
       // freed.
       UMA_HISTOGRAM_MEMORY_MB(
           "Renderer4.ResourcePoolMemoryUsage",
           static_cast<int>(resource_pool_->memory_usage_bytes() / kMegabyte));
     }
 
     resource_pool_->CheckBusyResources();
     resource_pool_->ReduceResourceUsage();
   }
 
   // If we're not visible, we likely released resources, so we want to
   // aggressively flush here to make sure those DeleteTextures make it to the
   // GPU process to free up the memory.
-  if (compositor_frame_sink_->context_provider() && !visible_) {
-    compositor_frame_sink_->context_provider()
-        ->ContextGL()
-        ->ShallowFlushCHROMIUM();
-  }
+  if (!visible_)
+    resource_provider_->FlushPendingDeletions();
 }
 
 void LayerTreeHostImpl::OnDraw(const gfx::Transform& transform,
                                const gfx::Rect& viewport,
                                bool resourceless_software_draw) {
   DCHECK(!resourceless_software_draw_);
   const bool transform_changed = external_transform_ != transform;
   const bool viewport_changed = external_viewport_ != viewport;
 
   external_transform_ = transform;
@@ skipping 2602 matching lines @@
       worker_context_visibility_ =
           worker_context->CacheController()->ClientBecameVisible();
     } else {
       worker_context->CacheController()->ClientBecameNotVisible(
           std::move(worker_context_visibility_));
     }
   }
 }
 
 }  // namespace cc