Changeset 154339 in webkit


Ignore:
Timestamp:
Aug 20, 2013 10:31:14 AM (11 years ago)
Author:
dbates@webkit.org
Message:

<​https://webkit.org/b/119914> [iOS] Upstream changes to WebCore/accessibility

Reviewed by Darin Adler and Chris Fleizach.

  • accessibility/AccessibilityMenuList.cpp:

(WebCore::AccessibilityMenuList::press):
(WebCore::AccessibilityMenuList::isCollapsed):

  • accessibility/AccessibilityObject.cpp:

(WebCore::AccessibilityObject::headingElementForNode):
(WebCore::AccessibilityObject::actionVerb):

  • accessibility/AccessibilityObject.h:
  • accessibility/AccessibilityRenderObject.cpp:

(WebCore::AccessibilityRenderObject::boundsForVisiblePositionRange):
(WebCore::AccessibilityRenderObject::actionVerb):

  • accessibility/AccessibilityTableColumn.cpp:

(WebCore::AccessibilityTableColumn::computeAccessibilityIsIgnored):

  • accessibility/AccessibilityTableHeaderContainer.cpp:

(WebCore::AccessibilityTableHeaderContainer::computeAccessibilityIsIgnored):

  • accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
Location:
trunk/Source/WebCore
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r154338 r154339  
     12013-08-20  Daniel Bates  <dabates@apple.com>
     2
     3        <https://webkit.org/b/119914> [iOS] Upstream changes to WebCore/accessibility
     4
     5        Reviewed by Darin Adler and Chris Fleizach.
     6
     7        * accessibility/AccessibilityMenuList.cpp:
     8        (WebCore::AccessibilityMenuList::press):
     9        (WebCore::AccessibilityMenuList::isCollapsed):
     10        * accessibility/AccessibilityObject.cpp:
     11        (WebCore::AccessibilityObject::headingElementForNode):
     12        (WebCore::AccessibilityObject::actionVerb):
     13        * accessibility/AccessibilityObject.h:
     14        * accessibility/AccessibilityRenderObject.cpp:
     15        (WebCore::AccessibilityRenderObject::boundsForVisiblePositionRange):
     16        (WebCore::AccessibilityRenderObject::actionVerb):
     17        * accessibility/AccessibilityTableColumn.cpp:
     18        (WebCore::AccessibilityTableColumn::computeAccessibilityIsIgnored):
     19        * accessibility/AccessibilityTableHeaderContainer.cpp:
     20        (WebCore::AccessibilityTableHeaderContainer::computeAccessibilityIsIgnored):
     21        * accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
     22
    1232013-08-20  Bruno de Oliveira Abinader  <bruno.d@partner.samsung.com>
    224

  • trunk/Source/WebCore/accessibility/AccessibilityMenuList.cpp

    r147135 r154339  
    4545bool AccessibilityMenuList::press() const
    4646{
     47#if !PLATFORM(IOS)
    4748    RenderMenuList* menuList = static_cast<RenderMenuList*>(m_renderer);
    4849    if (menuList->popupIsVisible())
    … …  
    5152        menuList->showPopup();
    5253    return true;
     54#else
     55    return false;
     56#endif
    5357}
    5458
    … …  
    8589bool AccessibilityMenuList::isCollapsed() const
    8690{
     91#if !PLATFORM(IOS)
    8792    return !static_cast<RenderMenuList*>(m_renderer)->popupIsVisible();
     93#else
     94    return true;
     95#endif
    8896}
    8997

  • trunk/Source/WebCore/accessibility/AccessibilityObject.cpp

    r154184 r154339  
    12261226    return anchorRenderer->document()->axObjectCache()->getOrCreate(anchorRenderer);
    12271227}
    1228    
     1228
     1229AccessibilityObject* AccessibilityObject::headingElementForNode(Node* node)
     1230{
     1231    if (!node)
     1232        return 0;
     1233   
     1234    RenderObject* renderObject = node->renderer();
     1235    if (!renderObject)
     1236        return 0;
     1237   
     1238    AccessibilityObject* axObject = renderObject->document()->axObjectCache()->getOrCreate(renderObject);
     1239    for (; axObject && axObject->roleValue() != HeadingRole; axObject = axObject->parentObject()) { }
     1240   
     1241    return axObject;
     1242}
     1243
    12291244void AccessibilityObject::ariaTreeRows(AccessibilityChildrenVector& result)
    12301245{
    … …  
    12771292const String& AccessibilityObject::actionVerb() const
    12781293{
     1294#if !PLATFORM(IOS)
    12791295    // FIXME: Need to add verbs for select elements.
    12801296    DEFINE_STATIC_LOCAL(const String, buttonAction, (AXButtonActionVerb()));
    … …  
    13121328        return noAction;
    13131329    }
     1330#else
     1331    DEFINE_STATIC_LOCAL(const String, noAction, ());
     1332    return noAction;
     1333#endif
    13141334}
    13151335#endif

  • trunk/Source/WebCore/accessibility/AccessibilityObject.h

    r154058 r154339  
    618618   
    619619    static AccessibilityObject* anchorElementForNode(Node*);
     620    static AccessibilityObject* headingElementForNode(Node*);
    620621    virtual Element* anchorElement() const { return 0; }
    621622    virtual Element* actionElement() const { return 0; }
    … …  
    869870#endif
    870871
     872#if PLATFORM(IOS)
     873    int accessibilityPasswordFieldLength();
     874#endif
     875   
    871876    // allows for an AccessibilityObject to update its render tree or perform
    872877    // other operations update type operations

  • trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp

    r154286 r154339  
    19531953    }
    19541954   
    1955 #if PLATFORM(MAC)
     1955#if PLATFORM(MAC) && !PLATFORM(IOS)
    19561956    return m_renderer->document()->view()->contentsToScreen(pixelSnappedIntRect(ourrect));
    19571957#else
    … …  
    31443144const String& AccessibilityRenderObject::actionVerb() const
    31453145{
     3146#if !PLATFORM(IOS)
    31463147    // FIXME: Need to add verbs for select elements.
    31473148    DEFINE_STATIC_LOCAL(const String, buttonAction, (AXButtonActionVerb()));
    … …  
    31703171        return noAction;
    31713172    }
     3173#else
     3174    DEFINE_STATIC_LOCAL(const String, noAction, ());
     3175    return noAction;
     3176#endif
    31723177}
    31733178   

  • trunk/Source/WebCore/accessibility/AccessibilityTableColumn.cpp

    r142382 r154339  
    158158        return true;
    159159   
    160 #if PLATFORM(GTK)
     160#if PLATFORM(IOS) || PLATFORM(GTK)
    161161    return true;
    162162#endif

  • trunk/Source/WebCore/accessibility/AccessibilityTableHeaderContainer.cpp

    r142382 r154339  
    6161        return true;
    6262   
    63 #if PLATFORM(GTK)
     63#if PLATFORM(IOS) || PLATFORM(GTK)
    6464    return true;
    6565#endif

  • trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm

    r154286 r154339  
    5151#import "WAKWindow.h"
    5252#import "WebCoreThread.h"
    53 #import "visible_units.h"
     53#import "VisibleUnits.h"
    5454
    5555#import <GraphicsServices/GraphicsServices.h>
Note: See TracChangeset for help on using the changeset viewer.