summaryrefslogtreecommitdiffstats
path: root/content/browser/accessibility/browser_accessibility_win.cc
diff options
context:
space:
mode:
authordmazzoni <dmazzoni@chromium.org>2015-02-03 11:27:24 -0800
committerCommit bot <commit-bot@chromium.org>2015-02-03 19:28:15 +0000
commitdea5ba683e6fbf8ad4613d07f73e12b0fa0d66eb (patch)
tree1e511cd219db03ee0423f35027296e18c88b28ad /content/browser/accessibility/browser_accessibility_win.cc
parent10ef1e2aa8ebb806ccfe7c52235f0fb76564ee2c (diff)
downloadchromium_src-dea5ba683e6fbf8ad4613d07f73e12b0fa0d66eb.zip
chromium_src-dea5ba683e6fbf8ad4613d07f73e12b0fa0d66eb.tar.gz
chromium_src-dea5ba683e6fbf8ad4613d07f73e12b0fa0d66eb.tar.bz2
Don't set the STATE_SYSTEM_HOTTRACKED state in tests.
It's set whenever the mouse is over an element, which just leads to flakiness. BUG=454600 NOPRESUBMIT=true Review URL: https://codereview.chromium.org/896653002 Cr-Commit-Position: refs/heads/master@{#314382}
Diffstat (limited to 'content/browser/accessibility/browser_accessibility_win.cc')
-rw-r--r--content/browser/accessibility/browser_accessibility_win.cc12
1 files changed, 10 insertions, 2 deletions
diff --git a/content/browser/accessibility/browser_accessibility_win.cc b/content/browser/accessibility/browser_accessibility_win.cc
index e4d2f37..a550159 100644
--- a/content/browser/accessibility/browser_accessibility_win.cc
+++ b/content/browser/accessibility/browser_accessibility_win.cc
@@ -3568,8 +3568,6 @@ void BrowserAccessibilityWin::InitRoleAndState() {
ia_state |= STATE_SYSTEM_FOCUSABLE;
if (HasState(ui::AX_STATE_HASPOPUP))
ia_state |= STATE_SYSTEM_HASPOPUP;
- if (HasState(ui::AX_STATE_HOVERED))
- ia_state |= STATE_SYSTEM_HOTTRACKED;
if (HasState(ui::AX_STATE_INDETERMINATE))
ia_state |= STATE_SYSTEM_INDETERMINATE;
if (HasIntAttribute(ui::AX_ATTR_INVALID_STATE) &&
@@ -3607,6 +3605,16 @@ void BrowserAccessibilityWin::InitRoleAndState() {
if (HasState(ui::AX_STATE_VISITED))
ia_state |= STATE_SYSTEM_TRAVERSED;
+ // Expose whether or not the mouse is over an element, but suppress
+ // this for tests because it can make the test results flaky depending
+ // on the position of the mouse.
+ BrowserAccessibilityStateImpl* accessibility_state =
+ BrowserAccessibilityStateImpl::GetInstance();
+ if (!accessibility_state->disable_hot_tracking_for_testing()) {
+ if (HasState(ui::AX_STATE_HOVERED))
+ ia_state |= STATE_SYSTEM_HOTTRACKED;
+ }
+
// WebKit marks everything as readonly unless it's editable text, so if it's
// not readonly, mark it as editable now. The final computation of the
// READONLY state for MSAA is below, after the switch.