diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-17 01:17:59 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-17 01:17:59 +0000 |
| commit | 59565102cf40aa74f8564f9368ce4cf27c335de2 (patch) | |
| tree | 204abf39e2f3ec8668c3b2ff66c174b22c955af9 /chrome/gpu | |
| parent | a8d51e57a9c90a133c9cab6e6924a66846d6f284 (diff) | |
| download | chromium_src-59565102cf40aa74f8564f9368ce4cf27c335de2.zip chromium_src-59565102cf40aa74f8564f9368ce4cf27c335de2.tar.gz chromium_src-59565102cf40aa74f8564f9368ce4cf27c335de2.tar.bz2 | |
X11: Make the default X11 error handler non-fatal.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/5066002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66355 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/gpu')
| -rw-r--r-- | chrome/gpu/gpu_main.cc | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/chrome/gpu/gpu_main.cc b/chrome/gpu/gpu_main.cc index 4e4248d..d125de9 100644 --- a/chrome/gpu/gpu_main.cc +++ b/chrome/gpu/gpu_main.cc @@ -30,8 +30,6 @@ #endif #if defined(USE_X11) -#include "app/x11_util.h" -#include "app/x11_util_internal.h" #include "gfx/gtk_util.h" #endif @@ -44,19 +42,7 @@ const int kFieldTrialSize = 1; const int kMinGpuTimeout = 5; const int kMaxGpuTimeout = 20; -#if defined(USE_X11) -int GpuX11ErrorHandler(Display* d, XErrorEvent* error) { - LOG(ERROR) << x11_util::GetErrorEventDescription(d, error); - return 0; -} - -void SetGpuX11ErrorHandlers() { - // Set up the error handlers so that only general errors aren't fatal. - x11_util::SetX11ErrorHandlers(GpuX11ErrorHandler, NULL); -} -#endif - -} +} // namespace // Main function for starting the Gpu process. int GpuMain(const MainFunctionParams& parameters) { @@ -94,7 +80,6 @@ int GpuMain(const MainFunctionParams& parameters) { // should just send a raw display connection down to the GPUProcessor. g_thread_init(NULL); gfx::GtkInitFromCommandLine(command_line); - SetGpuX11ErrorHandlers(); #endif // Load the GL implementation and locate the bindings before starting the GPU |