summaryrefslogtreecommitdiffstats
path: root/content/gpu/gpu_child_thread.cc
diff options
context:
space:
mode:
authorapatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-20 20:29:39 +0000
committerapatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-20 20:29:39 +0000
commit37cfa2aa6671ac042d83b1f7fb9dd1806503f31c (patch)
tree28d84954ac7f5da3b19de2f723633cca3ac8f95c /content/gpu/gpu_child_thread.cc
parente8476c99df7b4c6fb544f5891c537bc585d0b2c6 (diff)
downloadchromium_src-37cfa2aa6671ac042d83b1f7fb9dd1806503f31c.zip
chromium_src-37cfa2aa6671ac042d83b1f7fb9dd1806503f31c.tar.gz
chromium_src-37cfa2aa6671ac042d83b1f7fb9dd1806503f31c.tar.bz2
Revert 152040 - GPU process exits with error code on failure to initialize.
I think exiting with no error is counted as a GPU process crash for crash stats purposes. Review URL: https://chromiumcodereview.appspot.com/10823375 TBR=apatrick@chromium.org Review URL: https://chromiumcodereview.appspot.com/10854235 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152380 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/gpu/gpu_child_thread.cc')
-rw-r--r--content/gpu/gpu_child_thread.cc9
1 files changed, 2 insertions, 7 deletions
diff --git a/content/gpu/gpu_child_thread.cc b/content/gpu/gpu_child_thread.cc
index bb2a6d7a..9302ab9c 100644
--- a/content/gpu/gpu_child_thread.cc
+++ b/content/gpu/gpu_child_thread.cc
@@ -17,7 +17,6 @@
#include "content/gpu/gpu_watchdog_thread.h"
#include "content/public/common/content_client.h"
#include "content/public/common/content_switches.h"
-#include "content/public/common/result_codes.h"
#include "ipc/ipc_channel_handle.h"
#include "ipc/ipc_sync_message_filter.h"
#include "ui/gl/gl_implementation.h"
@@ -117,12 +116,8 @@ bool GpuChildThread::OnControlMessageReceived(const IPC::Message& msg) {
void GpuChildThread::OnInitialize() {
if (dead_on_arrival_) {
VLOG(1) << "Exiting GPU process due to errors during initialization";
-
- // Exit with the exit code that would be returned if the GPU process was
- // killed using task mamager so that it does not count as a crash.
- // TODO(apatrick): this is temporary to see if this impacts the crash
- // statistics. If it does then the crash accounting should be fixed.
- exit(content::RESULT_CODE_KILLED);
+ MessageLoop::current()->Quit();
+ return;
}
// We don't need to pipe log messages if we are running the GPU thread in