Revert of Android: Free GLHelper context ashmem when it makes sense

content/browser/renderer_host/render_widget_host_view_android.cc

 // Copyright (c) 2012 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 "content/browser/renderer_host/render_widget_host_view_android.h"
 
 #include <android/bitmap.h>
 
 #include <utility>
 
-#include "base/android/application_status_listener.h"
 #include "base/android/build_info.h"
 #include "base/android/context_utils.h"
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/macros.h"
-#include "base/memory/memory_pressure_listener.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/sys_info.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/threading/worker_pool.h"
 #include "cc/layers/layer.h"
 #include "cc/layers/surface_layer.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/copy_output_request.h"
@@ skipping 64 matching lines @@
 #include "ui/touch_selection/touch_selection_controller.h"
 
 namespace content {
 
 namespace {
 
 const int kUndefinedCompositorFrameSinkId = -1;
 
 static const char kAsyncReadBackString[] = "Compositing.CopyFromSurfaceTime";
 
-using base::android::ApplicationState;
-using base::android::ApplicationStatusListener;
-using base::MemoryPressureListener;
-
 class GLHelperHolder {
  public:
   static GLHelperHolder* Create();
 
   display_compositor::GLHelper* gl_helper() { return gl_helper_.get(); }
   bool IsLost() {
     if (!gl_helper_)
       return true;
     return provider_->ContextGL()->GetGraphicsResetStatusKHR() != GL_NO_ERROR;
   }
 
-  void FreeUnusedSharedMemoryIfNeeded();
-
  private:
-  GLHelperHolder();
+  GLHelperHolder() = default;
   void Initialize();
   void OnContextLost();
-  void OnApplicationStatusChanged(ApplicationState new_state);
-  void OnMemoryPressure(MemoryPressureListener::MemoryPressureLevel level);
 
   scoped_refptr<ContextProviderCommandBuffer> provider_;
   std::unique_ptr<display_compositor::GLHelper> gl_helper_;
 
-  // Set to |false| if there are only stopped activities (or none).
-  bool has_running_or_paused_activities_;
-  // Whether we recently were signaled a low memory condition.
-  bool did_signal_memory_pressure_;
-
-  std::unique_ptr<ApplicationStatusListener> app_status_listener_;
-  std::unique_ptr<MemoryPressureListener> mem_pressure_listener_;
-
   DISALLOW_COPY_AND_ASSIGN(GLHelperHolder);
 };
 
-GLHelperHolder::GLHelperHolder()
-    : has_running_or_paused_activities_(
-          (ApplicationStatusListener::GetState() ==
-           base::android::APPLICATION_STATE_HAS_RUNNING_ACTIVITIES) ||
-          (ApplicationStatusListener::GetState() ==
-           base::android::APPLICATION_STATE_HAS_PAUSED_ACTIVITIES)),
-      did_signal_memory_pressure_(false) {}
-
 GLHelperHolder* GLHelperHolder::Create() {
   GLHelperHolder* holder = new GLHelperHolder;
   holder->Initialize();
   return holder;
 }
 
 void GLHelperHolder::Initialize() {
   auto* factory = BrowserGpuChannelHostFactory::instance();
   scoped_refptr<gpu::GpuChannelHost> gpu_channel_host(factory->GetGpuChannel());
 
@@ skipping 42 matching lines @@
   if (!provider_->BindToCurrentThread())
     return;
   provider_->ContextGL()->TraceBeginCHROMIUM(
       "gpu_toplevel",
       base::StringPrintf("CmdBufferImageTransportFactory-%p", provider_.get())
           .c_str());
   provider_->SetLostContextCallback(
       base::Bind(&GLHelperHolder::OnContextLost, base::Unretained(this)));
   gl_helper_.reset(new display_compositor::GLHelper(
       provider_->ContextGL(), provider_->ContextSupport()));
-
-  // Unretained() is safe because |this| owns the following two callbacks.
-  app_status_listener_.reset(new ApplicationStatusListener(base::Bind(
-      &GLHelperHolder::OnApplicationStatusChanged, base::Unretained(this))));
-  mem_pressure_listener_.reset(new MemoryPressureListener(base::Bind(
-      &GLHelperHolder::OnMemoryPressure, base::Unretained(this))));
-}
-
-void GLHelperHolder::FreeUnusedSharedMemoryIfNeeded() {
-  if (!has_running_or_paused_activities_ || did_signal_memory_pressure_)
-    provider_->FreeUnusedSharedMemory();
 }
 
 void GLHelperHolder::OnContextLost() {
-  app_status_listener_.reset();
-  mem_pressure_listener_.reset();
-  gl_helper_.reset();
   // Need to post a task because the command buffer client cannot be deleted
   // from within this callback.
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::Bind(&RenderWidgetHostViewAndroid::OnContextLost));
 }
 
-void GLHelperHolder::OnApplicationStatusChanged(ApplicationState new_state) {
-  bool new_has_running_or_paused_activities =
-      new_state == base::android::APPLICATION_STATE_HAS_RUNNING_ACTIVITIES ||
-      new_state == base::android::APPLICATION_STATE_HAS_PAUSED_ACTIVITIES;
-
-  if (!has_running_or_paused_activities_ &&
-      new_has_running_or_paused_activities) {
-    // Reset at this time since on Android there is no 'back to normal'
-    // notification (but only onTrim/onLowMemory).
-    did_signal_memory_pressure_ = false;
-  } else if (!new_has_running_or_paused_activities) {
-    provider_->FreeUnusedSharedMemory();
-  }
-
-  has_running_or_paused_activities_ = new_has_running_or_paused_activities;
-}
-
-void GLHelperHolder::OnMemoryPressure(
-    MemoryPressureListener::MemoryPressureLevel level) {
-  if (level == MemoryPressureListener::MEMORY_PRESSURE_LEVEL_MODERATE ||
-      level == MemoryPressureListener::MEMORY_PRESSURE_LEVEL_CRITICAL) {
-    did_signal_memory_pressure_ = true;
-    provider_->FreeUnusedSharedMemory();
-  }
-}
-
-GLHelperHolder* GetPostReadbackGLHelperHolder(bool create_if_necessary) {
+// This can only be used for readback postprocessing. It may return null if the
+// channel was lost and not reestablished yet.
+display_compositor::GLHelper* GetPostReadbackGLHelper() {
   static GLHelperHolder* g_readback_helper_holder = nullptr;
 
-  if (!create_if_necessary && !g_readback_helper_holder)
-    return nullptr;
-
   if (g_readback_helper_holder && g_readback_helper_holder->IsLost()) {
     delete g_readback_helper_holder;
     g_readback_helper_holder = nullptr;
   }
 
   if (!g_readback_helper_holder)
     g_readback_helper_holder = GLHelperHolder::Create();
 
-  return g_readback_helper_holder;
-}
-
-display_compositor::GLHelper* GetPostReadbackGLHelper() {
-  bool create_if_necessary = true;
-  return GetPostReadbackGLHelperHolder(create_if_necessary)->gl_helper();
-}
-
-void FreeUnusedGLHelperMemory() {
-  bool create_if_necessary = false;
-  GLHelperHolder* holder = GetPostReadbackGLHelperHolder(create_if_necessary);
-
-  if (holder) {
-    holder->FreeUnusedSharedMemoryIfNeeded();
-  }
+  return g_readback_helper_holder->gl_helper();
 }
 
 void CopyFromCompositingSurfaceFinished(
     const ReadbackRequestCallback& callback,
     std::unique_ptr<cc::SingleReleaseCallback> release_callback,
     std::unique_ptr<SkBitmap> bitmap,
     const base::TimeTicks& start_time,
     std::unique_ptr<SkAutoLockPixels> bitmap_pixels_lock,
     bool result) {
   TRACE_EVENT0(
       "cc", "RenderWidgetHostViewAndroid::CopyFromCompositingSurfaceFinished");
   bitmap_pixels_lock.reset();
   gpu::SyncToken sync_token;
   if (result) {
     display_compositor::GLHelper* gl_helper = GetPostReadbackGLHelper();
     if (gl_helper)
       gl_helper->GenerateSyncToken(&sync_token);
   }
-
-  FreeUnusedGLHelperMemory();
-
   const bool lost_resource = !sync_token.HasData();
   release_callback->Run(sync_token, lost_resource);
   UMA_HISTOGRAM_TIMES(kAsyncReadBackString,
                       base::TimeTicks::Now() - start_time);
   ReadbackResponse response = result ? READBACK_SUCCESS : READBACK_FAILED;
   callback.Run(*bitmap, response);
 }
 
 std::unique_ptr<ui::TouchSelectionController> CreateSelectionController(
     ui::TouchSelectionControllerClient* client,
@@ skipping 1642 matching lines @@
     case ui::MotionEvent::ACTION_UP:
     case ui::MotionEvent::ACTION_POINTER_UP:
       UMA_HISTOGRAM_CUSTOM_COUNTS("Event.Latency.OS.TOUCH_RELEASED",
                                   delta.InMicroseconds(), 1, 1000000, 50);
     default:
       return;
   }
 }
 
 }  // namespace content