Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(874)

Side by Side Diff: content/browser/gpu/gpu_process_host.cc

Issue 1320153002: Add new termination status for failed launch (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/gpu/gpu_process_host.h" 5 #include "content/browser/gpu/gpu_process_host.h"
6 6
7 #include "base/base64.h" 7 #include "base/base64.h"
8 #include "base/base_switches.h" 8 #include "base/base_switches.h"
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 497 matching lines...) Expand 10 before | Expand all | Expand 10 after
508 message = "You killed the GPU process! Why?"; 508 message = "You killed the GPU process! Why?";
509 break; 509 break;
510 #if defined(OS_CHROMEOS) 510 #if defined(OS_CHROMEOS)
511 case base::TERMINATION_STATUS_PROCESS_WAS_KILLED_BY_OOM: 511 case base::TERMINATION_STATUS_PROCESS_WAS_KILLED_BY_OOM:
512 message = "The GUP process was killed due to out of memory."; 512 message = "The GUP process was killed due to out of memory.";
513 break; 513 break;
514 #endif 514 #endif
515 case base::TERMINATION_STATUS_PROCESS_CRASHED: 515 case base::TERMINATION_STATUS_PROCESS_CRASHED:
516 message = "The GPU process crashed!"; 516 message = "The GPU process crashed!";
517 break; 517 break;
518 case base::TERMINATION_STATUS_LAUNCH_FAILED:
519 message = "The GPU process failed to start!";
520 break;
518 default: 521 default:
519 break; 522 break;
520 } 523 }
521 } 524 }
522 525
523 BrowserThread::PostTask(BrowserThread::UI, 526 BrowserThread::PostTask(BrowserThread::UI,
524 FROM_HERE, 527 FROM_HERE,
525 base::Bind(&GpuProcessHostUIShim::Destroy, 528 base::Bind(&GpuProcessHostUIShim::Destroy,
526 host_id_, 529 host_id_,
527 message)); 530 message));
(...skipping 619 matching lines...) Expand 10 before | Expand all | Expand 10 after
1147 TRACE_EVENT0("gpu", "GpuProcessHost::OnCacheShader"); 1150 TRACE_EVENT0("gpu", "GpuProcessHost::OnCacheShader");
1148 ClientIdToShaderCacheMap::iterator iter = 1151 ClientIdToShaderCacheMap::iterator iter =
1149 client_id_to_shader_cache_.find(client_id); 1152 client_id_to_shader_cache_.find(client_id);
1150 // If the cache doesn't exist then this is an off the record profile. 1153 // If the cache doesn't exist then this is an off the record profile.
1151 if (iter == client_id_to_shader_cache_.end()) 1154 if (iter == client_id_to_shader_cache_.end())
1152 return; 1155 return;
1153 iter->second->Cache(GetShaderPrefixKey() + ":" + key, shader); 1156 iter->second->Cache(GetShaderPrefixKey() + ":" + key, shader);
1154 } 1157 }
1155 1158
1156 } // namespace content 1159 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698