diff options
| author | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-10 20:40:34 +0000 |
|---|---|---|
| committer | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-10 20:40:34 +0000 |
| commit | e66d704b2fb60846d399cc45cee04d26573725ec (patch) | |
| tree | b49c9dcae3598793e373ee9923c6fcade700a625 /chrome/gpu | |
| parent | c36a87afc467a1fd2eb4bb2309051bc8e45e4393 (diff) | |
| download | chromium_src-e66d704b2fb60846d399cc45cee04d26573725ec.zip chromium_src-e66d704b2fb60846d399cc45cee04d26573725ec.tar.gz chromium_src-e66d704b2fb60846d399cc45cee04d26573725ec.tar.bz2 | |
Allow overriding of X error functions
BUG=50006 (and various other reports)
TEST=Run chrome under nested window manager using Xephyr (see
http://code.google.com/p/chromium/wiki/LayoutTestsLinux)
use --enable-logging=stderr --log-level=0
kill xephyr
examine log. You should see
X IO Error detected
followed (not necessarily immediately) by
successfully saved /tmp/tx/Default/Preferences
successfully saved /tmp/tx/Local State
successfully saved /tmp/tx/Local State
successfully saved /tmp/tx/Default/Preferences
along with no crash.
There is a high ranking crash report on both linux and chromeos that happens whenever X sends an error to chrome. This change causes us to log and continue when we get a regular error from X. When we get an IO error, indicating X is gone, we attempt to shut down gracefully.
Review URL: http://codereview.chromium.org/3175038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59147 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/gpu')
| -rw-r--r-- | chrome/gpu/gpu_thread.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/gpu/gpu_thread.cc b/chrome/gpu/gpu_thread.cc index a949e3b..f1e5148 100644 --- a/chrome/gpu/gpu_thread.cc +++ b/chrome/gpu/gpu_thread.cc @@ -26,6 +26,7 @@ #endif #if defined(OS_LINUX) +#include "app/x11_util.h" #include <gtk/gtk.h> #endif @@ -57,7 +58,7 @@ GpuThread::GpuThread() { for (size_t i = 0; i < args.size(); ++i) { free(argv[i]); } - x11_util::SetX11ErrorHandlers(); + x11_util::SetDefaultX11ErrorHandlers(); } #endif } |