summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authordominikg@chromium.org <dominikg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-22 21:37:33 +0000
committerdominikg@chromium.org <dominikg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-22 21:37:33 +0000
commit99993e49b65e58a6e972426abd408cb1963c5539 (patch)
tree1e9be251253ccb2229fbf18ee192a2f410251864 /tools
parent4542eefae265642542bb1cce3832bae1937ca3e4 (diff)
downloadchromium_src-99993e49b65e58a6e972426abd408cb1963c5539.zip
chromium_src-99993e49b65e58a6e972426abd408cb1963c5539.tar.gz
chromium_src-99993e49b65e58a6e972426abd408cb1963c5539.tar.bz2
Telemetry: IsGestureSourceTypeSupported returns false for touch on Mac.
While 'gestureSourceTypeSupported' has not rolled into stable, IsGestureSourceTypeSupported returns false for touch input when on Mac. BUG=372714 Review URL: https://codereview.chromium.org/296113005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272328 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
-rw-r--r--tools/telemetry/telemetry/page/actions/gesture_action.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/telemetry/telemetry/page/actions/gesture_action.py b/tools/telemetry/telemetry/page/actions/gesture_action.py
index 1850672..0bbd977 100644
--- a/tools/telemetry/telemetry/page/actions/gesture_action.py
+++ b/tools/telemetry/telemetry/page/actions/gesture_action.py
@@ -56,7 +56,8 @@ class GestureAction(page_action.PageAction):
if tab.EvaluateJavaScript("""
typeof chrome.gpuBenchmarking.gestureSourceTypeSupported ===
'undefined'"""):
- return True
+ return (tab.browser.platform.GetOSName() != 'mac' or
+ gesture_source_type.lower() != 'touch')
return tab.EvaluateJavaScript("""
chrome.gpuBenchmarking.gestureSourceTypeSupported(