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

Unified Diff: gpu/command_buffer/service/gles2_cmd_decoder.cc

Issue 1149233004: Android: Enable 'crash GPU process on context lost' WAR for Mali-400 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | gpu/config/gpu_driver_bug_list_json.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/service/gles2_cmd_decoder.cc
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc
index 951bbd62406e49e96adfa62320ad201a7f37cd24..7bbe050d06ef042c356e1f877bf81a9530ad367b 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -67,6 +67,10 @@
#include "ui/gl/gl_implementation.h"
#include "ui/gl/gl_surface.h"
+#if defined (OS_ANDROID)
+#include "base/sys_info.h"
+#endif
+
#if defined(OS_MACOSX)
#include <IOSurface/IOSurfaceAPI.h>
// Note that this must be included after gl_bindings.h to avoid conflicts.
@@ -11326,7 +11330,12 @@ void GLES2DecoderImpl::MarkContextLost(error::ContextLostReason reason) {
// Some D3D drivers cannot recover from device lost in the GPU process
// sandbox. Allow a new GPU process to launch.
- if (workarounds().exit_on_context_lost) {
+ if (workarounds().exit_on_context_lost
+#if defined(OS_ANDROID)
+ // Don't crash the browser.
+ && !base::SysInfo::IsLowEndDevice()
+#endif
+ ) {
LOG(ERROR) << "Exiting GPU process because some drivers cannot reset"
Zhenyao Mo 2015/06/04 00:58:13 The log message and the above comment are all abou
<< " a D3D device in the Chrome GPU process sandbox.";
#if defined(OS_WIN)
« no previous file with comments | « no previous file | gpu/config/gpu_driver_bug_list_json.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698