[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
eric at webkit.org
eric at webkit.org
Wed Apr 7 23:34:07 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 68301d906f9e02b5d530ba5fe9b8efdc98cfdc8e
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Nov 12 17:37:39 2009 +0000
2009-11-12 Chris Fleizach <cfleizach at apple.com>
Reviewed by Darin Adler.
ARIA: add alert type roles
https://bugs.webkit.org/show_bug.cgi?id=31392
* platform/mac/accessibility/aria-alerts-expected.txt: Added.
* platform/mac/accessibility/aria-alerts.html: Added.
2009-11-12 Chris Fleizach <cfleizach at apple.com>
Reviewed by Darin Adler.
ARIA: add alert type roles
https://bugs.webkit.org/show_bug.cgi?id=31392
Test: platform/mac/accessibility/aria-alerts.html
* accessibility/AccessibilityObject.h:
* accessibility/AccessibilityRenderObject.cpp:
* accessibility/mac/AccessibilityObjectWrapper.mm:
2009-11-12 Chris Fleizach <cfleizach at apple.com>
Reviewed by Darin Adler.
ARIA: add alert type roles
https://bugs.webkit.org/show_bug.cgi?id=31392
* English.lproj/Localizable.strings:
* StringsNotToBeLocalized.txt:
2009-11-12 Chris Fleizach <cfleizach at apple.com>
Reviewed by Darin Adler.
ARIA: add alert type roles
https://bugs.webkit.org/show_bug.cgi?id=31392
* WebCoreSupport/WebViewFactory.mm:
(-[WebViewFactory AXARIAContentGroupText:]):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50883 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 74b025d..06a202c 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2009-11-12 Chris Fleizach <cfleizach at apple.com>
+
+ Reviewed by Darin Adler.
+
+ ARIA: add alert type roles
+ https://bugs.webkit.org/show_bug.cgi?id=31392
+
+ * platform/mac/accessibility/aria-alerts-expected.txt: Added.
+ * platform/mac/accessibility/aria-alerts.html: Added.
+
2009-11-12 Andras Becsi <becsi.andras at stud.u-szeged.hu>
Rubber-stamped by Tor Arne Vestbø.
diff --git a/LayoutTests/platform/mac/accessibility/aria-alerts-expected.txt b/LayoutTests/platform/mac/accessibility/aria-alerts-expected.txt
new file mode 100644
index 0000000..9fb19b2
--- /dev/null
+++ b/LayoutTests/platform/mac/accessibility/aria-alerts-expected.txt
@@ -0,0 +1,18 @@
+alert role
+alert dialog role
+dialog role
+This tests that each of these ARIA groups has the right role and subrole.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS body.childAtIndex(0).role is 'AXRole: AXGroup'
+PASS body.childAtIndex(0).subrole is 'AXSubrole: AXApplicationAlert'
+PASS body.childAtIndex(1).role is 'AXRole: AXGroup'
+PASS body.childAtIndex(1).subrole is 'AXSubrole: AXApplicationAlertDialog'
+PASS body.childAtIndex(2).role is 'AXRole: AXGroup'
+PASS body.childAtIndex(2).subrole is 'AXSubrole: AXApplicationDialog'
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
diff --git a/LayoutTests/platform/mac/accessibility/aria-alerts.html b/LayoutTests/platform/mac/accessibility/aria-alerts.html
new file mode 100644
index 0000000..a40ba8f
--- /dev/null
+++ b/LayoutTests/platform/mac/accessibility/aria-alerts.html
@@ -0,0 +1,43 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<link rel="stylesheet" href="../../../fast/js/resources/js-test-style.css">
+<script>
+var successfullyParsed = false;
+</script>
+<script src="../../../fast/js/resources/js-test-pre.js"></script>
+</head>
+<body id="body">
+
+<div id="alert" tabindex=0 role="alert">alert role</div>
+<div id="alertdialog" tabindex=0 role="alertdialog">alert dialog role</div>
+<div id="dialog" tabindex=0 role="dialog">dialog role</div>
+
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+
+ description("This tests that each of these ARIA groups has the right role and subrole.");
+
+ if (window.accessibilityController) {
+
+ // this text field should be required.
+ document.getElementById("body").focus();
+ var body = accessibilityController.focusedElement;
+ shouldBe("body.childAtIndex(0).role", "'AXRole: AXGroup'");
+ shouldBe("body.childAtIndex(0).subrole", "'AXSubrole: AXApplicationAlert'");
+
+ shouldBe("body.childAtIndex(1).role", "'AXRole: AXGroup'");
+ shouldBe("body.childAtIndex(1).subrole", "'AXSubrole: AXApplicationAlertDialog'");
+
+ shouldBe("body.childAtIndex(2).role", "'AXRole: AXGroup'");
+ shouldBe("body.childAtIndex(2).subrole", "'AXSubrole: AXApplicationDialog'");
+ }
+
+ successfullyParsed = true;
+</script>
+
+<script src="../../../fast/js/resources/js-test-post.js"></script>
+</body>
+</html>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index fcc894f..cfae672 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2009-11-12 Chris Fleizach <cfleizach at apple.com>
+
+ Reviewed by Darin Adler.
+
+ ARIA: add alert type roles
+ https://bugs.webkit.org/show_bug.cgi?id=31392
+
+ Test: platform/mac/accessibility/aria-alerts.html
+
+ * accessibility/AccessibilityObject.h:
+ * accessibility/AccessibilityRenderObject.cpp:
+ * accessibility/mac/AccessibilityObjectWrapper.mm:
+
2009-11-11 Alexey Proskuryakov <ap at apple.com>
Reviewed by Darin Adler.
diff --git a/WebCore/accessibility/AccessibilityObject.h b/WebCore/accessibility/AccessibilityObject.h
index 80f1287..9e8c7cd 100644
--- a/WebCore/accessibility/AccessibilityObject.h
+++ b/WebCore/accessibility/AccessibilityObject.h
@@ -176,6 +176,9 @@ enum AccessibilityRole {
LandmarkNavigationRole,
LandmarkSearchRole,
+ ApplicationAlertRole,
+ ApplicationAlertDialogRole,
+ ApplicationDialogRole,
ApplicationLogRole,
ApplicationMarqueeRole,
ApplicationStatusRole,
diff --git a/WebCore/accessibility/AccessibilityRenderObject.cpp b/WebCore/accessibility/AccessibilityRenderObject.cpp
index 69a4f4a..085c1c2 100644
--- a/WebCore/accessibility/AccessibilityRenderObject.cpp
+++ b/WebCore/accessibility/AccessibilityRenderObject.cpp
@@ -2432,6 +2432,8 @@ struct RoleEntry {
static const ARIARoleMap& createARIARoleMap()
{
const RoleEntry roles[] = {
+ { "alert", ApplicationAlertRole },
+ { "alertdialog", ApplicationAlertDialogRole },
{ "application", LandmarkApplicationRole },
{ "article", DocumentArticleRole },
{ "banner", LandmarkBannerRole },
@@ -2439,6 +2441,7 @@ static const ARIARoleMap& createARIARoleMap()
{ "checkbox", CheckBoxRole },
{ "complementary", LandmarkComplementaryRole },
{ "contentinfo", LandmarkContentInfoRole },
+ { "dialog", ApplicationDialogRole },
{ "grid", TableRole },
{ "gridcell", CellRole },
{ "columnheader", ColumnHeaderRole },
diff --git a/WebCore/accessibility/mac/AccessibilityObjectWrapper.mm b/WebCore/accessibility/mac/AccessibilityObjectWrapper.mm
index c6c6372..f76f352 100644
--- a/WebCore/accessibility/mac/AccessibilityObjectWrapper.mm
+++ b/WebCore/accessibility/mac/AccessibilityObjectWrapper.mm
@@ -1037,6 +1037,9 @@ static const AccessibilityRoleMap& createAccessibilityRoleMap()
{ LandmarkMainRole, NSAccessibilityGroupRole },
{ LandmarkNavigationRole, NSAccessibilityGroupRole },
{ LandmarkSearchRole, NSAccessibilityGroupRole },
+ { ApplicationAlertRole, NSAccessibilityGroupRole },
+ { ApplicationAlertDialogRole, NSAccessibilityGroupRole },
+ { ApplicationDialogRole, NSAccessibilityGroupRole },
{ ApplicationLogRole, NSAccessibilityGroupRole },
{ ApplicationMarqueeRole, NSAccessibilityGroupRole },
{ ApplicationStatusRole, NSAccessibilityGroupRole },
@@ -1116,6 +1119,12 @@ static NSString* roleValueToNSString(AccessibilityRole value)
return @"AXLandmarkNavigation";
case LandmarkSearchRole:
return @"AXLandmarkSearch";
+ case ApplicationAlertRole:
+ return @"AXApplicationAlert";
+ case ApplicationAlertDialogRole:
+ return @"AXApplicationAlertDialog";
+ case ApplicationDialogRole:
+ return @"AXApplicationDialog";
case ApplicationLogRole:
return @"AXApplicationLog";
case ApplicationMarqueeRole:
@@ -1177,6 +1186,12 @@ static NSString* roleValueToNSString(AccessibilityRole value)
return AXARIAContentGroupText(@"ARIALandmarkNavigation");
case LandmarkSearchRole:
return AXARIAContentGroupText(@"ARIALandmarkSearch");
+ case ApplicationAlertRole:
+ return AXARIAContentGroupText(@"ARIAApplicationAlert");
+ case ApplicationAlertDialogRole:
+ return AXARIAContentGroupText(@"ARIAApplicationAlertDialog");
+ case ApplicationDialogRole:
+ return AXARIAContentGroupText(@"ARIAApplicationDialog");
case ApplicationLogRole:
return AXARIAContentGroupText(@"ARIAApplicationLog");
case ApplicationMarqueeRole:
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 26efc6b..0325fd2 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2009-11-12 Chris Fleizach <cfleizach at apple.com>
+
+ Reviewed by Darin Adler.
+
+ ARIA: add alert type roles
+ https://bugs.webkit.org/show_bug.cgi?id=31392
+
+ * English.lproj/Localizable.strings:
+ * StringsNotToBeLocalized.txt:
+
2009-11-02 Eric Carlson <eric.carlson at apple.com>
Reviewed by John Sullivan and Mark Rowe.
diff --git a/WebKit/English.lproj/Localizable.strings b/WebKit/English.lproj/Localizable.strings
index a20e6ee..459aebb 100644
Binary files a/WebKit/English.lproj/Localizable.strings and b/WebKit/English.lproj/Localizable.strings differ
diff --git a/WebKit/StringsNotToBeLocalized.txt b/WebKit/StringsNotToBeLocalized.txt
index 7951dd8..62eb49e 100644
--- a/WebKit/StringsNotToBeLocalized.txt
+++ b/WebKit/StringsNotToBeLocalized.txt
@@ -96,6 +96,9 @@
"@"
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+-."
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+.-"
+"ARIAApplicationAlert"
+"ARIAApplicationAlertDialog"
+"ARIAApplicationDialog"
"ARIAApplicationLog"
"ARIAApplicationMarquee"
"ARIAApplicationStatus"
diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index f447849..866819c 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,13 @@
+2009-11-12 Chris Fleizach <cfleizach at apple.com>
+
+ Reviewed by Darin Adler.
+
+ ARIA: add alert type roles
+ https://bugs.webkit.org/show_bug.cgi?id=31392
+
+ * WebCoreSupport/WebViewFactory.mm:
+ (-[WebViewFactory AXARIAContentGroupText:]):
+
2009-11-10 Daniel Bates <dbates at webkit.org>
Reviewed by Oliver Hunt.
diff --git a/WebKit/mac/WebCoreSupport/WebViewFactory.mm b/WebKit/mac/WebCoreSupport/WebViewFactory.mm
index 53df7fe..2c986fd 100644
--- a/WebKit/mac/WebCoreSupport/WebViewFactory.mm
+++ b/WebKit/mac/WebCoreSupport/WebViewFactory.mm
@@ -555,6 +555,12 @@
- (NSString *)AXARIAContentGroupText:(NSString *)ariaType
{
+ if ([ariaType isEqualToString:@"ARIAApplicationAlert"])
+ return UI_STRING("alert", "An ARIA accessibility group that acts as an alert.");
+ if ([ariaType isEqualToString:@"ARIAApplicationAlertDialog"])
+ return UI_STRING("alert dialog", "An ARIA accessibility group that acts as an alert dialog.");
+ if ([ariaType isEqualToString:@"ARIAApplicationDialog"])
+ return UI_STRING("dialog", "An ARIA accessibility group that acts as an dialog.");
if ([ariaType isEqualToString:@"ARIAApplicationLog"])
return UI_STRING("log", "An ARIA accessibility group that acts as a console log.");
if ([ariaType isEqualToString:@"ARIAApplicationMarquee"])
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list