[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
cfleizach at apple.com
cfleizach at apple.com
Wed Dec 22 11:51:13 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 37a9c46a04e41f431c5b83800d6adf2d28bbff15
Author: cfleizach at apple.com <cfleizach at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Aug 9 23:45:17 2010 +0000
AX: Placeholder value for text fields not exposed like it should be
https://bugs.webkit.org/show_bug.cgi?id=43598
Reviewed by David Kilzer.
WebCore:
* accessibility/AccessibilityObject.cpp:
(WebCore::AccessibilityObject::placeholderValue):
* accessibility/AccessibilityObject.h:
* accessibility/AccessibilityRenderObject.cpp:
(WebCore::AccessibilityRenderObject::title):
* accessibility/mac/AccessibilityObjectWrapper.mm:
(-[AccessibilityObjectWrapper accessibilityAttributeNames]):
(-[AccessibilityObjectWrapper accessibilityAttributeValue:]):
LayoutTests:
* accessibility/placeholder-expected.txt:
* accessibility/placeholder.html:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65016 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 74dc7cb..7af3927 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-09 Chris Fleizach <cfleizach at apple.com>
+
+ Reviewed by David Kilzer.
+
+ AX: Placeholder value for text fields not exposed like it should be
+ https://bugs.webkit.org/show_bug.cgi?id=43598
+
+ * accessibility/placeholder-expected.txt:
+ * accessibility/placeholder.html:
+
2010-08-09 Ryosuke Niwa <rniwa at webkit.org>
Reviewed by Justin Garcia.
diff --git a/LayoutTests/accessibility/placeholder-expected.txt b/LayoutTests/accessibility/placeholder-expected.txt
index 0d29332..3d17e6c 100644
--- a/LayoutTests/accessibility/placeholder-expected.txt
+++ b/LayoutTests/accessibility/placeholder-expected.txt
@@ -1,10 +1,10 @@
-This test makes sure that the AXTitle will fall back to placeholder text if nothing else is available
+This test makes sure that the placeholder is returned as the correct attribute
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-PASS fieldElement.title is 'AXTitle: search'
+PASS fieldElement.stringAttributeValue('AXPlaceholderValue') is 'search'
PASS successfullyParsed is true
TEST COMPLETE
diff --git a/LayoutTests/accessibility/placeholder.html b/LayoutTests/accessibility/placeholder.html
index 9ccbbd1..913dc8f 100644
--- a/LayoutTests/accessibility/placeholder.html
+++ b/LayoutTests/accessibility/placeholder.html
@@ -16,11 +16,11 @@ var successfullyParsed = false;
<script>
if (window.accessibilityController) {
- description("This test makes sure that the AXTitle will fall back to placeholder text if nothing else is available");
+ description("This test makes sure that the placeholder is returned as the correct attribute");
var field = document.getElementById("searchterm").focus();
var fieldElement = accessibilityController.focusedElement;
- shouldBe("fieldElement.title", "'AXTitle: search'");
+ shouldBe("fieldElement.stringAttributeValue('AXPlaceholderValue')", "'search'");
}
successfullyParsed = true;
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c5ec3b8..b30766b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2010-08-09 Chris Fleizach <cfleizach at apple.com>
+
+ Reviewed by David Kilzer.
+
+ AX: Placeholder value for text fields not exposed like it should be
+ https://bugs.webkit.org/show_bug.cgi?id=43598
+
+ * accessibility/AccessibilityObject.cpp:
+ (WebCore::AccessibilityObject::placeholderValue):
+ * accessibility/AccessibilityObject.h:
+ * accessibility/AccessibilityRenderObject.cpp:
+ (WebCore::AccessibilityRenderObject::title):
+ * accessibility/mac/AccessibilityObjectWrapper.mm:
+ (-[AccessibilityObjectWrapper accessibilityAttributeNames]):
+ (-[AccessibilityObjectWrapper accessibilityAttributeValue:]):
+
2010-08-09 Ryosuke Niwa <rniwa at webkit.org>
Reviewed by Justin Garcia.
diff --git a/WebCore/accessibility/AccessibilityObject.cpp b/WebCore/accessibility/AccessibilityObject.cpp
index 4b22335..a6bb033 100644
--- a/WebCore/accessibility/AccessibilityObject.cpp
+++ b/WebCore/accessibility/AccessibilityObject.cpp
@@ -966,6 +966,15 @@ AccessibilityRole AccessibilityObject::ariaRoleToWebCoreRole(const String& value
return roleMap->get(value);
}
+const AtomicString& AccessibilityObject::placeholderValue() const
+{
+ const AtomicString& placeholder = getAttribute(placeholderAttr);
+ if (!placeholder.isEmpty())
+ return placeholder;
+
+ return nullAtom;
+}
+
bool AccessibilityObject::isInsideARIALiveRegion() const
{
if (supportsARIALiveRegion())
diff --git a/WebCore/accessibility/AccessibilityObject.h b/WebCore/accessibility/AccessibilityObject.h
index c517855..5fcc1f5 100644
--- a/WebCore/accessibility/AccessibilityObject.h
+++ b/WebCore/accessibility/AccessibilityObject.h
@@ -428,6 +428,7 @@ public:
virtual FrameView* documentFrameView() const;
String language() const;
virtual unsigned hierarchicalLevel() const { return 0; }
+ const AtomicString& placeholderValue() const;
virtual void setFocused(bool) { }
virtual void setSelectedText(const String&) { }
diff --git a/WebCore/accessibility/AccessibilityRenderObject.cpp b/WebCore/accessibility/AccessibilityRenderObject.cpp
index e399b6a..24c29d4 100644
--- a/WebCore/accessibility/AccessibilityRenderObject.cpp
+++ b/WebCore/accessibility/AccessibilityRenderObject.cpp
@@ -1272,10 +1272,6 @@ String AccessibilityRenderObject::title() const
HTMLLabelElement* label = labelForElement(static_cast<Element*>(node));
if (label && !titleUIElement())
return label->innerText();
-
- const AtomicString& placeholder = getAttribute(placeholderAttr);
- if (!placeholder.isEmpty())
- return placeholder;
}
if (roleValue() == ButtonRole
diff --git a/WebCore/accessibility/mac/AccessibilityObjectWrapper.mm b/WebCore/accessibility/mac/AccessibilityObjectWrapper.mm
index 94d2be3..9595e25 100644
--- a/WebCore/accessibility/mac/AccessibilityObjectWrapper.mm
+++ b/WebCore/accessibility/mac/AccessibilityObjectWrapper.mm
@@ -157,6 +157,10 @@ using namespace std;
#define NSAccessibilityHasPopupAttribute @"AXHasPopup"
#endif
+#ifndef NSAccessibilityPlaceholderValueAttribute
+#define NSAccessibilityPlaceholderValueAttribute @"AXPlaceholderValue"
+#endif
+
#ifdef BUILDING_ON_TIGER
typedef unsigned NSUInteger;
#define NSAccessibilityValueDescriptionAttribute @"AXValueDescription"
@@ -731,6 +735,7 @@ static WebCoreTextMarkerRange* textMarkerRangeFromVisiblePositions(VisiblePositi
[tempArray addObject:NSAccessibilityTitleUIElementAttribute];
[tempArray addObject:NSAccessibilityAccessKeyAttribute];
[tempArray addObject:NSAccessibilityRequiredAttribute];
+ [tempArray addObject:NSAccessibilityPlaceholderValueAttribute];
textAttrs = [[NSArray alloc] initWithArray:tempArray];
[tempArray release];
}
@@ -1859,6 +1864,9 @@ static NSString* roleValueToNSString(AccessibilityRole value)
return dropEffectsArray;
}
+ if ([attributeName isEqualToString:NSAccessibilityPlaceholderValueAttribute])
+ return m_object->placeholderValue();
+
if ([attributeName isEqualToString:NSAccessibilityHasPopupAttribute])
return [NSNumber numberWithBool:m_object->ariaHasPopup()];
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list