Move the mapped memory limit from the compositor to the GLHelper context

content/browser/renderer_host/compositor_impl_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/compositor_impl_android.h"
 
 #include <android/bitmap.h>
 #include <android/native_window_jni.h>
 #include <stdint.h>
 
@@ skipping 509 matching lines @@
   // But from here on just try and always lead to either
   // DidInitializeOutputSurface() or DidFailToInitializeOutputSurface().
   scoped_refptr<gpu::GpuChannelHost> gpu_channel_host(factory->GetGpuChannel());
 
   GURL url("chrome://gpu/CompositorImpl::CreateOutputSurface");
   gpu::SurfaceHandle surface_handle =
       GpuSurfaceTracker::Get()->GetSurfaceHandle(surface_id_);
   constexpr bool share_resources = false;
   constexpr bool automatic_flushes = false;
 
+  constexpr size_t kBytesPerPixel = 4;
+  const size_t full_screen_texture_size_in_bytes =
+      gfx::DeviceDisplayInfo().GetDisplayHeight() *
+      gfx::DeviceDisplayInfo().GetDisplayWidth() * kBytesPerPixel;
+
   gpu::SharedMemoryLimits limits;
   // This limit is meant to hold the contents of the display compositor
   // drawing the scene. See discussion here:
   // https://codereview.chromium.org/1900993002/diff/90001/content/browser/renderer_host/compositor_impl_android.cc?context=3&column_width=80&tab_spaces=8
   limits.command_buffer_size = 64 * 1024;
   // These limits are meant to hold the uploads for the browser UI without
   // any excess space.
   limits.start_transfer_buffer_size = 64 * 1024;
   limits.min_transfer_buffer_size = 64 * 1024;
-  constexpr size_t kBytesPerPixel = 4;
-  const size_t full_screen_texture_size_in_bytes =
-      gfx::DeviceDisplayInfo().GetDisplayHeight() *
-      gfx::DeviceDisplayInfo().GetDisplayWidth() * kBytesPerPixel;
-  limits.max_transfer_buffer_size = std::min(
-      3 * full_screen_texture_size_in_bytes, kDefaultMaxTransferBufferSize);
-  // TODO(danakj): This limit should be on the GLHelper context instead in
-  // RWHVAndroid since that is where we do the async readback and map gpu
-  // memory to do so.
-  limits.mapped_memory_reclaim_limit = 2 * 1024 * 1024;
+  limits.max_transfer_buffer_size = full_screen_texture_size_in_bytes;
+  // Texture uploads may use mapped memory so give a reasonable limit for them.
+  limits.mapped_memory_reclaim_limit = full_screen_texture_size_in_bytes;
 
   scoped_refptr<ContextProviderCommandBuffer> context_provider(
       new ContextProviderCommandBuffer(
           base::WrapUnique(new WebGraphicsContext3DCommandBufferImpl(
               surface_handle, url, gpu_channel_host.get(), attributes,
               gfx::PreferIntegratedGpu, share_resources, automatic_flushes,
               nullptr)),
           limits, DISPLAY_COMPOSITOR_ONSCREEN_CONTEXT));
   DCHECK(context_provider.get());
 
@@ skipping 97 matching lines @@
 
 void CompositorImpl::SetNeedsAnimate() {
   needs_animate_ = true;
   if (!host_->visible())
     return;
 
   host_->SetNeedsAnimate();
 }
 
 }  // namespace content