summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-12 01:41:35 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-12 01:41:35 +0000
commitad2de014a9cae72412cd3f64066185fe410cecc5 (patch)
tree74280718d6d85c0a61c7056b9ae708698fec87a5 /chrome/common
parentd12e147eb2efaf70a6c3ba4a07101510bac0984e (diff)
downloadchromium_src-ad2de014a9cae72412cd3f64066185fe410cecc5.zip
chromium_src-ad2de014a9cae72412cd3f64066185fe410cecc5.tar.gz
chromium_src-ad2de014a9cae72412cd3f64066185fe410cecc5.tar.bz2
linux: add a temporary flag for disabling xshm
This will hopefully help track down problems with drawing performance. BUG=31699 Review URL: http://codereview.chromium.org/546009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35984 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/x11_util.cc6
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.