Initialize GPU shader disk cache on brower thread.

content/browser/gpu/browser_gpu_channel_host_factory.cc

Index: content/browser/gpu/browser_gpu_channel_host_factory.cc
diff --git a/content/browser/gpu/browser_gpu_channel_host_factory.cc b/content/browser/gpu/browser_gpu_channel_host_factory.cc
index e45b4061743ae24ee5f28a615f366a1281ed4b0a..7a205e1ee9f46273f5cc3558e00e5cf9a442316a 100644
--- a/content/browser/gpu/browser_gpu_channel_host_factory.cc
+++ b/content/browser/gpu/browser_gpu_channel_host_factory.cc
@@ -5,6 +5,7 @@
 #include "content/browser/gpu/browser_gpu_channel_host_factory.h"
 
 #include "base/bind.h"
+#include "base/command_line.h"
 #include "base/location.h"
 #include "base/profiler/scoped_tracker.h"
 #include "base/single_thread_task_runner.h"
@@ -17,11 +18,14 @@
 #include "content/browser/gpu/gpu_data_manager_impl.h"
 #include "content/browser/gpu/gpu_process_host.h"
 #include "content/browser/gpu/gpu_surface_tracker.h"
+#include "content/browser/gpu/shader_disk_cache.h"
 #include "content/common/child_process_host_impl.h"
 #include "content/common/gpu/gpu_messages.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/gpu_data_manager.h"
 #include "content/public/common/content_client.h"
+#include "gpu/command_buffer/service/gpu_switches.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/message_filter.h"
 
@@ -238,7 +242,12 @@ BrowserGpuChannelHostFactory::BrowserGpuChannelHostFactory()
       gpu_memory_buffer_manager_(
           new BrowserGpuMemoryBufferManager(gpu_client_id_,
                                             gpu_client_tracing_id_)),
-      gpu_host_id_(0) {}
+      gpu_host_id_(0) {
+  GetIOThreadTaskRunner()->PostTask(
+      FROM_HERE,
+      base::Bind(&BrowserGpuChannelHostFactory::InitializeShaderDiskCacheOnIO,
+                 base::Unretained(this)));

[piman, 2015/08/07 19:33:59]

Unretained seems unsafe.

How about testing the command line and grabbing the directory here, and posting
the task only if we need to, passing the directory and the client id by value?
Then the function to set the cache info doesn't need |this| and can be static.

[Jamie Madill, 2015/08/07 20:07:58]

Done.

+}
 
 BrowserGpuChannelHostFactory::~BrowserGpuChannelHostFactory() {
   DCHECK(IsMainThread());
@@ -253,6 +262,20 @@ BrowserGpuChannelHostFactory::~BrowserGpuChannelHostFactory() {
   }
 }
 
+void BrowserGpuChannelHostFactory::InitializeShaderDiskCacheOnIO() {
+  if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kDisableGpuShaderDiskCache)) {
+    base::FilePath cache_dir =
+        GetContentClient()->browser()->GetShaderDiskCacheDirectory();
+    if (!cache_dir.empty()) {
+      ShaderCacheFactory::GetInstance()->SetCacheInfo(gpu_client_id_,
+                                                      cache_dir);
+    } else {
+      LOG(ERROR) << "Failed to init browser shader disk cache.";
+    }
+  }
+}
+
 bool BrowserGpuChannelHostFactory::IsMainThread() {
   return BrowserThread::CurrentlyOn(BrowserThread::UI);
 }