Add article role in SupportsExpanded()

In ARIA 1.1, aria-posinset and aria-setsize was added to "article" role. This patch will add above properties to article, and include some changes for "aria-posinset" in content_browsertests. Bug: none Change-Id: I98647cc4d938a0dcf054290f55bbddbdc7eab087 Reviewed-on: https://chromium-review.googlesource.com/810328 Commit-Queue: Nektarios Paisios <nektar@chromium.org> Reviewed-by: Nektarios Paisios <nektar@chromium.org> Cr-Commit-Position: refs/heads/master@{#523927}

Add article role in SupportsExpanded()
In ARIA 1.1, aria-posinset and aria-setsize was added to "article" role. This patch will add above properties to article, and include some changes for "aria-posinset" in content_browsertests. Bug: none Change-Id: I98647cc4d938a0dcf054290f55bbddbdc7eab087 Reviewed-on: https://chromium-review.googlesource.com/810328 Commit-Queue: Nektarios Paisios <nektar@chromium.org> Reviewed-by: Nektarios Paisios <nektar@chromium.org> Cr-Commit-Position: refs/heads/master@{#523927}
3d32d014 · DongJun Kim · Commit Bot · 9b0a3407 · 3d32d014 · 3d32d014
Commit 3d32d014 authored Dec 13, 2017 by DongJun Kim Committed by Commit Bot Dec 13, 2017
6 changed files
--- a/content/test/data/accessibility/aria/aria-posinset-expected-android.txt
+++ b/content/test/data/accessibility/aria/aria-posinset-expected-android.txt
 android.webkit.WebView focusable focused scrollable
++android.view.View role_description='article' name='This is an ARIA article 1.'
++android.view.View role_description='article' name='This is an ARIA article 2.'
 ++android.widget.ListView role_description='list box' clickable collection item_count=2 row_count=2
 ++++android.view.View clickable collection_item focusable name='Item 1'
 ++++android.view.View clickable collection_item focusable name='Item 2' item_index=1 row_index=1

--- a/content/test/data/accessibility/aria/aria-posinset-expected-blink.txt
+++ b/content/test/data/accessibility/aria/aria-posinset-expected-blink.txt
 rootWebArea
++article setSize=2 posInSet=1
++++staticText name='This is an ARIA article 1.'
++++++inlineTextBox name='This is an ARIA article 1.'
++article setSize=2 posInSet=2
++++staticText name='This is an ARIA article 2.'
++++++inlineTextBox name='This is an ARIA article 2.'
 ++listBox
 ++++listBoxOption selectable name='Item 1' setSize=2 posInSet=1
 ++++listBoxOption selectable name='Item 2' setSize=2 posInSet=2

--- a/content/test/data/accessibility/aria/aria-posinset-expected-mac.txt
+++ b/content/test/data/accessibility/aria/aria-posinset-expected-mac.txt
 AXWebArea AXRoleDescription='HTML content'
++AXGroup AXRoleDescription='article' AXARIASetSize='2' AXARIAPosInSet='1'
++++AXStaticText AXRoleDescription='text' AXValue='This is an ARIA article 1.'
++AXGroup AXRoleDescription='article' AXARIASetSize='2' AXARIAPosInSet='2'
++++AXStaticText AXRoleDescription='text' AXValue='This is an ARIA article 2.'
 ++AXList AXRoleDescription='list'
 ++++AXStaticText AXRoleDescription='text' AXValue='Item 1' AXARIASetSize='2' AXARIAPosInSet='1'
 ++++AXStaticText AXRoleDescription='text' AXValue='Item 2' AXARIASetSize='2' AXARIAPosInSet='2'

--- a/content/test/data/accessibility/aria/aria-posinset-expected-win.txt
+++ b/content/test/data/accessibility/aria/aria-posinset-expected-win.txt
 ROLE_SYSTEM_DOCUMENT READONLY FOCUSABLE
++ROLE_SYSTEM_DOCUMENT READONLY setsize:2 posinset:1
++++ROLE_SYSTEM_STATICTEXT name='This is an ARIA article 1.'
++ROLE_SYSTEM_DOCUMENT READONLY setsize:2 posinset:2
++++ROLE_SYSTEM_STATICTEXT name='This is an ARIA article 2.'
 ++ROLE_SYSTEM_LIST
 ++++ROLE_SYSTEM_LISTITEM name='Item 1' FOCUSABLE setsize:2 posinset:1
 ++++ROLE_SYSTEM_LISTITEM name='Item 2' FOCUSABLE setsize:2 posinset:2

--- a/content/test/data/accessibility/aria/aria-posinset.html
+++ b/content/test/data/accessibility/aria/aria-posinset.html
@@ -9,6 +9,8 @@
 -->
 <html>
 <body onload="loaded()">
+<div role="article"> This is an ARIA article 1. </div>
+<div role="article"> This is an ARIA article 2. </div>
 <div role="listbox">
  <div tabIndex="0" aria-setsize="2" aria-posinset="1" role="option">Item 1</div>
  <div tabIndex="0" aria-setsize="2" aria-posinset="2" role="option">Item 2</div>

--- a/third_party/WebKit/Source/modules/accessibility/AXObject.cpp
+++ b/third_party/WebKit/Source/modules/accessibility/AXObject.cpp
@@ -1097,6 +1097,7 @@ bool AXObject::IsSubWidget(AccessibilityRole role) {

 bool AXObject::SupportsARIASetSizeAndPosInSet() const {
  switch (RoleValue()) {
+    case kArticleRole:
    case kListBoxOptionRole:
    case kListItemRole:
    case kMenuItemRole: