Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(199)

Side by Side Diff: content/renderer/accessibility/blink_ax_enum_conversion.cc

Issue 744623002: Exposing ARIA state/property aria-orientation on Windows correctly. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: updating aria-list on mac Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/accessibility/blink_ax_enum_conversion.h" 5 #include "content/renderer/accessibility/blink_ax_enum_conversion.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 8
9 namespace content { 9 namespace content {
10 10
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 66
67 if (o.isSelected()) 67 if (o.isSelected())
68 state |= (1 << ui::AX_STATE_SELECTED); 68 state |= (1 << ui::AX_STATE_SELECTED);
69 69
70 if (o.isVisited()) 70 if (o.isVisited())
71 state |= (1 << ui::AX_STATE_VISITED); 71 state |= (1 << ui::AX_STATE_VISITED);
72 72
73 if (o.isEnabled()) 73 if (o.isEnabled())
74 state |= (1 << ui::AX_STATE_ENABLED); 74 state |= (1 << ui::AX_STATE_ENABLED);
75 75
76 if (o.isVertical()) 76 blink::WebAXOrientation orientation = o.orientation();
77 state |= (1 << ui::AX_STATE_VERTICAL); 77 if (orientation) {
dmazzoni 2014/11/29 07:48:19 Nit: I'd drop the if (orientation) check; it's not
78 if (orientation == blink::WebAXOrientationVertical)
79 state |= (1 << ui::AX_STATE_VERTICAL);
80 else if (orientation == blink::WebAXOrientationHorizontal)
81 state |= (1 << ui::AX_STATE_HORIZONTAL);
82 }
78 83
79 if (o.isVisited()) 84 if (o.isVisited())
80 state |= (1 << ui::AX_STATE_VISITED); 85 state |= (1 << ui::AX_STATE_VISITED);
81 86
82 return state; 87 return state;
83 } 88 }
84 89
85 ui::AXRole AXRoleFromBlink(blink::WebAXRole role) { 90 ui::AXRole AXRoleFromBlink(blink::WebAXRole role) {
86 switch (role) { 91 switch (role) {
87 case blink::WebAXRoleAlert: 92 case blink::WebAXRoleAlert:
(...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after
392 case blink::WebAXTextDirectionBT: 397 case blink::WebAXTextDirectionBT:
393 return ui::AX_TEXT_DIRECTION_BT; 398 return ui::AX_TEXT_DIRECTION_BT;
394 default: 399 default:
395 NOTREACHED(); 400 NOTREACHED();
396 } 401 }
397 402
398 return ui::AX_TEXT_DIRECTION_NONE; 403 return ui::AX_TEXT_DIRECTION_NONE;
399 } 404 }
400 405
401 } // namespace content 406 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/accessibility/browser_accessibility_win.cc ('k') | content/shell/renderer/test_runner/web_ax_object_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698