Index: content/gpu/in_process_gpu_thread.cc |
diff --git a/content/gpu/in_process_gpu_thread.cc b/content/gpu/in_process_gpu_thread.cc |
index c0c90888d3a8fe1a657a4122372fb0d31f269cd0..dcff78b2f852e989dc4dbb7c3b81757f1e13b609 100644 |
--- a/content/gpu/in_process_gpu_thread.cc |
+++ b/content/gpu/in_process_gpu_thread.cc |
@@ -9,6 +9,8 @@ |
#include "content/gpu/gpu_child_thread.h" |
#include "content/gpu/gpu_process.h" |
#include "gpu/config/gpu_info_collector.h" |
+#include "gpu/config/gpu_switches.h" |
+#include "gpu/config/gpu_util.h" |
#include "gpu/ipc/common/gpu_memory_buffer_support.h" |
#include "gpu/ipc/service/gpu_memory_buffer_factory.h" |
#include "ui/gl/init/gl_factory.h" |
@@ -56,10 +58,17 @@ void InProcessGpuThread::Init() { |
else |
gpu::CollectContextGraphicsInfo(&gpu_info); |
+ gpu::GPUFeatureStatus feature_status; |
+ const base::CommandLine* command_line = |
+ base::CommandLine::ForCurrentProcess(); |
+ if (!command_line->HasSwitch(switches::kIgnoreGpuBlacklist)) { |
+ feature_status = gpu::GetGpuFeatureStatus(gpu_info, *command_line); |
+ } |
+ |
// The process object takes ownership of the thread object, so do not |
// save and delete the pointer. |
- GpuChildThread* child_thread = |
- new GpuChildThread(params_, gpu_info, gpu_memory_buffer_factory_.get()); |
+ GpuChildThread* child_thread = new GpuChildThread( |
+ params_, gpu_info, feature_status, gpu_memory_buffer_factory_.get()); |
// Since we are in the browser process, use the thread start time as the |
// process start time. |