Changeset 207401 in webkit


Ignore:
Timestamp:
Oct 16, 2016 10:58:18 PM (7 years ago)
Author:
n_wang@apple.com
Message:

AX: [Mac] roleDescription for AXTextField input types
https://bugs.webkit.org/show_bug.cgi?id=163419
<rdar://problem/28766192>

Reviewed by Darin Adler.

Source/WebCore:

Provided more detailed role description for input types that
exposed as standard text fields on the mac.

Changes are covered in modified test expectation.

  • English.lproj/Localizable.strings:
  • accessibility/mac/WebAccessibilityObjectWrapperMac.mm:

(-[WebAccessibilityObjectWrapper roleDescription]):

  • platform/LocalizedStrings.cpp:

(WebCore::AXEmailFieldText):
(WebCore::AXTelephoneFieldText):
(WebCore::AXURLFieldText):
(WebCore::AXDateFieldText):
(WebCore::AXTimeFieldText):

  • platform/LocalizedStrings.h:
  • platform/efl/LocalizedStringsEfl.cpp:

(WebCore::AXEmailFieldText):
(WebCore::AXTelephoneFieldText):
(WebCore::AXURLFieldText):
(WebCore::AXDateFieldText):
(WebCore::AXTimeFieldText):

  • platform/gtk/LocalizedStringsGtk.cpp:

(WebCore::AXEmailFieldText):
(WebCore::AXTelephoneFieldText):
(WebCore::AXURLFieldText):
(WebCore::AXDateFieldText):
(WebCore::AXTimeFieldText):

LayoutTests:

  • platform/mac/accessibility/roles-exposed-expected.txt:
Location:
trunk
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r207400 r207401  
     12016-10-16  Nan Wang  <n_wang@apple.com>
     2
     3        AX: [Mac] roleDescription for AXTextField input types
     4        https://bugs.webkit.org/show_bug.cgi?id=163419
     5        <rdar://problem/28766192>
     6
     7        Reviewed by Darin Adler.
     8
     9        * platform/mac/accessibility/roles-exposed-expected.txt:
     10
    1112016-10-16  Michael Catanzaro  <mcatanzaro@igalia.com>
    212
  • trunk/LayoutTests/platform/mac/accessibility/roles-exposed-expected.txt

    r200415 r207401  
    238238      AXRole: AXTextField
    239239      AXSubrole:
     240      AXRoleDescription: date field
     241     
     242input[type='datetime']
     243      AXRole: AXTextField
     244      AXSubrole:
    240245      AXRoleDescription: text field
    241246     
    242 input[type='datetime']
     247input[type='datetime-local']
    243248      AXRole: AXTextField
    244249      AXSubrole:
    245250      AXRoleDescription: text field
    246251     
    247 input[type='datetime-local']
    248       AXRole: AXTextField
    249       AXSubrole:
    250       AXRoleDescription: text field
    251      
    252252input[type='email']
    253253      AXRole: AXTextField
    254254      AXSubrole:
    255       AXRoleDescription: text field
     255      AXRoleDescription: email field
    256256     
    257257input[type='file']
     
    313313      AXRole: AXTextField
    314314      AXSubrole:
     315      AXRoleDescription: telephone number field
     316     
     317input[type='text']
     318      AXRole: AXTextField
     319      AXSubrole:
    315320      AXRoleDescription: text field
    316321     
    317 input[type='text']
    318       AXRole: AXTextField
    319       AXSubrole:
    320       AXRoleDescription: text field
    321      
    322322input[type='time']
    323323      AXRole: AXTextField
    324324      AXSubrole:
    325       AXRoleDescription: text field
     325      AXRoleDescription: time field
    326326     
    327327input[type='url']
    328328      AXRole: AXTextField
    329329      AXSubrole:
    330       AXRoleDescription: text field
     330      AXRoleDescription: URL field
    331331     
    332332input[type='week']
  • trunk/Source/WebCore/ChangeLog

    r207398 r207401  
     12016-10-16  Nan Wang  <n_wang@apple.com>
     2
     3        AX: [Mac] roleDescription for AXTextField input types
     4        https://bugs.webkit.org/show_bug.cgi?id=163419
     5        <rdar://problem/28766192>
     6
     7        Reviewed by Darin Adler.
     8
     9        Provided more detailed role description for input types that
     10        exposed as standard text fields on the mac.
     11
     12        Changes are covered in modified test expectation.
     13
     14        * English.lproj/Localizable.strings:
     15        * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
     16        (-[WebAccessibilityObjectWrapper roleDescription]):
     17        * platform/LocalizedStrings.cpp:
     18        (WebCore::AXEmailFieldText):
     19        (WebCore::AXTelephoneFieldText):
     20        (WebCore::AXURLFieldText):
     21        (WebCore::AXDateFieldText):
     22        (WebCore::AXTimeFieldText):
     23        * platform/LocalizedStrings.h:
     24        * platform/efl/LocalizedStringsEfl.cpp:
     25        (WebCore::AXEmailFieldText):
     26        (WebCore::AXTelephoneFieldText):
     27        (WebCore::AXURLFieldText):
     28        (WebCore::AXDateFieldText):
     29        (WebCore::AXTimeFieldText):
     30        * platform/gtk/LocalizedStringsGtk.cpp:
     31        (WebCore::AXEmailFieldText):
     32        (WebCore::AXTelephoneFieldText):
     33        (WebCore::AXURLFieldText):
     34        (WebCore::AXDateFieldText):
     35        (WebCore::AXTimeFieldText):
     36
    1372016-10-16  Chris Dumez  <cdumez@apple.com>
    238
  • trunk/Source/WebCore/English.lproj/Localizable.strings

    r207398 r207401  
    218218"Cut (Undo action name)" = "Cut";
    219219
     220/* accessibility role description for a date field */
     221"date field" = "date field";
     222
    220223/* Default writing direction context menu item */
    221224"Default" = "Default";
     
    245248"Drag (Undo action name)" = "Drag";
    246249
     250/* accessibility role description for an email field */
     251"email field" = "email field";
     252
    247253/* Video Enter Fullscreen context menu item */
    248254"Enter Full Screen" = "Enter Full Screen";
     
    614620"Take Video (file upload action sheet)" = "Take Video";
    615621
     622/* accessibility role description for a telephone number field */
     623"telephone number field" = "telephone number field";
     624
    616625/* Text Replacement context menu item */
    617626"Text Replacement" = "Text Replacement";
     
    10881097"term" = "term";
    10891098
     1099/* accessibility role description for a time field */
     1100"time field" = "time field";
     1101
    10901102/* accessibility label for timeline thumb */
    10911103"timeline slider thumb" = "timeline slider thumb";
     
    11331145"unsupported version" = "unsupported version";
    11341146
     1147/* accessibility role description for a URL field */
     1148"URL field" = "URL field";
     1149
    11351150/* Validation message for required form control elements that have no value */
    11361151"value missing" = "value missing";
  • trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm

    r207314 r207401  
    25172517        return AXHeadingText();
    25182518   
     2519    if ([axRole isEqualToString:NSAccessibilityTextFieldRole]) {
     2520        auto* node = m_object->node();
     2521        if (is<HTMLInputElement>(node)) {
     2522            auto& input = downcast<HTMLInputElement>(*node);
     2523            if (input.isEmailField())
     2524                return AXEmailFieldText();
     2525            if (input.isTelephoneField())
     2526                return AXTelephoneFieldText();
     2527            if (input.isURLField())
     2528                return AXURLFieldText();
     2529           
     2530            // These input types are not enabled on mac yet, we check the type attribute for now.
     2531            auto& type = input.attributeWithoutSynchronization(typeAttr);
     2532            if (equalLettersIgnoringASCIICase(type, "date"))
     2533                return AXDateFieldText();
     2534            if (equalLettersIgnoringASCIICase(type, "time"))
     2535                return AXTimeFieldText();
     2536        }
     2537    }
     2538   
    25192539    if (m_object->isFileUploadButton())
    25202540        return AXFileUploadButtonText();
  • trunk/Source/WebCore/platform/LocalizedStrings.cpp

    r206943 r207401  
    639639{
    640640    return WEB_UI_STRING("figure", "accessibility role description for a figure element.");
     641}
     642
     643String AXEmailFieldText()
     644{
     645    return WEB_UI_STRING("email field", "accessibility role description for an email field.");
     646}
     647
     648String AXTelephoneFieldText()
     649{
     650    return WEB_UI_STRING("telephone number field", "accessibility role description for a telephone number field.");
     651}
     652
     653String AXURLFieldText()
     654{
     655    return WEB_UI_STRING("URL field", "accessibility role description for a URL field.");
     656}
     657
     658String AXDateFieldText()
     659{
     660    return WEB_UI_STRING("date field", "accessibility role description for a date field.");
     661}
     662
     663String AXTimeFieldText()
     664{
     665    return WEB_UI_STRING("time field", "accessibility role description for a time field.");
    641666}
    642667
  • trunk/Source/WebCore/platform/LocalizedStrings.h

    r206943 r207401  
    172172    String AXSummaryText();
    173173    String AXFigureText();
     174    String AXEmailFieldText();
     175    String AXTelephoneFieldText();
     176    String AXURLFieldText();
     177    String AXDateFieldText();
     178    String AXTimeFieldText();
    174179   
    175180    String AXButtonActionVerb();
  • trunk/Source/WebCore/platform/efl/LocalizedStringsEfl.cpp

    r206943 r207401  
    412412{
    413413    return String::fromUTF8("figure");
     414}
     415
     416String AXEmailFieldText()
     417{
     418    return String::fromUTF8("email field");
     419}
     420
     421String AXTelephoneFieldText()
     422{
     423    return String::fromUTF8("telephone number field");
     424}
     425
     426String AXURLFieldText()
     427{
     428    return String::fromUTF8("URL field");
     429}
     430
     431String AXDateFieldText()
     432{
     433    return String::fromUTF8("date field");
     434}
     435
     436String AXTimeFieldText()
     437{
     438    return String::fromUTF8("time field");
    414439}
    415440
  • trunk/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp

    r206943 r207401  
    460460{
    461461    return String::fromUTF8(_("figure"));
     462}
     463
     464String AXEmailFieldText()
     465{
     466    return String::fromUTF8(_("email field"));
     467}
     468
     469String AXTelephoneFieldText()
     470{
     471    return String::fromUTF8(_("telephone number field"));
     472}
     473
     474String AXURLFieldText()
     475{
     476    return String::fromUTF8(_("URL field"));
     477}
     478
     479String AXDateFieldText()
     480{
     481    return String::fromUTF8(_("date field"));
     482}
     483
     484String AXTimeFieldText()
     485{
     486    return String::fromUTF8(_("time field"));
    462487}
    463488
Note: See TracChangeset for help on using the changeset viewer.