Title: [188930] trunk
- Revision
- 188930
- Author
- [email protected]
- Date
- 2015-08-25 12:14:55 -0700 (Tue, 25 Aug 2015)
Log Message
[Mac] accessibility/document-attributes.html fails
https://bugs.webkit.org/show_bug.cgi?id=116636
Patch by Nan Wang <[email protected]> on 2015-08-25
Reviewed by Chris Fleizach.
Source/WebCore:
Re-enabled accessibility/document-attributes.html test.
* accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
(-[WebAccessibilityObjectWrapper accessibilityAttributeValue:]):
Tools:
Implemented documentURI() and documentEncoding().
* DumpRenderTree/mac/AccessibilityUIElementMac.mm:
(AccessibilityUIElement::documentEncoding):
(AccessibilityUIElement::documentURI):
* WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm:
(WTR::AccessibilityUIElement::documentEncoding):
(WTR::AccessibilityUIElement::documentURI):
LayoutTests:
* platform/mac/TestExpectations:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (188929 => 188930)
--- trunk/LayoutTests/ChangeLog 2015-08-25 19:13:39 UTC (rev 188929)
+++ trunk/LayoutTests/ChangeLog 2015-08-25 19:14:55 UTC (rev 188930)
@@ -1,3 +1,12 @@
+2015-08-25 Nan Wang <[email protected]>
+
+ [Mac] accessibility/document-attributes.html fails
+ https://bugs.webkit.org/show_bug.cgi?id=116636
+
+ Reviewed by Chris Fleizach.
+
+ * platform/mac/TestExpectations:
+
2015-08-25 Skachkov Oleksandr <[email protected]>
Function.prototype.toString is incorrect for ArrowFunction
Modified: trunk/LayoutTests/platform/mac/TestExpectations (188929 => 188930)
--- trunk/LayoutTests/platform/mac/TestExpectations 2015-08-25 19:13:39 UTC (rev 188929)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2015-08-25 19:14:55 UTC (rev 188930)
@@ -36,8 +36,6 @@
fast/dom/Window/slow-unload-handler.html
fast/dom/Window/slow-unload-handler-only-frame-is-stopped.html
-webkit.org/b/116636 accessibility/document-attributes.html [ Failure ]
-
# Accessibility tests for notifications that don't exist or aren't needed on Mac OS X.
accessibility/aria-checkbox-sends-notification.html
accessibility/aria-switch-sends-notification.html
Modified: trunk/Source/WebCore/ChangeLog (188929 => 188930)
--- trunk/Source/WebCore/ChangeLog 2015-08-25 19:13:39 UTC (rev 188929)
+++ trunk/Source/WebCore/ChangeLog 2015-08-25 19:14:55 UTC (rev 188930)
@@ -1,3 +1,15 @@
+2015-08-25 Nan Wang <[email protected]>
+
+ [Mac] accessibility/document-attributes.html fails
+ https://bugs.webkit.org/show_bug.cgi?id=116636
+
+ Reviewed by Chris Fleizach.
+
+ Re-enabled accessibility/document-attributes.html test.
+
+ * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+ (-[WebAccessibilityObjectWrapper accessibilityAttributeValue:]):
+
2015-08-25 Csaba Osztrogonác <[email protected]>
Fix the !ENABLE(VIDEO) build after r188693
Modified: trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (188929 => 188930)
--- trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2015-08-25 19:13:39 UTC (rev 188929)
+++ trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2015-08-25 19:14:55 UTC (rev 188930)
@@ -233,6 +233,14 @@
#define NSAccessibilityIsMultiSelectableAttribute @"AXIsMultiSelectable"
#endif
+#ifndef NSAccessibilityDocumentURIAttribute
+#define NSAccessibilityDocumentURIAttribute @"AXDocumentURI"
+#endif
+
+#ifndef NSAccessibilityDocumentEncodingAttribute
+#define NSAccessibilityDocumentEncodingAttribute @"AXDocumentEncoding"
+#endif
+
#define NSAccessibilityDOMIdentifierAttribute @"AXDOMIdentifier"
#define NSAccessibilityDOMClassListAttribute @"AXDOMClassList"
@@ -3047,6 +3055,19 @@
if ([attributeName isEqualToString:NSAccessibilityIsMultiSelectableAttribute])
return [NSNumber numberWithBool:m_object->isMultiSelectable()];
+ // Document attributes
+ if ([attributeName isEqualToString:NSAccessibilityDocumentURIAttribute]) {
+ if (Document* document = m_object->document())
+ return document->documentURI();
+ return nil;
+ }
+
+ if ([attributeName isEqualToString:NSAccessibilityDocumentEncodingAttribute]) {
+ if (Document* document = m_object->document())
+ return document->encoding();
+ return nil;
+ }
+
return nil;
}
Modified: trunk/Tools/ChangeLog (188929 => 188930)
--- trunk/Tools/ChangeLog 2015-08-25 19:13:39 UTC (rev 188929)
+++ trunk/Tools/ChangeLog 2015-08-25 19:14:55 UTC (rev 188930)
@@ -1,3 +1,19 @@
+2015-08-25 Nan Wang <[email protected]>
+
+ [Mac] accessibility/document-attributes.html fails
+ https://bugs.webkit.org/show_bug.cgi?id=116636
+
+ Reviewed by Chris Fleizach.
+
+ Implemented documentURI() and documentEncoding().
+
+ * DumpRenderTree/mac/AccessibilityUIElementMac.mm:
+ (AccessibilityUIElement::documentEncoding):
+ (AccessibilityUIElement::documentURI):
+ * WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm:
+ (WTR::AccessibilityUIElement::documentEncoding):
+ (WTR::AccessibilityUIElement::documentURI):
+
2015-08-24 Brent Fulgham <[email protected]>
[Win] Unreviewed test gardening.
Modified: trunk/Tools/DumpRenderTree/mac/AccessibilityUIElementMac.mm (188929 => 188930)
--- trunk/Tools/DumpRenderTree/mac/AccessibilityUIElementMac.mm 2015-08-25 19:13:39 UTC (rev 188929)
+++ trunk/Tools/DumpRenderTree/mac/AccessibilityUIElementMac.mm 2015-08-25 19:14:55 UTC (rev 188930)
@@ -1407,11 +1407,23 @@
JSStringRef AccessibilityUIElement::documentEncoding()
{
+ BEGIN_AX_OBJC_EXCEPTIONS
+ id value = [m_element accessibilityAttributeValue:@"AXDocumentEncoding"];
+ if ([value isKindOfClass:[NSString class]])
+ return [value createJSStringRef];
+ END_AX_OBJC_EXCEPTIONS
+
return JSStringCreateWithCharacters(0, 0);
}
JSStringRef AccessibilityUIElement::documentURI()
{
+ BEGIN_AX_OBJC_EXCEPTIONS
+ id value = [m_element accessibilityAttributeValue:@"AXDocumentURI"];
+ if ([value isKindOfClass:[NSString class]])
+ return [value createJSStringRef];
+ END_AX_OBJC_EXCEPTIONS
+
return JSStringCreateWithCharacters(0, 0);
}
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm (188929 => 188930)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm 2015-08-25 19:13:39 UTC (rev 188929)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm 2015-08-25 19:14:55 UTC (rev 188930)
@@ -1446,11 +1446,23 @@
JSRetainPtr<JSStringRef> AccessibilityUIElement::documentEncoding()
{
+ BEGIN_AX_OBJC_EXCEPTIONS
+ id value = [m_element accessibilityAttributeValue:@"AXDocumentEncoding"];
+ if ([value isKindOfClass:[NSString class]])
+ return [value createJSStringRef];
+ END_AX_OBJC_EXCEPTIONS
+
return JSStringCreateWithCharacters(0, 0);
}
JSRetainPtr<JSStringRef> AccessibilityUIElement::documentURI()
{
+ BEGIN_AX_OBJC_EXCEPTIONS
+ id value = [m_element accessibilityAttributeValue:@"AXDocumentURI"];
+ if ([value isKindOfClass:[NSString class]])
+ return [value createJSStringRef];
+ END_AX_OBJC_EXCEPTIONS
+
return JSStringCreateWithCharacters(0, 0);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
