diff options
| -rw-r--r-- | chrome/common/x11_util.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/common/x11_util.cc b/chrome/common/x11_util.cc index 158984d..0b29716 100644 --- a/chrome/common/x11_util.cc +++ b/chrome/common/x11_util.cc @@ -18,6 +18,7 @@ #include <list> #include <set> +#include "base/command_line.h" #include "base/logging.h" #include "base/gfx/size.h" #include "base/thread.h" @@ -67,6 +68,11 @@ Display* GetXDisplay() { } static SharedMemorySupport DoQuerySharedMemorySupport(Display* dpy) { + // A temporary flag for tracking down shared memory problems. + // TODO(evanm): remove this. + if (CommandLine::ForCurrentProcess()->HasSwitch("disable-xshm")) + return SHARED_MEMORY_NONE; + int dummy; Bool pixmaps_supported; // Query the server's support for XSHM. |