Diff
Modified: trunk/LayoutTests/ChangeLog (140973 => 140974)
--- trunk/LayoutTests/ChangeLog 2013-01-28 16:59:07 UTC (rev 140973)
+++ trunk/LayoutTests/ChangeLog 2013-01-28 17:05:59 UTC (rev 140974)
@@ -1,3 +1,19 @@
+2013-01-28 James Craig <[email protected]>
+
+ HTML5 promotes DL from specific 'definition list' to superset 'description list'; accessibility strings and accessors should be updated to match.
+ https://bugs.webkit.org/show_bug.cgi?id=107650
+
+ Reviewed by Chris Fleizach.
+
+ Updating accessibility strings and accessors for DL/DT/DD; new one for [role="definition"] (previously it reused the role/desc for DD).
+ Removed gtk expectation as the expectation has changed: platform/gtk/accessibility/lists-expected.txt
+
+ * accessibility/lists.html:
+ * platform/gtk/accessibility/lists-expected.txt: Removed.
+ * platform/mac/accessibility/definition-list-term-expected.txt:
+ * platform/mac/accessibility/definition-list-term.html:
+ * platform/mac/accessibility/lists-expected.txt:
+
2013-01-28 Ádám Kallai <[email protected]>
[Qt] Unreviewed gardening. Added platform specific expectations after r140728.
Modified: trunk/LayoutTests/accessibility/lists.html (140973 => 140974)
--- trunk/LayoutTests/accessibility/lists.html 2013-01-28 16:59:07 UTC (rev 140973)
+++ trunk/LayoutTests/accessibility/lists.html 2013-01-28 17:05:59 UTC (rev 140974)
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
<html>
<script>
if (window.testRunner)
Deleted: trunk/LayoutTests/platform/gtk/accessibility/lists-expected.txt (140973 => 140974)
--- trunk/LayoutTests/platform/gtk/accessibility/lists-expected.txt 2013-01-28 16:59:07 UTC (rev 140973)
+++ trunk/LayoutTests/platform/gtk/accessibility/lists-expected.txt 2013-01-28 17:05:59 UTC (rev 140974)
@@ -1,22 +0,0 @@
-test 1
-test 2
-test 1
-test 2
-term 1
-meaning 2
-term b
-meaning 1
-meaning 2
-
-
-
-
-
-
-
-
-
-
-
-
-
Modified: trunk/LayoutTests/platform/mac/accessibility/definition-list-term-expected.txt (140973 => 140974)
--- trunk/LayoutTests/platform/mac/accessibility/definition-list-term-expected.txt 2013-01-28 16:59:07 UTC (rev 140973)
+++ trunk/LayoutTests/platform/mac/accessibility/definition-list-term-expected.txt 2013-01-28 17:05:59 UTC (rev 140974)
@@ -10,11 +10,11 @@
PASS obj.childAtIndex(0).subrole is "AXSubrole: AXTerm"
PASS obj.childAtIndex(0).roleDescription is "AXRoleDescription: term"
PASS obj.childAtIndex(1).role is 'AXRole: AXGroup'
-PASS obj.childAtIndex(1).subrole is "AXSubrole: AXDefinition"
-PASS obj.childAtIndex(1).roleDescription is "AXRoleDescription: definition"
+PASS obj.childAtIndex(1).subrole is "AXSubrole: AXDescription"
+PASS obj.childAtIndex(1).roleDescription is "AXRoleDescription: description"
PASS obj.childAtIndex(1).role is 'AXRole: AXGroup'
-PASS obj.childAtIndex(1).subrole is "AXSubrole: AXDefinition"
-PASS obj.childAtIndex(1).roleDescription is "AXRoleDescription: definition"
+PASS obj.childAtIndex(1).subrole is "AXSubrole: AXDescription"
+PASS obj.childAtIndex(1).roleDescription is "AXRoleDescription: description"
PASS successfullyParsed is true
TEST COMPLETE
Modified: trunk/LayoutTests/platform/mac/accessibility/definition-list-term.html (140973 => 140974)
--- trunk/LayoutTests/platform/mac/accessibility/definition-list-term.html 2013-01-28 16:59:07 UTC (rev 140973)
+++ trunk/LayoutTests/platform/mac/accessibility/definition-list-term.html 2013-01-28 17:05:59 UTC (rev 140974)
@@ -28,12 +28,12 @@
shouldBe("obj.childAtIndex(0).roleDescription", '"AXRoleDescription: term"');
shouldBe("obj.childAtIndex(1).role", "'AXRole: AXGroup'");
- shouldBe("obj.childAtIndex(1).subrole", '"AXSubrole: AXDefinition"');
- shouldBe("obj.childAtIndex(1).roleDescription", '"AXRoleDescription: definition"');
+ shouldBe("obj.childAtIndex(1).subrole", '"AXSubrole: AXDescription"');
+ shouldBe("obj.childAtIndex(1).roleDescription", '"AXRoleDescription: description"');
shouldBe("obj.childAtIndex(1).role", "'AXRole: AXGroup'");
- shouldBe("obj.childAtIndex(1).subrole", '"AXSubrole: AXDefinition"');
- shouldBe("obj.childAtIndex(1).roleDescription", '"AXRoleDescription: definition"');
+ shouldBe("obj.childAtIndex(1).subrole", '"AXSubrole: AXDescription"');
+ shouldBe("obj.childAtIndex(1).roleDescription", '"AXRoleDescription: description"');
}
</script>
Modified: trunk/LayoutTests/platform/mac/accessibility/lists-expected.txt (140973 => 140974)
--- trunk/LayoutTests/platform/mac/accessibility/lists-expected.txt 2013-01-28 16:59:07 UTC (rev 140973)
+++ trunk/LayoutTests/platform/mac/accessibility/lists-expected.txt 2013-01-28 17:05:59 UTC (rev 140974)
@@ -68,8 +68,8 @@
------------
AXRole: AXList
-AXSubrole: AXDefinitionList
-AXRoleDescription: definition list
+AXSubrole: AXDescriptionList
+AXRoleDescription: list
AXChildren: <array of size 5>
AXHelp:
AXParent: <AXList>
@@ -276,8 +276,8 @@
------------
AXRole: AXGroup
-AXSubrole: AXDefinition
-AXRoleDescription: definition
+AXSubrole: AXDescription
+AXRoleDescription: description
AXChildren: <array of size 1>
AXHelp:
AXParent: <AXGroup>
@@ -324,8 +324,8 @@
------------
AXRole: AXGroup
-AXSubrole: AXDefinition
-AXRoleDescription: definition
+AXSubrole: AXDescription
+AXRoleDescription: description
AXChildren: <array of size 1>
AXHelp:
AXParent: <AXGroup>
@@ -348,8 +348,8 @@
------------
AXRole: AXGroup
-AXSubrole: AXDefinition
-AXRoleDescription: definition
+AXSubrole: AXDescription
+AXRoleDescription: description
AXChildren: <array of size 1>
AXHelp:
AXParent: <AXGroup>
Modified: trunk/Source/WebCore/ChangeLog (140973 => 140974)
--- trunk/Source/WebCore/ChangeLog 2013-01-28 16:59:07 UTC (rev 140973)
+++ trunk/Source/WebCore/ChangeLog 2013-01-28 17:05:59 UTC (rev 140974)
@@ -1,3 +1,57 @@
+2013-01-28 James Craig <[email protected]>
+
+ HTML5 promotes DL from specific 'definition list' to superset 'description list'; accessibility strings and accessors should be updated to match.
+ https://bugs.webkit.org/show_bug.cgi?id=107650
+
+ Reviewed by Chris Fleizach.
+
+ Updating accessibility strings and accessors for DL/DT/DD; new one for [role="definition"] (previously it reused the role/desc for DD).
+
+ Test: platform/mac/accessibility/definition-list-term.html:
+ Test: accessibility/lists.html
+
+ * English.lproj/Localizable.strings:
+ * accessibility/AccessibilityList.cpp:
+ (WebCore::AccessibilityList::isDescriptionList):
+ * accessibility/AccessibilityList.h:
+ (AccessibilityList):
+ * accessibility/AccessibilityObject.cpp:
+ (WebCore::createARIARoleMap):
+ * accessibility/AccessibilityObject.h:
+ * accessibility/AccessibilityRenderObject.cpp:
+ (WebCore::AccessibilityRenderObject::determineAccessibilityRole):
+ * accessibility/mac/WebAccessibilityObjectWrapper.mm:
+ (createAccessibilityRoleMap):
+ (-[WebAccessibilityObjectWrapper subrole]):
+ (-[WebAccessibilityObjectWrapper roleDescription]):
+ * platform/LocalizedStrings.cpp:
+ (WebCore::AXDefinitionText):
+ (WebCore::AXDescriptionListTermText):
+ (WebCore):
+ (WebCore::AXDescriptionListDetailText):
+ * platform/LocalizedStrings.h:
+ (WebCore):
+ * platform/blackberry/LocalizedStringsBlackBerry.cpp:
+ (WebCore::AXDefinitionText):
+ (WebCore::AXDescriptionListDetailText):
+ (WebCore):
+ (WebCore::AXDescriptionListTermText):
+ * platform/efl/LocalizedStringsEfl.cpp:
+ (WebCore::AXDefinitionText):
+ (WebCore):
+ (WebCore::AXDescriptionListTermText):
+ (WebCore::AXDescriptionListDetailText):
+ * platform/gtk/LocalizedStringsGtk.cpp:
+ (WebCore::AXDefinitionText):
+ (WebCore):
+ (WebCore::AXDescriptionListTermText):
+ (WebCore::AXDescriptionListDetailText):
+ * platform/qt/LocalizedStringsQt.cpp:
+ (WebCore::AXDefinitionText):
+ (WebCore::AXDescriptionListTermText):
+ (WebCore):
+ (WebCore::AXDescriptionListDetailText):
+
2013-01-28 Vladislav Kaznacheev <[email protected]>
Web Inspector: Inherit SidebarPane from View.
Modified: trunk/Source/WebCore/English.lproj/Localizable.strings (140973 => 140974)
--- trunk/Source/WebCore/English.lproj/Localizable.strings 2013-01-28 16:59:07 UTC (rev 140973)
+++ trunk/Source/WebCore/English.lproj/Localizable.strings 2013-01-28 17:05:59 UTC (rev 140974)
@@ -610,9 +610,12 @@
/ * a c c e s s i b i l i t y h e l p t e x t f o r e l a p s e d t i m e d i s p l a y * /
" c u r r e n t m o v i e t i m e i n s e c o n d s " = " c u r r e n t m o v i e t i m e i n s e c o n d s " ;
- / * d e f i n i t i o n p h r a s e * /
+ / * d e f i n i t i o n d e t a i l * /
" d e f i n i t i o n " = " d e f i n i t i o n " ;
+ / * d e s c r i p t i o n d e t a i l * /
+ " d e s c r i p t i o n " = " d e s c r i p t i o n " ;
+
/ * A n A R I A a c c e s s i b i l i t y g r o u p t h a t a c t s a s a n d i a l o g . * /
" d i a l o g " = " d i a l o g " ;
Modified: trunk/Source/WebCore/accessibility/AccessibilityList.cpp (140973 => 140974)
--- trunk/Source/WebCore/accessibility/AccessibilityList.cpp 2013-01-28 16:59:07 UTC (rev 140973)
+++ trunk/Source/WebCore/accessibility/AccessibilityList.cpp 2013-01-28 17:05:59 UTC (rev 140974)
@@ -98,7 +98,7 @@
return node && node->hasTagName(olTag);
}
-bool AccessibilityList::isDefinitionList() const
+bool AccessibilityList::isDescriptionList() const
{
if (!m_renderer)
return false;
Modified: trunk/Source/WebCore/accessibility/AccessibilityList.h (140973 => 140974)
--- trunk/Source/WebCore/accessibility/AccessibilityList.h 2013-01-28 16:59:07 UTC (rev 140973)
+++ trunk/Source/WebCore/accessibility/AccessibilityList.h 2013-01-28 17:05:59 UTC (rev 140974)
@@ -50,7 +50,7 @@
virtual bool isList() const { return true; }
bool isUnorderedList() const;
bool isOrderedList() const;
- bool isDefinitionList() const;
+ bool isDescriptionList() const;
virtual AccessibilityRole roleValue() const { return ListRole; }
virtual bool accessibilityIsIgnored() const;
Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.cpp (140973 => 140974)
--- trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2013-01-28 16:59:07 UTC (rev 140973)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2013-01-28 17:05:59 UTC (rev 140974)
@@ -1393,7 +1393,7 @@
{ "gridcell", CellRole },
{ "columnheader", ColumnHeaderRole },
{ "combobox", ComboBoxRole },
- { "definition", DefinitionListDefinitionRole },
+ { "definition", DefinitionRole },
{ "document", DocumentRole },
{ "rowheader", RowHeaderRole },
{ "group", GroupRole },
Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.h (140973 => 140974)
--- trunk/Source/WebCore/accessibility/AccessibilityObject.h 2013-01-28 16:59:07 UTC (rev 140973)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.h 2013-01-28 17:05:59 UTC (rev 140974)
@@ -111,8 +111,9 @@
ColumnRole,
ColumnHeaderRole,
ComboBoxRole,
- DefinitionListTermRole,
- DefinitionListDefinitionRole,
+ DefinitionRole,
+ DescriptionListTermRole,
+ DescriptionListDetailRole,
DirectoryRole,
DisclosureTriangleRole,
DivRole,
Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (140973 => 140974)
--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2013-01-28 16:59:07 UTC (rev 140973)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2013-01-28 17:05:59 UTC (rev 140974)
@@ -2497,10 +2497,10 @@
return MathElementRole;
if (node && node->hasTagName(ddTag))
- return DefinitionListDefinitionRole;
+ return DescriptionListDetailRole;
if (node && node->hasTagName(dtTag))
- return DefinitionListTermRole;
+ return DescriptionListTermRole;
if (node && (node->hasTagName(rpTag) || node->hasTagName(rtTag)))
return AnnotationRole;
Modified: trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapper.mm (140973 => 140974)
--- trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapper.mm 2013-01-28 16:59:07 UTC (rev 140973)
+++ trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapper.mm 2013-01-28 17:05:59 UTC (rev 140974)
@@ -111,8 +111,8 @@
#define NSAccessibilityContentListSubrole @"AXContentList"
#endif
-#ifndef NSAccessibilityDefinitionListSubrole
-#define NSAccessibilityDefinitionListSubrole @"AXDefinitionList"
+#ifndef NSAccessibilityDescriptionListSubrole
+#define NSAccessibilityDescriptionListSubrole @"AXDescriptionList"
#endif
// Miscellaneous
@@ -1600,8 +1600,9 @@
#endif
{ TableHeaderContainerRole, NSAccessibilityGroupRole },
{ RowHeaderRole, NSAccessibilityGroupRole },
- { DefinitionListDefinitionRole, NSAccessibilityGroupRole },
- { DefinitionListTermRole, NSAccessibilityGroupRole },
+ { DefinitionRole, NSAccessibilityGroupRole },
+ { DescriptionListDetailRole, NSAccessibilityGroupRole },
+ { DescriptionListTermRole, NSAccessibilityGroupRole },
{ SliderThumbRole, NSAccessibilityValueIndicatorRole },
{ LandmarkApplicationRole, NSAccessibilityGroupRole },
{ LandmarkBannerRole, NSAccessibilityGroupRole },
@@ -1700,8 +1701,8 @@
AccessibilityList* listObject = static_cast<AccessibilityList*>(m_object);
if (listObject->isUnorderedList() || listObject->isOrderedList())
return NSAccessibilityContentListSubrole;
- if (listObject->isDefinitionList())
- return NSAccessibilityDefinitionListSubrole;
+ if (listObject->isDescriptionList())
+ return NSAccessibilityDescriptionListSubrole;
}
// ARIA content subroles.
@@ -1750,10 +1751,12 @@
return @"AXUserInterfaceTooltip";
case TabPanelRole:
return @"AXTabPanel";
- case DefinitionListTermRole:
+ case DefinitionRole:
+ return @"AXDefinition";
+ case DescriptionListTermRole:
return @"AXTerm";
- case DefinitionListDefinitionRole:
- return @"AXDefinition";
+ case DescriptionListDetailRole:
+ return @"AXDescription";
// Default doesn't return anything, so roles defined below can be chosen.
default:
break;
@@ -1857,10 +1860,12 @@
return AXARIAContentGroupText(@"ARIAUserInterfaceTooltip");
case TabPanelRole:
return AXARIAContentGroupText(@"ARIATabPanel");
- case DefinitionListTermRole:
- return AXDefinitionListTermText();
- case DefinitionListDefinitionRole:
- return AXDefinitionListDefinitionText();
+ case DefinitionRole:
+ return AXDefinitionText();
+ case DescriptionListTermRole:
+ return AXDescriptionListTermText();
+ case DescriptionListDetailRole:
+ return AXDescriptionListDetailText();
case FooterRole:
return AXFooterRoleDescriptionText();
}
Modified: trunk/Source/WebCore/platform/LocalizedStrings.cpp (140973 => 140974)
--- trunk/Source/WebCore/platform/LocalizedStrings.cpp 2013-01-28 16:59:07 UTC (rev 140973)
+++ trunk/Source/WebCore/platform/LocalizedStrings.cpp 2013-01-28 17:05:59 UTC (rev 140974)
@@ -557,16 +557,21 @@
return WEB_UI_STRING("heading", "accessibility role description for headings");
}
-String AXDefinitionListTermText()
+String AXDefinitionText()
{
- return WEB_UI_STRING("term", "term word of a definition");
+ return WEB_UI_STRING("definition", "role description of ARIA definition role");
}
-String AXDefinitionListDefinitionText()
+String AXDescriptionListTermText()
{
- return WEB_UI_STRING("definition", "definition phrase");
+ return WEB_UI_STRING("term", "term word of a description list");
}
+String AXDescriptionListDetailText()
+{
+ return WEB_UI_STRING("description", "description detail");
+}
+
String AXFooterRoleDescriptionText()
{
return WEB_UI_STRING("footer", "accessibility role description for a footer");
Modified: trunk/Source/WebCore/platform/LocalizedStrings.h (140973 => 140974)
--- trunk/Source/WebCore/platform/LocalizedStrings.h 2013-01-28 16:59:07 UTC (rev 140973)
+++ trunk/Source/WebCore/platform/LocalizedStrings.h 2013-01-28 17:05:59 UTC (rev 140974)
@@ -152,8 +152,9 @@
String AXListMarkerText();
String AXImageMapText();
String AXHeadingText();
- String AXDefinitionListTermText();
- String AXDefinitionListDefinitionText();
+ String AXDefinitionText();
+ String AXDescriptionListTermText();
+ String AXDescriptionListDetailText();
String AXFooterRoleDescriptionText();
String AXFileUploadButtonText();
#if PLATFORM(MAC)
Modified: trunk/Source/WebCore/platform/blackberry/LocalizedStringsBlackBerry.cpp (140973 => 140974)
--- trunk/Source/WebCore/platform/blackberry/LocalizedStringsBlackBerry.cpp 2013-01-28 16:59:07 UTC (rev 140973)
+++ trunk/Source/WebCore/platform/blackberry/LocalizedStringsBlackBerry.cpp 2013-01-28 17:05:59 UTC (rev 140974)
@@ -388,18 +388,24 @@
return String();
}
-String AXDefinitionListDefinitionText()
+String AXDefinitionText()
{
notImplemented();
return String();
}
-String AXDefinitionListTermText()
+String AXDescriptionListDetailText()
{
notImplemented();
return String();
}
+String AXDescriptionListTermText()
+{
+ notImplemented();
+ return String();
+}
+
String AXFooterRoleDescriptionText()
{
notImplemented();
Modified: trunk/Source/WebCore/platform/efl/LocalizedStringsEfl.cpp (140973 => 140974)
--- trunk/Source/WebCore/platform/efl/LocalizedStringsEfl.cpp 2013-01-28 16:59:07 UTC (rev 140973)
+++ trunk/Source/WebCore/platform/efl/LocalizedStringsEfl.cpp 2013-01-28 17:05:59 UTC (rev 140974)
@@ -369,14 +369,19 @@
return String::fromUTF8("Clear recent searches");
}
-String AXDefinitionListTermText()
+String AXDefinitionText()
{
+ return String::fromUTF8("definition");
+}
+
+String AXDescriptionListTermText()
+{
return String::fromUTF8("term");
}
-String AXDefinitionListDefinitionText()
+String AXDescriptionListDetailText()
{
- return String::fromUTF8("definition");
+ return String::fromUTF8("description");
}
String AXFooterRoleDescriptionText()
Modified: trunk/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp (140973 => 140974)
--- trunk/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp 2013-01-28 16:59:07 UTC (rev 140973)
+++ trunk/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp 2013-01-28 17:05:59 UTC (rev 140974)
@@ -407,14 +407,19 @@
return String::fromUTF8(_("_Clear recent searches"));
}
-String AXDefinitionListTermText()
+String AXDefinitionText()
{
+ return String::fromUTF8(_("definition"));
+}
+
+String AXDescriptionListTermText()
+{
return String::fromUTF8(_("term"));
}
-String AXDefinitionListDefinitionText()
+String AXDescriptionListDetailText()
{
- return String::fromUTF8(_("definition"));
+ return String::fromUTF8(_("description"));
}
String AXFooterRoleDescriptionText()
Modified: trunk/Source/WebCore/platform/qt/LocalizedStringsQt.cpp (140973 => 140974)
--- trunk/Source/WebCore/platform/qt/LocalizedStringsQt.cpp 2013-01-28 16:59:07 UTC (rev 140973)
+++ trunk/Source/WebCore/platform/qt/LocalizedStringsQt.cpp 2013-01-28 17:05:59 UTC (rev 140974)
@@ -379,18 +379,24 @@
return String();
}
-String AXDefinitionListTermText()
+String AXDefinitionText()
{
notImplemented();
return String();
}
-String AXDefinitionListDefinitionText()
+String AXDescriptionListTermText()
{
notImplemented();
return String();
}
+String AXDescriptionListDetailText()
+{
+ notImplemented();
+ return String();
+}
+
String AXButtonActionVerb()
{
notImplemented();
Modified: trunk/Source/WebKit/chromium/ChangeLog (140973 => 140974)
--- trunk/Source/WebKit/chromium/ChangeLog 2013-01-28 16:59:07 UTC (rev 140973)
+++ trunk/Source/WebKit/chromium/ChangeLog 2013-01-28 17:05:59 UTC (rev 140974)
@@ -1,3 +1,20 @@
+2013-01-28 James Craig <[email protected]>
+
+ HTML5 promotes DL from specific 'definition list' to superset 'description list'; accessibility strings and accessors should be updated to match.
+ https://bugs.webkit.org/show_bug.cgi?id=107650
+
+ Reviewed by Chris Fleizach.
+
+ Updating accessibility strings and accessors for DL/DT/DD; new one for [role="definition"] (previously it reused the role/desc for DD).
+
+ * public/WebAccessibilityRole.h:
+ * src/AssertMatchingEnums.cpp:
+ * src/LocalizedStrings.cpp:
+ (WebCore::AXDefinitionText):
+ (WebCore):
+ (WebCore::AXDescriptionListTermText):
+ (WebCore::AXDescriptionListDetailText):
+
2013-01-28 Mike West <[email protected]>
[chromium] Unreviewed build fix, missing include in AssertMatchingEnums.cpp
Modified: trunk/Source/WebKit/chromium/public/WebAccessibilityRole.h (140973 => 140974)
--- trunk/Source/WebKit/chromium/public/WebAccessibilityRole.h 2013-01-28 16:59:07 UTC (rev 140973)
+++ trunk/Source/WebKit/chromium/public/WebAccessibilityRole.h 2013-01-28 17:05:59 UTC (rev 140974)
@@ -56,8 +56,9 @@
WebAccessibilityRoleColumn,
WebAccessibilityRoleColumnHeader,
WebAccessibilityRoleComboBox,
- WebAccessibilityRoleDefinitionListTerm,
- WebAccessibilityRoleDefinitionListDefinition,
+ WebAccessibilityRoleDefinition,
+ WebAccessibilityRoleDescriptionListTerm,
+ WebAccessibilityRoleDescriptionListDetail,
WebAccessibilityRoleDirectory,
WebAccessibilityRoleDisclosureTriangle,
WebAccessibilityRoleDiv,
Modified: trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp (140973 => 140974)
--- trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp 2013-01-28 16:59:07 UTC (rev 140973)
+++ trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp 2013-01-28 17:05:59 UTC (rev 140974)
@@ -221,8 +221,9 @@
COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleMenuListOption, MenuListOptionRole);
COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleMenuListPopup, MenuListPopupRole);
COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleTableHeaderContainer, TableHeaderContainerRole);
-COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleDefinitionListTerm, DefinitionListTermRole);
-COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleDefinitionListDefinition, DefinitionListDefinitionRole);
+COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleDefinition, DefinitionRole);
+COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleDescriptionListTerm, DescriptionListTermRole);
+COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleDescriptionListDetail, DescriptionListDetailRole);
COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleAnnotation, AnnotationRole);
COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleSliderThumb, SliderThumbRole);
COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleSpinButton, SpinButtonRole);
Modified: trunk/Source/WebKit/chromium/src/LocalizedStrings.cpp (140973 => 140974)
--- trunk/Source/WebKit/chromium/src/LocalizedStrings.cpp 2013-01-28 16:59:07 UTC (rev 140973)
+++ trunk/Source/WebKit/chromium/src/LocalizedStrings.cpp 2013-01-28 17:05:59 UTC (rev 140974)
@@ -145,16 +145,22 @@
return query(WebLocalizedString::AXHeadingText);
}
-String AXDefinitionListTermText()
+String AXDefinitionText()
{
notImplemented();
+ return String("definition");
+}
+
+String AXDescriptionListTermText()
+{
+ notImplemented();
return String("term");
}
-String AXDefinitionListDefinitionText()
+String AXDescriptionListDetailText()
{
notImplemented();
- return String("definition");
+ return String("description");
}
String AXFooterRoleDescriptionText()
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/Utilities.js (140973 => 140974)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/Utilities.js 2013-01-28 16:59:07 UTC (rev 140973)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/Utilities.js 2013-01-28 17:05:59 UTC (rev 140974)
@@ -23,7 +23,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-function createDefinitionList(items) {
+function createDescriptionList(items) {
var list = document.createElement('dl');
items.forEach(function(pair) {
var dt = document.createElement('dt');
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ViewController.js (140973 => 140974)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ViewController.js 2013-01-28 16:59:07 UTC (rev 140973)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ViewController.js 2013-01-28 17:05:59 UTC (rev 140974)
@@ -176,7 +176,7 @@
];
if (passingBuildName)
dlItems.push([document.createTextNode('Passed'), this._domForBuildName(builder, passingBuildName)]);
- result.appendChild(createDefinitionList(dlItems));
+ result.appendChild(createDescriptionList(dlItems));
if (!passingBuildName)
return result;
Modified: trunk/Tools/ChangeLog (140973 => 140974)
--- trunk/Tools/ChangeLog 2013-01-28 16:59:07 UTC (rev 140973)
+++ trunk/Tools/ChangeLog 2013-01-28 17:05:59 UTC (rev 140974)
@@ -1,3 +1,17 @@
+2013-01-28 James Craig <[email protected]>
+
+ HTML5 promotes DL from specific 'definition list' to superset 'description list'; accessibility strings and accessors should be updated to match.
+ https://bugs.webkit.org/show_bug.cgi?id=107650
+
+ Reviewed by Chris Fleizach.
+
+ Updating accessibility strings and accessors for DL/DT/DD.
+
+ * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/Utilities.js:
+ (createDescriptionList):
+ * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ViewController.js:
+ * DumpRenderTree/chromium/TestRunner/src/AccessibilityUIElementChromium.cpp:
+
2013-01-28 Manuel Rego Casasnovas <[email protected]>
[GTK][WTR] Update layoutTestController.pathToLocalResource
Modified: trunk/Tools/DumpRenderTree/chromium/TestRunner/src/AccessibilityUIElementChromium.cpp (140973 => 140974)
--- trunk/Tools/DumpRenderTree/chromium/TestRunner/src/AccessibilityUIElementChromium.cpp 2013-01-28 16:59:07 UTC (rev 140973)
+++ trunk/Tools/DumpRenderTree/chromium/TestRunner/src/AccessibilityUIElementChromium.cpp 2013-01-28 17:05:59 UTC (rev 140974)
@@ -169,10 +169,12 @@
return result.append("ListBoxOption");
case WebAccessibilityRoleTableHeaderContainer:
return result.append("TableHeaderContainer");
- case WebAccessibilityRoleDefinitionListTerm:
- return result.append("DefinitionListTerm");
- case WebAccessibilityRoleDefinitionListDefinition:
- return result.append("DefinitionListDefinition");
+ case WebAccessibilityRoleDefinition:
+ return result.append("Definition");
+ case WebAccessibilityRoleDescriptionListTerm:
+ return result.append("DescriptionListTerm");
+ case WebAccessibilityRoleDescriptionListDetail:
+ return result.append("DescriptionListDetail");
case WebAccessibilityRoleAnnotation:
return result.append("Annotation");
case WebAccessibilityRoleSliderThumb:
