diff options
| author | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-10 23:43:24 +0000 |
|---|---|---|
| committer | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-10 23:43:24 +0000 |
| commit | e4c8344a0d614851954f3001955bfcc01d70b838 (patch) | |
| tree | 11acd10ca1f61a42a4c14bf2cabdfc8b5c847731 /app/x11_util.h | |
| parent | 05b83e60bcab5018cf2f832c587be3698d81b59e (diff) | |
| download | chromium_src-e4c8344a0d614851954f3001955bfcc01d70b838.zip chromium_src-e4c8344a0d614851954f3001955bfcc01d70b838.tar.gz chromium_src-e4c8344a0d614851954f3001955bfcc01d70b838.tar.bz2 | |
Revert 59147 - 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
TBR=davemoore@chromium.org
Review URL: http://codereview.chromium.org/3332019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59175 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/x11_util.h')
| -rw-r--r-- | app/x11_util.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/app/x11_util.h b/app/x11_util.h index c07f42c..8ebed23 100644 --- a/app/x11_util.h +++ b/app/x11_util.h @@ -173,10 +173,8 @@ void GrabWindowSnapshot(GtkWindow* gdk_window, // Change desktop for |window| to the desktop of |destination| window. bool ChangeWindowDesktop(XID window, XID destination); -// Enable the default X error handlers. These will log the error and abort -// the process if called. Use SetX11ErrorHandlers() from x11_util_internal.h -// to set your own error handlers. -void SetDefaultX11ErrorHandlers(); +// Sets the X Error Handlers so we can catch X errors and crash. +void SetX11ErrorHandlers(); } // namespace x11_util |