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

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

Issue 2694903010: AX checked state changes (Closed)
Patch Set: Fix android test Created 3 years, 9 months 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
11 uint32_t AXStateFromBlink(const blink::WebAXObject& o) { 11 uint32_t AXStateFromBlink(const blink::WebAXObject& o) {
12 uint32_t state = 0; 12 uint32_t state = 0;
13 if (o.isChecked())
14 state |= (1 << ui::AX_STATE_CHECKED);
15 13
16 blink::WebAXExpanded expanded = o.isExpanded(); 14 blink::WebAXExpanded expanded = o.isExpanded();
17 if (expanded) { 15 if (expanded) {
18 if (expanded == blink::WebAXExpandedCollapsed) 16 if (expanded == blink::WebAXExpandedCollapsed)
19 state |= (1 << ui::AX_STATE_COLLAPSED); 17 state |= (1 << ui::AX_STATE_COLLAPSED);
20 else if (expanded == blink::WebAXExpandedExpanded) 18 else if (expanded == blink::WebAXExpandedExpanded)
21 state |= (1 << ui::AX_STATE_EXPANDED); 19 state |= (1 << ui::AX_STATE_EXPANDED);
22 } 20 }
23 21
24 if (o.canSetFocusAttribute()) 22 if (o.canSetFocusAttribute())
(...skipping 494 matching lines...) Expand 10 before | Expand all | Expand 10 after
519 return ui::AX_INVALID_STATE_SPELLING; 517 return ui::AX_INVALID_STATE_SPELLING;
520 case blink::WebAXInvalidStateGrammar: 518 case blink::WebAXInvalidStateGrammar:
521 return ui::AX_INVALID_STATE_GRAMMAR; 519 return ui::AX_INVALID_STATE_GRAMMAR;
522 case blink::WebAXInvalidStateOther: 520 case blink::WebAXInvalidStateOther:
523 return ui::AX_INVALID_STATE_OTHER; 521 return ui::AX_INVALID_STATE_OTHER;
524 } 522 }
525 NOTREACHED(); 523 NOTREACHED();
526 return ui::AX_INVALID_STATE_NONE; 524 return ui::AX_INVALID_STATE_NONE;
527 } 525 }
528 526
527 ui::AXCheckedState AXCheckedStateFromBlink(
528 blink::WebAXCheckedState checked_state) {
529 switch (checked_state) {
530 case blink::WebAXCheckedFalse:
531 return ui::AX_CHECKED_STATE_FALSE;
532 case blink::WebAXCheckedTrue:
533 return ui::AX_CHECKED_STATE_TRUE;
534 case blink::WebAXCheckedMixed:
535 return ui::AX_CHECKED_STATE_MIXED;
536 }
537 NOTREACHED();
538 return ui::AX_CHECKED_STATE_FALSE;
539 }
540
529 ui::AXSortDirection AXSortDirectionFromBlink( 541 ui::AXSortDirection AXSortDirectionFromBlink(
530 blink::WebAXSortDirection sort_direction) { 542 blink::WebAXSortDirection sort_direction) {
531 switch (sort_direction) { 543 switch (sort_direction) {
532 case blink::WebAXSortDirectionUndefined: 544 case blink::WebAXSortDirectionUndefined:
533 return ui::AX_SORT_DIRECTION_NONE; 545 return ui::AX_SORT_DIRECTION_NONE;
534 case blink::WebAXSortDirectionNone: 546 case blink::WebAXSortDirectionNone:
535 return ui::AX_SORT_DIRECTION_UNSORTED; 547 return ui::AX_SORT_DIRECTION_UNSORTED;
536 case blink::WebAXSortDirectionAscending: 548 case blink::WebAXSortDirectionAscending:
537 return ui::AX_SORT_DIRECTION_ASCENDING; 549 return ui::AX_SORT_DIRECTION_ASCENDING;
538 case blink::WebAXSortDirectionDescending: 550 case blink::WebAXSortDirectionDescending:
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
588 case blink::WebAXTextAffinityUpstream: 600 case blink::WebAXTextAffinityUpstream:
589 return ui::AX_TEXT_AFFINITY_UPSTREAM; 601 return ui::AX_TEXT_AFFINITY_UPSTREAM;
590 case blink::WebAXTextAffinityDownstream: 602 case blink::WebAXTextAffinityDownstream:
591 return ui::AX_TEXT_AFFINITY_DOWNSTREAM; 603 return ui::AX_TEXT_AFFINITY_DOWNSTREAM;
592 } 604 }
593 NOTREACHED(); 605 NOTREACHED();
594 return ui::AX_TEXT_AFFINITY_DOWNSTREAM; 606 return ui::AX_TEXT_AFFINITY_DOWNSTREAM;
595 } 607 }
596 608
597 } // namespace content. 609 } // namespace content.
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698