diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-10 22:58:41 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-10 22:58:41 +0000 |
| commit | b118d455cb3608f9db4e2c03e8bd4505c08a4922 (patch) | |
| tree | eeaaa704280fcbe9c6ecca0ec84727f0e54b5bb1 | |
| parent | 652b35d3fe371cbae107898625136662bf4aa4e5 (diff) | |
| download | chromium_src-b118d455cb3608f9db4e2c03e8bd4505c08a4922.zip chromium_src-b118d455cb3608f9db4e2c03e8bd4505c08a4922.tar.gz chromium_src-b118d455cb3608f9db4e2c03e8bd4505c08a4922.tar.bz2 | |
Linux: Temporarily turn off use of X shared memory extension.
BUG=25324
TEST=No more crashes in libX11?
Review URL: http://codereview.chromium.org/598025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38690 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/common/x11_util.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/chrome/common/x11_util.cc b/chrome/common/x11_util.cc index d857870..6739dc3 100644 --- a/chrome/common/x11_util.cc +++ b/chrome/common/x11_util.cc @@ -68,6 +68,7 @@ Display* GetXDisplay() { } static SharedMemorySupport DoQuerySharedMemorySupport(Display* dpy) { +#if defined(OS_CHROMEOS) || defined(OS_FREEBSD) || defined(OS_OPENBSD) // A temporary flag for tracking down shared memory problems. // TODO(evanm): remove this. if (CommandLine::ForCurrentProcess()->HasSwitch("disable-xshm")) @@ -102,6 +103,14 @@ static SharedMemorySupport DoQuerySharedMemorySupport(Display* dpy) { XShmDetach(dpy, &shminfo); return pixmaps_supported ? SHARED_MEMORY_PIXMAP : SHARED_MEMORY_PUTIMAGE; +#else // OS_LINUX + // TODO(thestig) Temporarily disabled all together to try to work around + // http://crbug.com/25324 + // Disabling on Linux only. I have no idea what the situation is on *BSD, + // so keeping it enabled as is. For ChromiumOS, enable because we can use + // the right version of libXext. + return SHARED_MEMORY_NONE; +#endif } SharedMemorySupport QuerySharedMemorySupport(Display* dpy) { |