Changeset 180621 in webkit
- Timestamp:
- Feb 25, 2015 2:04:16 AM (9 years ago)
- Location:
- trunk
- Files:
-
- 16 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r180616 r180621 1 2015-02-25 Joanmarie Diggs <jdiggs@igalia.com> 2 3 AX: Implement support for ARIA 1.1 'searchbox' role 4 https://bugs.webkit.org/show_bug.cgi?id=142004 5 6 Reviewed by Chris Fleizach. 7 8 * accessibility/roles-computedRoleString-expected.txt: Updated for new role. 9 * accessibility/roles-computedRoleString.html: Updated for new role. 10 * accessibility/roles-exposed.html: New test case added. 11 * platform/efl/accessibility/roles-exposed-expected.txt: Updated for new test case. 12 * platform/gtk/accessibility/roles-exposed-expected.txt: Updated for new test case. 13 * platform/mac-mavericks/accessibility/roles-exposed-expected.txt: Updated for new test case. 14 * platform/mac/accessibility/roles-exposed-expected.txt: Updated for new test case. 15 1 16 2015-02-24 Alexey Proskuryakov <ap@apple.com> 2 17 -
trunk/LayoutTests/accessibility/roles-computedRoleString-expected.txt
r174082 r180621 36 36 PASS: input[type='range'] -> slider. 37 37 PASS: input[type='reset'] -> button. 38 PASS: input[type='search'] -> .38 PASS: input[type='search'] -> searchbox. 39 39 PASS: input[type='submit'] -> button. 40 40 PASS: input[type='tel'] -> . -
trunk/LayoutTests/accessibility/roles-computedRoleString.html
r174082 r180621 46 46 <input type="range" data-role="slider" class="ex" data-note="[type='range']"> 47 47 <input type="reset" data-role="button" class="ex" data-note="[type='reset']"> 48 <input type="search" value="X" data-role=" " class="ex" data-note="[type='search']">48 <input type="search" value="X" data-role="searchbox" class="ex" data-note="[type='search']"> 49 49 <input type="submit" data-role="button" class="ex" data-note="[type='submit']"> 50 50 <input type="tel" value="X" data-role="" class="ex" data-note="[type='tel']"> -
trunk/LayoutTests/accessibility/roles-exposed.html
r180600 r180621 301 301 <div role="scrollbar" data-platform="atk,mac" class="ex">X</div> 302 302 <div role="search" data-platform="atk,mac" class="ex">X</div> 303 <div role="searchbox" data-platform="atk,mac" class="ex">X</div> 303 304 <div role="separator" data-platform="atk,mac" class="ex">X</div> 304 305 <div role="slider" data-platform="atk,mac" class="ex">X</div> -
trunk/LayoutTests/platform/efl/accessibility/roles-exposed-expected.txt
r180600 r180621 632 632 AXRole: AXLandmarkSearch 633 633 634 div[role=searchbox] 635 AXRole: AXTextField 636 634 637 div[role=separator] 635 638 AXRole: AXSeparator -
trunk/LayoutTests/platform/gtk/accessibility/roles-exposed-expected.txt
r180600 r180621 632 632 AXRole: AXLandmarkSearch 633 633 634 div[role=searchbox] 635 AXRole: AXTextField 636 634 637 div[role=separator] 635 638 AXRole: AXSeparator -
trunk/LayoutTests/platform/mac-mavericks/accessibility/roles-exposed-expected.txt
r180600 r180621 1050 1050 AXRoleDescription: search 1051 1051 1052 div[role=searchbox] 1053 AXRole: AXTextField 1054 AXSubrole: AXSearchField 1055 AXRoleDescription: search text field 1056 1052 1057 div[role=separator] 1053 1058 AXRole: AXSplitter -
trunk/LayoutTests/platform/mac/accessibility/roles-exposed-expected.txt
r180600 r180621 1050 1050 AXRoleDescription: search 1051 1051 1052 div[role=searchbox] 1053 AXRole: AXTextField 1054 AXSubrole: AXSearchField 1055 AXRoleDescription: search text field 1056 1052 1057 div[role=separator] 1053 1058 AXRole: AXSplitter -
trunk/Source/WebCore/ChangeLog
r180615 r180621 1 2015-02-25 Joanmarie Diggs <jdiggs@igalia.com> 2 3 AX: Implement support for ARIA 1.1 'searchbox' role 4 https://bugs.webkit.org/show_bug.cgi?id=142004 5 6 Reviewed by Chris Fleizach. 7 8 Add a new accessible SearchFieldRole to handle both the ARIA role 9 and the "search" input type. 10 11 No new tests. Instead, added a new test case to roles-exposed.html 12 for the mapping, and updated roles-computedRoleString.html because 13 there is now a one-to-one mapping between the "search" input type 14 and an ARIA role. 15 16 * accessibility/AccessibilityNodeObject.cpp: 17 (WebCore::AccessibilityNodeObject::determineAccessibilityRole): 18 (WebCore::AccessibilityNodeObject::isSearchField): 19 * accessibility/AccessibilityObject.cpp: 20 (WebCore::AccessibilityObject::isARIATextControl): 21 (WebCore::AccessibilityObject::isARIAInput): 22 (WebCore::initializeRoleMap): 23 * accessibility/AccessibilityObject.h: 24 * accessibility/AccessibilityRenderObject.cpp: 25 (WebCore::AccessibilityRenderObject::determineAccessibilityRole): 26 * accessibility/atk/WebKitAccessibleWrapperAtk.cpp: 27 (atkRole): 28 * accessibility/ios/WebAccessibilityObjectWrapperIOS.mm: 29 (-[WebAccessibilityObjectWrapper accessibilityCanFuzzyHitTest]): 30 (-[WebAccessibilityObjectWrapper accessibilityTraits]): 31 (-[WebAccessibilityObjectWrapper determineIsAccessibilityElement]): 32 * accessibility/mac/WebAccessibilityObjectWrapperMac.mm: 33 (createAccessibilityRoleMap): 34 1 35 2015-02-24 Simon Fraser <simon.fraser@apple.com> 2 36 -
trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp
r180600 r180621 303 303 if (input.isInputTypeHidden()) 304 304 return IgnoredRole; 305 if (input.isSearchField()) 306 return SearchFieldRole; 305 307 306 308 #if ENABLE(INPUT_TYPE_COLOR) … … 486 488 return false; 487 489 490 if (roleValue() == SearchFieldRole) 491 return true; 492 488 493 HTMLInputElement* inputElement = node->toInputElement(); 489 494 if (!inputElement) 490 495 return false; 491 492 if (inputElement->isSearchField())493 return true;494 496 495 497 // Some websites don't label their search fields as such. However, they will -
trunk/Source/WebCore/accessibility/AccessibilityObject.cpp
r180600 r180621 387 387 bool AccessibilityObject::isARIATextControl() const 388 388 { 389 return ariaRoleAttribute() == TextAreaRole || ariaRoleAttribute() == TextFieldRole ;389 return ariaRoleAttribute() == TextAreaRole || ariaRoleAttribute() == TextFieldRole || ariaRoleAttribute() == SearchFieldRole; 390 390 } 391 391 … … 780 780 bool AccessibilityObject::isARIAInput(AccessibilityRole ariaRole) 781 781 { 782 return ariaRole == RadioButtonRole || ariaRole == CheckBoxRole || ariaRole == TextFieldRole || ariaRole == SwitchRole ;782 return ariaRole == RadioButtonRole || ariaRole == CheckBoxRole || ariaRole == TextFieldRole || ariaRole == SwitchRole || ariaRole == SearchFieldRole; 783 783 } 784 784 … … 1913 1913 { "scrollbar", ScrollBarRole }, 1914 1914 { "search", LandmarkSearchRole }, 1915 { "searchbox", SearchFieldRole }, 1915 1916 { "separator", SplitterRole }, 1916 1917 { "slider", SliderRole }, -
trunk/Source/WebCore/accessibility/AccessibilityObject.h
r180600 r180621 181 181 ScrollAreaRole, 182 182 ScrollBarRole, 183 SearchFieldRole, 183 184 SheetRole, 184 185 SliderRole, -
trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp
r179770 r180621 2485 2485 return WebAreaRole; 2486 2486 2487 if (cssBox && cssBox->isTextField()) 2488 return TextFieldRole; 2487 if (cssBox && cssBox->isTextField()) { 2488 if (is<HTMLInputElement>(node)) 2489 return downcast<HTMLInputElement>(*node).isSearchField() ? SearchFieldRole : TextFieldRole; 2490 } 2489 2491 2490 2492 if (cssBox && cssBox->isTextArea()) -
trunk/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp
r180600 r180621 525 525 case TextFieldRole: 526 526 case TextAreaRole: 527 case SearchFieldRole: 527 528 return ATK_ROLE_ENTRY; 528 529 case StaticTextRole: -
trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm
r180600 r180621 298 298 case RadioButtonRole: 299 299 case ScrollBarRole: 300 case SearchFieldRole: 300 301 case SliderRole: 301 302 case StaticTextRole: … … 544 545 traits |= [self _axSecureTextFieldTrait]; 545 546 FALLTHROUGH; 547 case SearchFieldRole: 546 548 case TextAreaRole: 547 549 traits |= [self _axTextEntryTrait]; … … 649 651 case HorizontalRuleRole: 650 652 case SwitchRole: 653 case SearchFieldRole: 651 654 return true; 652 655 case StaticTextRole: -
trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm
r180600 r180621 1945 1945 { BlockquoteRole, NSAccessibilityGroupRole }, 1946 1946 { SwitchRole, NSAccessibilityCheckBoxRole }, 1947 { SearchFieldRole, NSAccessibilityTextFieldRole }, 1947 1948 }; 1948 1949 AccessibilityRoleMap& roleMap = *new AccessibilityRoleMap;
Note: See TracChangeset
for help on using the changeset viewer.