Diff
Modified: branches/chromium/1364/LayoutTests/fast/forms/date-multiple-fields/date-multiple-fields-ax-aria-attributes-expected.txt (141200 => 141201)
--- branches/chromium/1364/LayoutTests/fast/forms/date-multiple-fields/date-multiple-fields-ax-aria-attributes-expected.txt 2013-01-30 02:19:31 UTC (rev 141200)
+++ branches/chromium/1364/LayoutTests/fast/forms/date-multiple-fields/date-multiple-fields-ax-aria-attributes-expected.txt 2013-01-30 02:22:59 UTC (rev 141201)
@@ -3,14 +3,18 @@
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+Initial empty state
+PASS focusedElementDescription() is "AXHelp: Month, AXValueDescription: blank, intValue:0, range:1-12"
+PASS focusedElementDescription() is "AXHelp: Day, AXValueDescription: blank, intValue:0, range:1-31"
+PASS focusedElementDescription() is "AXHelp: Year, AXValueDescription: blank, intValue:0, range:1-275760"
Non-empty value
-PASS focusedFieldValueDescription() is "AXHelp: Month, AXValueDescription: 10, 1, 12"
-PASS focusedFieldValueDescription() is "AXHelp: Day, AXValueDescription: 09, 1, 31"
-PASS focusedFieldValueDescription() is "AXHelp: Year, AXValueDescription: 2012, 1, 275760"
+PASS focusedElementDescription() is "AXHelp: Month, AXValueDescription: 10, intValue:10, range:1-12"
+PASS focusedElementDescription() is "AXHelp: Day, AXValueDescription: 09, intValue:9, range:1-31"
+PASS focusedElementDescription() is "AXHelp: Year, AXValueDescription: 2012, intValue:2012, range:1-275760"
Empty value
-PASS focusedFieldValueDescription() is "AXHelp: Year, AXValueDescription: blank, 1, 275760"
-PASS focusedFieldValueDescription() is "AXHelp: Day, AXValueDescription: blank, 1, 31"
-PASS focusedFieldValueDescription() is "AXHelp: Month, AXValueDescription: blank, 1, 12"
+PASS focusedElementDescription() is "AXHelp: Year, AXValueDescription: blank, intValue:0, range:1-275760"
+PASS focusedElementDescription() is "AXHelp: Day, AXValueDescription: blank, intValue:0, range:1-31"
+PASS focusedElementDescription() is "AXHelp: Month, AXValueDescription: blank, intValue:0, range:1-12"
PASS successfullyParsed is true
Modified: branches/chromium/1364/LayoutTests/fast/forms/date-multiple-fields/date-multiple-fields-ax-aria-attributes.html (141200 => 141201)
--- branches/chromium/1364/LayoutTests/fast/forms/date-multiple-fields/date-multiple-fields-ax-aria-attributes.html 2013-01-30 02:19:31 UTC (rev 141200)
+++ branches/chromium/1364/LayoutTests/fast/forms/date-multiple-fields/date-multiple-fields-ax-aria-attributes.html 2013-01-30 02:22:59 UTC (rev 141201)
@@ -2,40 +2,45 @@
<html>
<head>
<script src=""
+<script src=""
</head>
<body>
-<input id="test" type="date" value="2012-10-09">
+<input id="test" type="date">
<script>
description('This test checks aria-help attribute of fields in multiple fields date input UI.');
-function focusedFieldValueDescription()
-{
- var element = accessibilityController.focusedElement;
- return element.helpText + ', ' + element.valueDescription + ', ' + element.minValue + ', ' + element.maxValue;
-}
-
var testInput = document.getElementById('test');
if (!window.accessibilityController || !window.eventSender)
debug('Please run inside DRT or WTR.');
else {
- debug('Non-empty value');
testInput.focus();
- shouldBeEqualToString('focusedFieldValueDescription()', 'AXHelp: Month, AXValueDescription: 10, 1, 12');
+ debug('Initial empty state');
+ checkFocusedElementAXAttributes('AXHelp: Month, AXValueDescription: blank, intValue:0, range:1-12');
eventSender.keyDown('\t');
- shouldBeEqualToString('focusedFieldValueDescription()', 'AXHelp: Day, AXValueDescription: 09, 1, 31');
+ checkFocusedElementAXAttributes('AXHelp: Day, AXValueDescription: blank, intValue:0, range:1-31');
eventSender.keyDown('\t');
- shouldBeEqualToString('focusedFieldValueDescription()', 'AXHelp: Year, AXValueDescription: 2012, 1, 275760');
+ checkFocusedElementAXAttributes('AXHelp: Year, AXValueDescription: blank, intValue:0, range:1-275760');
+ eventSender.keyDown('\t', ['shiftKey']);
+ eventSender.keyDown('\t', ['shiftKey']);
+ debug('Non-empty value');
+ testInput.value = "2012-10-09";
+ checkFocusedElementAXAttributes('AXHelp: Month, AXValueDescription: 10, intValue:10, range:1-12');
+ eventSender.keyDown('\t');
+ checkFocusedElementAXAttributes('AXHelp: Day, AXValueDescription: 09, intValue:9, range:1-31');
+ eventSender.keyDown('\t');
+ checkFocusedElementAXAttributes('AXHelp: Year, AXValueDescription: 2012, intValue:2012, range:1-275760');
+
debug('Empty value');
eventSender.keyDown('\b');
- shouldBeEqualToString('focusedFieldValueDescription()', 'AXHelp: Year, AXValueDescription: blank, 1, 275760');
+ checkFocusedElementAXAttributes('AXHelp: Year, AXValueDescription: blank, intValue:0, range:1-275760');
eventSender.keyDown('\t', ['shiftKey']);
eventSender.keyDown('\b');
- shouldBeEqualToString('focusedFieldValueDescription()', 'AXHelp: Day, AXValueDescription: blank, 1, 31');
+ checkFocusedElementAXAttributes('AXHelp: Day, AXValueDescription: blank, intValue:0, range:1-31');
eventSender.keyDown('\t', ['shiftKey']);
eventSender.keyDown('\b');
- shouldBeEqualToString('focusedFieldValueDescription()', 'AXHelp: Month, AXValueDescription: blank, 1, 12');
+ checkFocusedElementAXAttributes('AXHelp: Month, AXValueDescription: blank, intValue:0, range:1-12');
debug('');
testInput.parentNode.removeChild(testInput);
Modified: branches/chromium/1364/LayoutTests/fast/forms/month-multiple-fields/month-multiple-fields-ax-aria-attributes-expected.txt (141200 => 141201)
--- branches/chromium/1364/LayoutTests/fast/forms/month-multiple-fields/month-multiple-fields-ax-aria-attributes-expected.txt 2013-01-30 02:19:31 UTC (rev 141200)
+++ branches/chromium/1364/LayoutTests/fast/forms/month-multiple-fields/month-multiple-fields-ax-aria-attributes-expected.txt 2013-01-30 02:22:59 UTC (rev 141201)
@@ -4,11 +4,11 @@
Non-empty value
-PASS focusedFieldValueDescription() is "AXHelp: Month, AXValueDescription: October, 1, 12"
-PASS focusedFieldValueDescription() is "AXHelp: Year, AXValueDescription: 2012, 1, 275760"
+PASS focusedElementDescription() is "AXHelp: Month, AXValueDescription: October, intValue:10, range:1-12"
+PASS focusedElementDescription() is "AXHelp: Year, AXValueDescription: 2012, intValue:2012, range:1-275760"
Empty value
-PASS focusedFieldValueDescription() is "AXHelp: Year, AXValueDescription: blank, 1, 275760"
-PASS focusedFieldValueDescription() is "AXHelp: Month, AXValueDescription: blank, 1, 12"
+PASS focusedElementDescription() is "AXHelp: Year, AXValueDescription: blank, intValue:0, range:1-275760"
+PASS focusedElementDescription() is "AXHelp: Month, AXValueDescription: blank, intValue:0, range:1-12"
PASS successfullyParsed is true
Modified: branches/chromium/1364/LayoutTests/fast/forms/month-multiple-fields/month-multiple-fields-ax-aria-attributes.html (141200 => 141201)
--- branches/chromium/1364/LayoutTests/fast/forms/month-multiple-fields/month-multiple-fields-ax-aria-attributes.html 2013-01-30 02:19:31 UTC (rev 141200)
+++ branches/chromium/1364/LayoutTests/fast/forms/month-multiple-fields/month-multiple-fields-ax-aria-attributes.html 2013-01-30 02:22:59 UTC (rev 141201)
@@ -2,18 +2,13 @@
<html>
<head>
<script src=""
+<script src=""
</head>
<body>
<input id="test" type="month" value="2012-10">
<script>
description('This test checks aria-help attribute of fields in multiple fields week input UI.');
-function focusedFieldValueDescription()
-{
- var element = accessibilityController.focusedElement;
- return element.helpText + ', ' + element.valueDescription + ', ' + element.minValue + ', ' + element.maxValue;
-}
-
var testInput = document.getElementById('test');
if (!window.accessibilityController || !window.eventSender)
@@ -21,16 +16,16 @@
else {
debug('Non-empty value');
testInput.focus();
- shouldBeEqualToString('focusedFieldValueDescription()', 'AXHelp: Month, AXValueDescription: October, 1, 12');
+ checkFocusedElementAXAttributes('AXHelp: Month, AXValueDescription: October, intValue:10, range:1-12');
eventSender.keyDown('\t');
- shouldBeEqualToString('focusedFieldValueDescription()', 'AXHelp: Year, AXValueDescription: 2012, 1, 275760');
+ checkFocusedElementAXAttributes('AXHelp: Year, AXValueDescription: 2012, intValue:2012, range:1-275760');
debug('Empty value');
eventSender.keyDown('\b');
- shouldBeEqualToString('focusedFieldValueDescription()', 'AXHelp: Year, AXValueDescription: blank, 1, 275760');
+ checkFocusedElementAXAttributes('AXHelp: Year, AXValueDescription: blank, intValue:0, range:1-275760');
eventSender.keyDown('\t', ['shiftKey']);
eventSender.keyDown('\b');
- shouldBeEqualToString('focusedFieldValueDescription()', 'AXHelp: Month, AXValueDescription: blank, 1, 12');
+ checkFocusedElementAXAttributes('AXHelp: Month, AXValueDescription: blank, intValue:0, range:1-12');
debug('');
testInput.remove();
Copied: branches/chromium/1364/LayoutTests/fast/forms/resources/multiple-fields-ax-aria-attributes.js (from rev 140803, trunk/LayoutTests/fast/forms/resources/multiple-fields-ax-aria-attributes.js) (0 => 141201)
--- branches/chromium/1364/LayoutTests/fast/forms/resources/multiple-fields-ax-aria-attributes.js (rev 0)
+++ branches/chromium/1364/LayoutTests/fast/forms/resources/multiple-fields-ax-aria-attributes.js 2013-01-30 02:22:59 UTC (rev 141201)
@@ -0,0 +1,9 @@
+function focusedElementDescription()
+{
+ var element = accessibilityController.focusedElement;
+ return element.helpText + ', ' + element.valueDescription + ', intValue:' + element.intValue + ', range:'+ element.minValue + '-' + element.maxValue;
+}
+
+function checkFocusedElementAXAttributes(expected) {
+ shouldBeEqualToString('focusedElementDescription()', expected);
+}
Modified: branches/chromium/1364/LayoutTests/fast/forms/time-multiple-fields/time-multiple-fields-ax-aria-attributes-expected.txt (141200 => 141201)
--- branches/chromium/1364/LayoutTests/fast/forms/time-multiple-fields/time-multiple-fields-ax-aria-attributes-expected.txt 2013-01-30 02:19:31 UTC (rev 141200)
+++ branches/chromium/1364/LayoutTests/fast/forms/time-multiple-fields/time-multiple-fields-ax-aria-attributes-expected.txt 2013-01-30 02:22:59 UTC (rev 141201)
@@ -4,17 +4,17 @@
Non-empty value
-PASS focusedFieldValueDescription() is "AXHelp: Hours, AXValueDescription: 12, 1, 12"
-PASS focusedFieldValueDescription() is "AXHelp: Minutes, AXValueDescription: 34, 0, 59"
-PASS focusedFieldValueDescription() is "AXHelp: Seconds, AXValueDescription: 56, 0, 59"
-PASS focusedFieldValueDescription() is "AXHelp: Milliseconds, AXValueDescription: 789, 0, 999"
-PASS focusedFieldValueDescription() is "AXHelp: AM/PM, AXValueDescription: PM, 1, 2"
+PASS focusedElementDescription() is "AXHelp: Hours, AXValueDescription: 12, intValue:12, range:1-12"
+PASS focusedElementDescription() is "AXHelp: Minutes, AXValueDescription: 34, intValue:34, range:0-59"
+PASS focusedElementDescription() is "AXHelp: Seconds, AXValueDescription: 56, intValue:56, range:0-59"
+PASS focusedElementDescription() is "AXHelp: Milliseconds, AXValueDescription: 789, intValue:789, range:0-999"
+PASS focusedElementDescription() is "AXHelp: AM/PM, AXValueDescription: PM, intValue:2, range:1-2"
Empty value
-PASS focusedFieldValueDescription() is "AXHelp: AM/PM, AXValueDescription: blank, 1, 2"
-PASS focusedFieldValueDescription() is "AXHelp: Milliseconds, AXValueDescription: blank, 0, 999"
-PASS focusedFieldValueDescription() is "AXHelp: Seconds, AXValueDescription: blank, 0, 59"
-PASS focusedFieldValueDescription() is "AXHelp: Minutes, AXValueDescription: blank, 0, 59"
-PASS focusedFieldValueDescription() is "AXHelp: Hours, AXValueDescription: blank, 1, 12"
+PASS focusedElementDescription() is "AXHelp: AM/PM, AXValueDescription: blank, intValue:0, range:1-2"
+PASS focusedElementDescription() is "AXHelp: Milliseconds, AXValueDescription: blank, intValue:0, range:0-999"
+PASS focusedElementDescription() is "AXHelp: Seconds, AXValueDescription: blank, intValue:0, range:0-59"
+PASS focusedElementDescription() is "AXHelp: Minutes, AXValueDescription: blank, intValue:0, range:0-59"
+PASS focusedElementDescription() is "AXHelp: Hours, AXValueDescription: blank, intValue:0, range:1-12"
PASS successfullyParsed is true
Modified: branches/chromium/1364/LayoutTests/fast/forms/time-multiple-fields/time-multiple-fields-ax-aria-attributes.html (141200 => 141201)
--- branches/chromium/1364/LayoutTests/fast/forms/time-multiple-fields/time-multiple-fields-ax-aria-attributes.html 2013-01-30 02:19:31 UTC (rev 141200)
+++ branches/chromium/1364/LayoutTests/fast/forms/time-multiple-fields/time-multiple-fields-ax-aria-attributes.html 2013-01-30 02:22:59 UTC (rev 141201)
@@ -2,6 +2,7 @@
<html>
<head>
<script src=""
+<script src=""
</head>
<body>
<input id=test type="time" value="12:34:56.789">
@@ -16,14 +17,6 @@
}
}
-function focusedFieldValueDescription()
-{
- if (!window.accessibilityController)
- return;
- var element = accessibilityController.focusedElement
- return element.helpText + ", " + element.valueDescription + ", " + element.minValue + ", " + element.maxValue;
-}
-
function keyDown(key, modifiers)
{
if (!window.eventSender)
@@ -38,31 +31,31 @@
debug('Non-empty value');
testInput.focus();
-shouldBeEqualToString('focusedFieldValueDescription()', 'AXHelp: Hours, AXValueDescription: 12, 1, 12');
+checkFocusedElementAXAttributes('AXHelp: Hours, AXValueDescription: 12, intValue:12, range:1-12');
keyDown('\t');
-shouldBeEqualToString('focusedFieldValueDescription()', 'AXHelp: Minutes, AXValueDescription: 34, 0, 59');
+checkFocusedElementAXAttributes('AXHelp: Minutes, AXValueDescription: 34, intValue:34, range:0-59');
keyDown('\t');
-shouldBeEqualToString('focusedFieldValueDescription()', 'AXHelp: Seconds, AXValueDescription: 56, 0, 59');
+checkFocusedElementAXAttributes('AXHelp: Seconds, AXValueDescription: 56, intValue:56, range:0-59');
keyDown('\t');
-shouldBeEqualToString('focusedFieldValueDescription()', 'AXHelp: Milliseconds, AXValueDescription: 789, 0, 999');
+checkFocusedElementAXAttributes('AXHelp: Milliseconds, AXValueDescription: 789, intValue:789, range:0-999');
keyDown('\t');
-shouldBeEqualToString('focusedFieldValueDescription()', 'AXHelp: AM/PM, AXValueDescription: PM, 1, 2');
+checkFocusedElementAXAttributes('AXHelp: AM/PM, AXValueDescription: PM, intValue:2, range:1-2');
debug('Empty value');
keyDown('\b');
-shouldBeEqualToString('focusedFieldValueDescription()', 'AXHelp: AM/PM, AXValueDescription: blank, 1, 2');
+checkFocusedElementAXAttributes('AXHelp: AM/PM, AXValueDescription: blank, intValue:0, range:1-2');
keyDown('\t', ['shiftKey']);
keyDown('\b');
-shouldBeEqualToString('focusedFieldValueDescription()', 'AXHelp: Milliseconds, AXValueDescription: blank, 0, 999');
+checkFocusedElementAXAttributes('AXHelp: Milliseconds, AXValueDescription: blank, intValue:0, range:0-999');
keyDown('\t', ['shiftKey']);
keyDown('\b');
-shouldBeEqualToString('focusedFieldValueDescription()', 'AXHelp: Seconds, AXValueDescription: blank, 0, 59');
+checkFocusedElementAXAttributes('AXHelp: Seconds, AXValueDescription: blank, intValue:0, range:0-59');
keyDown('\t', ['shiftKey']);
keyDown('\b');
-shouldBeEqualToString('focusedFieldValueDescription()', 'AXHelp: Minutes, AXValueDescription: blank, 0, 59');
+checkFocusedElementAXAttributes('AXHelp: Minutes, AXValueDescription: blank, intValue:0, range:0-59');
keyDown('\t', ['shiftKey']);
keyDown('\b');
-shouldBeEqualToString('focusedFieldValueDescription()', 'AXHelp: Hours, AXValueDescription: blank, 1, 12');
+checkFocusedElementAXAttributes('AXHelp: Hours, AXValueDescription: blank, intValue:0, range:1-12');
debug('');
testInput.parentNode.removeChild(testInput);
Modified: branches/chromium/1364/Source/WebCore/html/shadow/DateTimeFieldElement.cpp (141200 => 141201)
--- branches/chromium/1364/Source/WebCore/html/shadow/DateTimeFieldElement.cpp 2013-01-30 02:19:31 UTC (rev 141200)
+++ branches/chromium/1364/Source/WebCore/html/shadow/DateTimeFieldElement.cpp 2013-01-30 02:22:59 UTC (rev 141201)
@@ -50,6 +50,7 @@
{
// On accessibility, DateTimeFieldElement acts like spin button.
setAttribute(roleAttr, "spinbutton");
+ setAttribute(aria_valuetextAttr, AXDateTimeFieldEmptyValueText());
}
void DateTimeFieldElement::defaultEventHandler(Event* event)
@@ -206,13 +207,23 @@
return;
textNode->replaceWholeText(newVisibleValue, ASSERT_NO_EXCEPTION);
- setAttribute(aria_valuetextAttr, hasValue() ? newVisibleValue : AXDateTimeFieldEmptyValueText());
- setAttribute(aria_valuenowAttr, newVisibleValue);
+ if (hasValue()) {
+ setAttribute(aria_valuetextAttr, newVisibleValue);
+ setAttribute(aria_valuenowAttr, String::number(valueForARIAValueNow()));
+ } else {
+ setAttribute(aria_valuetextAttr, AXDateTimeFieldEmptyValueText());
+ removeAttribute(aria_valuenowAttr);
+ }
if (eventBehavior == DispatchEvent && m_fieldOwner)
m_fieldOwner->fieldValueChanged();
}
+int DateTimeFieldElement::valueForARIAValueNow() const
+{
+ return valueAsInteger();
+}
+
} // namespace WebCore
#endif
Modified: branches/chromium/1364/Source/WebCore/html/shadow/DateTimeFieldElement.h (141200 => 141201)
--- branches/chromium/1364/Source/WebCore/html/shadow/DateTimeFieldElement.h 2013-01-30 02:19:31 UTC (rev 141200)
+++ branches/chromium/1364/Source/WebCore/html/shadow/DateTimeFieldElement.h 2013-01-30 02:22:59 UTC (rev 141201)
@@ -87,6 +87,7 @@
AtomicString localeIdentifier() const;
void updateVisibleValue(EventBehavior);
virtual int valueAsInteger() const = 0;
+ virtual int valueForARIAValueNow() const;
private:
void defaultKeyboardEventHandler(KeyboardEvent*);
Modified: branches/chromium/1364/Source/WebCore/html/shadow/DateTimeSymbolicFieldElement.cpp (141200 => 141201)
--- branches/chromium/1364/Source/WebCore/html/shadow/DateTimeSymbolicFieldElement.cpp 2013-01-30 02:19:31 UTC (rev 141200)
+++ branches/chromium/1364/Source/WebCore/html/shadow/DateTimeSymbolicFieldElement.cpp 2013-01-30 02:22:59 UTC (rev 141201)
@@ -132,6 +132,12 @@
return m_selectedIndex;
}
+int DateTimeSymbolicFieldElement::valueForARIAValueNow() const
+{
+ // Synchronize with minimum/maximum adjustment in initialize().
+ return m_selectedIndex + 1;
+}
+
String DateTimeSymbolicFieldElement::visibleEmptyValue() const
{
return m_visibleEmptyValue;
Modified: branches/chromium/1364/Source/WebCore/html/shadow/DateTimeSymbolicFieldElement.h (141200 => 141201)
--- branches/chromium/1364/Source/WebCore/html/shadow/DateTimeSymbolicFieldElement.h 2013-01-30 02:19:31 UTC (rev 141200)
+++ branches/chromium/1364/Source/WebCore/html/shadow/DateTimeSymbolicFieldElement.h 2013-01-30 02:22:59 UTC (rev 141201)
@@ -57,6 +57,7 @@
virtual void stepDown() OVERRIDE FINAL;
virtual void stepUp() OVERRIDE FINAL;
virtual String value() const OVERRIDE FINAL;
+ virtual int valueForARIAValueNow() const OVERRIDE FINAL;
virtual String visibleValue() const OVERRIDE FINAL;
// TypeAheadDataSource functions.