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

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: rebase and a nit. 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 498 matching lines...) Expand 10 before | Expand all | Expand 10 after
509 message = "You killed the GPU process! Why?"; 509 message = "You killed the GPU process! Why?";
510 break; 510 break;
511 #if defined(OS_CHROMEOS) 511 #if defined(OS_CHROMEOS)
512 case base::TERMINATION_STATUS_PROCESS_WAS_KILLED_BY_OOM: 512 case base::TERMINATION_STATUS_PROCESS_WAS_KILLED_BY_OOM:
513 message = "The GUP process was killed due to out of memory."; 513 message = "The GUP process was killed due to out of memory.";
514 break; 514 break;
515 #endif 515 #endif
516 case base::TERMINATION_STATUS_PROCESS_CRASHED: 516 case base::TERMINATION_STATUS_PROCESS_CRASHED:
517 message = "The GPU process crashed!"; 517 message = "The GPU process crashed!";
518 break; 518 break;
519 case base::TERMINATION_STATUS_LAUNCH_FAILED:
520 message = "The GPU process failed to start!";
521 break;
519 default: 522 default:
520 break; 523 break;
521 } 524 }
522 } 525 }
523 526
524 BrowserThread::PostTask(BrowserThread::UI, 527 BrowserThread::PostTask(BrowserThread::UI,
525 FROM_HERE, 528 FROM_HERE,
526 base::Bind(&GpuProcessHostUIShim::Destroy, 529 base::Bind(&GpuProcessHostUIShim::Destroy,
527 host_id_, 530 host_id_,
528 message)); 531 message));
(...skipping 619 matching lines...) Expand 10 before | Expand all | Expand 10 after
1148 TRACE_EVENT0("gpu", "GpuProcessHost::OnCacheShader"); 1151 TRACE_EVENT0("gpu", "GpuProcessHost::OnCacheShader");
1149 ClientIdToShaderCacheMap::iterator iter = 1152 ClientIdToShaderCacheMap::iterator iter =
1150 client_id_to_shader_cache_.find(client_id); 1153 client_id_to_shader_cache_.find(client_id);
1151 // If the cache doesn't exist then this is an off the record profile. 1154 // If the cache doesn't exist then this is an off the record profile.
1152 if (iter == client_id_to_shader_cache_.end()) 1155 if (iter == client_id_to_shader_cache_.end())
1153 return; 1156 return;
1154 iter->second->Cache(GetShaderPrefixKey() + ":" + key, shader); 1157 iter->second->Cache(GetShaderPrefixKey() + ":" + key, shader);
1155 } 1158 }
1156 1159
1157 } // namespace content 1160 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698