Use GpuPreferences to avoid directly accessing switches in gpu related code

content/common/gpu/gpu_channel_manager.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/common/gpu/gpu_channel_manager.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "build/build_config.h"
 #include "content/common/gpu/establish_channel_params.h"
 #include "content/common/gpu/gpu_channel.h"
 #include "content/common/gpu/gpu_channel_manager_delegate.h"
 #include "content/common/gpu/gpu_memory_buffer_factory.h"
 #include "content/common/gpu/gpu_memory_manager.h"
 #include "content/common/gpu/gpu_messages.h"

[Fady Samuel, 2016/02/25 16:26:33]

You can probably delete this. I missed it in my patch, I think.

[Peng, 2016/02/25 17:13:22]

Done.

 #include "content/common/gpu/image_transport_surface.h"
 #include "content/public/common/content_switches.h"

[Fady Samuel, 2016/02/25 16:26:33]

Delete this.

[Peng, 2016/02/25 17:13:22]

Done.

 #include "gpu/command_buffer/common/sync_token.h"
 #include "gpu/command_buffer/common/value_state.h"
 #include "gpu/command_buffer/service/feature_info.h"
 #include "gpu/command_buffer/service/gpu_switches.h"
 #include "gpu/command_buffer/service/mailbox_manager.h"
 #include "gpu/command_buffer/service/memory_program_cache.h"
 #include "gpu/command_buffer/service/shader_translator_cache.h"
 #include "gpu/command_buffer/service/sync_point_manager.h"
 #include "ipc/message_filter.h"
 #include "ipc/message_router.h"

[Fady Samuel, 2016/02/25 16:26:33]

nit: you can probably delete these ipc includes. I missed htem in my patch.

[Peng, 2016/02/25 17:13:22]

Done.

 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_share_group.h"
 
 #if defined(OS_MACOSX)
 #include "content/common/gpu/buffer_presented_params_mac.h"
 #endif
 
 namespace content {
 
 namespace {
 #if defined(OS_ANDROID)
 // Amount of time we expect the GPU to stay powered up without being used.
 const int kMaxGpuIdleTimeMs = 40;
 // Maximum amount of time we keep pinging the GPU waiting for the client to
 // draw.
 const int kMaxKeepAliveTimeMs = 200;
 #endif
 
 }
 
 GpuChannelManager::GpuChannelManager(
+    const gpu::GpuPreferences& gpu_preferences,
     GpuChannelManagerDelegate* delegate,
     GpuWatchdog* watchdog,
     base::SingleThreadTaskRunner* task_runner,
     base::SingleThreadTaskRunner* io_task_runner,
     base::WaitableEvent* shutdown_event,
     gpu::SyncPointManager* sync_point_manager,
     GpuMemoryBufferFactory* gpu_memory_buffer_factory)
     : task_runner_(task_runner),
       io_task_runner_(io_task_runner),
+      gpu_preferences_(gpu_preferences),
       delegate_(delegate),
       watchdog_(watchdog),
       shutdown_event_(shutdown_event),
       share_group_(new gfx::GLShareGroup),
-      mailbox_manager_(gpu::gles2::MailboxManager::Create()),
+      mailbox_manager_(gpu::gles2::MailboxManager::Create(gpu_preferences)),
       gpu_memory_manager_(this),
       sync_point_manager_(sync_point_manager),
       sync_point_client_waiter_(
           sync_point_manager->CreateSyncPointClientWaiter()),
       gpu_memory_buffer_factory_(gpu_memory_buffer_factory),
       weak_factory_(this) {
   DCHECK(task_runner);
   DCHECK(io_task_runner);
   const base::CommandLine* command_line =
       base::CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kUIPrioritizeInGpuProcess))
     preemption_flag_ = new gpu::PreemptionFlag;
 }
 
 GpuChannelManager::~GpuChannelManager() {
   // Destroy channels before anything else because of dependencies.
   gpu_channels_.clear();
   if (default_offscreen_surface_.get()) {
     default_offscreen_surface_->Destroy();
     default_offscreen_surface_ = NULL;
   }
 }
 
 gpu::gles2::ProgramCache* GpuChannelManager::program_cache() {
   if (!program_cache_.get() &&
       (gfx::g_driver_gl.ext.b_GL_ARB_get_program_binary ||
        gfx::g_driver_gl.ext.b_GL_OES_get_program_binary) &&
       !base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableGpuProgramCache)) {
-    program_cache_.reset(new gpu::gles2::MemoryProgramCache());
+    program_cache_.reset(new gpu::gles2::MemoryProgramCache(
+          gpu_preferences_.gpu_program_cache_size,
+          gpu_preferences_.disable_gpu_shader_disk_cache));
   }
   return program_cache_.get();
 }
 
 gpu::gles2::ShaderTranslatorCache*
 GpuChannelManager::shader_translator_cache() {
-  if (!shader_translator_cache_.get())
-    shader_translator_cache_ = new gpu::gles2::ShaderTranslatorCache;
+  if (!shader_translator_cache_.get()) {
+    shader_translator_cache_ =
+        new gpu::gles2::ShaderTranslatorCache(gpu_preferences_);
+  }
   return shader_translator_cache_.get();
 }
 
 gpu::gles2::FramebufferCompletenessCache*
 GpuChannelManager::framebuffer_completeness_cache() {
   if (!framebuffer_completeness_cache_.get())
     framebuffer_completeness_cache_ =
         new gpu::gles2::FramebufferCompletenessCache;
   return framebuffer_completeness_cache_.get();
 }
@@ skipping 191 matching lines @@
     }
   }
   if (!stub || !stub->decoder()->MakeCurrent())
     return;
   glFinish();
   DidAccessGpu();
 }
 #endif
 
 }  // namespace content