Index: content/browser/gpu/gpu_process_host.cc |
diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc |
index a9f8824a2242d45513193e3328d5b43d0c41b41d..4e0fad4b17cd3c6371244ba1e086c7bdecb2e7e6 100644 |
--- a/content/browser/gpu/gpu_process_host.cc |
+++ b/content/browser/gpu/gpu_process_host.cc |
@@ -115,6 +115,7 @@ static const char* const kSwitchNames[] = { |
switches::kDisableAcceleratedVideoDecode, |
switches::kDisableBreakpad, |
switches::kDisableES3GLContext, |
+ switches::kDisableGpuRasterization, |
switches::kDisableGpuSandbox, |
switches::kDisableGpuWatchdog, |
switches::kDisableGLExtensions, |
@@ -126,6 +127,7 @@ static const char* const kSwitchNames[] = { |
#if defined(OS_WIN) |
switches::kEnableAcceleratedVpxDecode, |
#endif |
+ switches::kEnableGpuRasterization, |
switches::kEnableHeapProfiling, |
switches::kEnableLogging, |
#if defined(OS_CHROMEOS) |
@@ -783,15 +785,20 @@ void GpuProcessHost::SendDestroyingVideoSurface(int surface_id, |
} |
#endif |
-void GpuProcessHost::OnInitialized(bool result, const gpu::GPUInfo& gpu_info) { |
+void GpuProcessHost::OnInitialized( |
+ bool result, |
+ const gpu::GPUInfo& gpu_info, |
+ const gpu::GpuFeatureInfo& gpu_feature_info) { |
UMA_HISTOGRAM_BOOLEAN("GPU.GPUProcessInitialized", result); |
initialized_ = result; |
gpu_info_ = gpu_info; |
- if (!initialized_) |
+ if (!initialized_) { |
GpuDataManagerImpl::GetInstance()->OnGpuProcessInitFailure(); |
- else |
- GpuDataManagerImpl::GetInstance()->UpdateGpuInfo(gpu_info); |
+ return; |
+ } |
+ GpuDataManagerImpl::GetInstance()->UpdateGpuInfo(gpu_info); |
+ GpuDataManagerImpl::GetInstance()->UpdateGpuFeatureInfo(gpu_feature_info); |
} |
void GpuProcessHost::OnChannelEstablished( |