bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Linux: Install xlib error handlers to avoid crash on X11 error (issue #1337).

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/2062@1845 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2014-09-24 17:23:55 +00:00
parent e6f28c38eb
commit 82c65084c6
3 changed files with 78 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
tests/cefsimple/cefsimple_linux.cpp
View File

@ -4,6 +4,28 @@
#include "cefsimple/simple_app.h"
#include <X11/Xlib.h>
namespace {
int XErrorHandlerImpl(Display *display, XErrorEvent *event) {
LOG(WARNING)
<< "X error received: "
<< "type " << event->type << ", "
<< "serial " << event->serial << ", "
<< "error_code " << static_cast<int>(event->error_code) << ", "
<< "request_code " << static_cast<int>(event->request_code) << ", "
<< "minor_code " << static_cast<int>(event->minor_code);
return 0;
}
int XIOErrorHandlerImpl(Display *display) {
return 0;
}
} // namespace
// Entry point function for all processes.
int main(int argc, char* argv[]) {
// Provide CEF with command-line arguments.
@ -25,6 +47,11 @@ int main(int argc, char* argv[]) {
// Specify CEF global settings here.
CefSettings settings;
// Install xlib error handlers so that the application won't be terminated
// on non-fatal errors.
XSetErrorHandler(XErrorHandlerImpl);
XSetIOErrorHandler(XIOErrorHandlerImpl);
// Initialize CEF for the browser process.
CefInitialize(main_args, settings, app.get(), NULL);