Title: [200509] trunk
- Revision
- 200509
- Author
- n_w...@apple.com
- Date
- 2016-05-06 00:45:04 -0700 (Fri, 06 May 2016)
Log Message
AX: <attachment> element should have a replacement character
https://bugs.webkit.org/show_bug.cgi?id=157406
Reviewed by Chris Fleizach.
Source/WebCore:
Make sure attachment element is considered as a replaced node.
Test: accessibility/mac/attachment-element-replacement-character.html
* editing/TextIterator.cpp:
(WebCore::isRendererReplacedElement):
LayoutTests:
* accessibility/attachment-element-expected.txt:
* accessibility/mac/attachment-element-replacement-character-expected.txt: Added.
* accessibility/mac/attachment-element-replacement-character.html: Added.
* editing/pasteboard/drag-and-drop-attachment-contenteditable-expected.txt:
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (200508 => 200509)
--- trunk/LayoutTests/ChangeLog 2016-05-06 07:27:22 UTC (rev 200508)
+++ trunk/LayoutTests/ChangeLog 2016-05-06 07:45:04 UTC (rev 200509)
@@ -1,5 +1,17 @@
2016-05-06 Nan Wang <n_w...@apple.com>
+ AX: <attachment> element should have a replacement character
+ https://bugs.webkit.org/show_bug.cgi?id=157406
+
+ Reviewed by Chris Fleizach.
+
+ * accessibility/attachment-element-expected.txt:
+ * accessibility/mac/attachment-element-replacement-character-expected.txt: Added.
+ * accessibility/mac/attachment-element-replacement-character.html: Added.
+ * editing/pasteboard/drag-and-drop-attachment-contenteditable-expected.txt:
+
+2016-05-06 Nan Wang <n_w...@apple.com>
+
AX: String for document range is empty if end visible position anchors to a ignored replaced node
https://bugs.webkit.org/show_bug.cgi?id=157403
Modified: trunk/LayoutTests/accessibility/attachment-element-expected.txt (200508 => 200509)
--- trunk/LayoutTests/accessibility/attachment-element-expected.txt 2016-05-06 07:27:22 UTC (rev 200508)
+++ trunk/LayoutTests/accessibility/attachment-element-expected.txt 2016-05-06 07:45:04 UTC (rev 200509)
@@ -1,3 +1,4 @@
+
This tests that attachment elements are accessible.
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
Added: trunk/LayoutTests/accessibility/mac/attachment-element-replacement-character-expected.txt (0 => 200509)
--- trunk/LayoutTests/accessibility/mac/attachment-element-replacement-character-expected.txt (rev 0)
+++ trunk/LayoutTests/accessibility/mac/attachment-element-replacement-character-expected.txt 2016-05-06 07:45:04 UTC (rev 200509)
@@ -0,0 +1,15 @@
+some test
+This tests that attachment element replacements are present in strings.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+String:
+some [ATTACHMENT] test
+This tests that attachment element replacements are present in strings.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Added: trunk/LayoutTests/accessibility/mac/attachment-element-replacement-character.html (0 => 200509)
--- trunk/LayoutTests/accessibility/mac/attachment-element-replacement-character.html (rev 0)
+++ trunk/LayoutTests/accessibility/mac/attachment-element-replacement-character.html 2016-05-06 07:45:04 UTC (rev 200509)
@@ -0,0 +1,36 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<meta charset="utf-8">
+<script src=""
+<script>
+ if (window.internals)
+ window.internals.settings.setAttachmentElementEnabled(true)
+</script>
+</head>
+<body id="body">
+
+some
+<attachment id="attachment" title="title" subtitle="subtitle" action="" progress="0.5"></attachment>
+test
+
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+
+ description("This tests that attachment element replacements are present in strings.");
+
+ if (window.accessibilityController) {
+ var body = accessibilityController.rootElement.childAtIndex(0);
+ var startMarker = body.startTextMarker;
+ var endMarker = body.endTextMarker;
+ var textMarkerRange = body.textMarkerRangeForMarkers(startMarker, endMarker);
+ debug("String: \n" + body.stringForTextMarkerRange(textMarkerRange).replace(String.fromCharCode(65532), "[ATTACHMENT]"));
+ }
+
+</script>
+
+<script src=""
+</body>
+</html>
Modified: trunk/LayoutTests/editing/pasteboard/drag-and-drop-attachment-contenteditable-expected.txt (200508 => 200509)
--- trunk/LayoutTests/editing/pasteboard/drag-and-drop-attachment-contenteditable-expected.txt 2016-05-06 07:27:22 UTC (rev 200508)
+++ trunk/LayoutTests/editing/pasteboard/drag-and-drop-attachment-contenteditable-expected.txt 2016-05-06 07:45:04 UTC (rev 200509)
@@ -3,6 +3,8 @@
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
PASS target.getElementsByTagName("attachment").length is 1
PASS target.getElementsByTagName("attachment")[0].file.name is "apple.gif"
PASS successfullyParsed is true
Modified: trunk/Source/WebCore/ChangeLog (200508 => 200509)
--- trunk/Source/WebCore/ChangeLog 2016-05-06 07:27:22 UTC (rev 200508)
+++ trunk/Source/WebCore/ChangeLog 2016-05-06 07:45:04 UTC (rev 200509)
@@ -1,5 +1,19 @@
2016-05-06 Nan Wang <n_w...@apple.com>
+ AX: <attachment> element should have a replacement character
+ https://bugs.webkit.org/show_bug.cgi?id=157406
+
+ Reviewed by Chris Fleizach.
+
+ Make sure attachment element is considered as a replaced node.
+
+ Test: accessibility/mac/attachment-element-replacement-character.html
+
+ * editing/TextIterator.cpp:
+ (WebCore::isRendererReplacedElement):
+
+2016-05-06 Nan Wang <n_w...@apple.com>
+
AX: String for document range is empty if end visible position anchors to a ignored replaced node
https://bugs.webkit.org/show_bug.cgi?id=157403
Modified: trunk/Source/WebCore/editing/TextIterator.cpp (200508 => 200509)
--- trunk/Source/WebCore/editing/TextIterator.cpp 2016-05-06 07:27:22 UTC (rev 200508)
+++ trunk/Source/WebCore/editing/TextIterator.cpp 2016-05-06 07:45:04 UTC (rev 200509)
@@ -254,7 +254,11 @@
if (!renderer)
return false;
- if (renderer->isImage() || renderer->isWidget() || renderer->isMedia())
+ bool isAttachment = false;
+#if ENABLE(ATTACHMENT_ELEMENT)
+ isAttachment = renderer->isAttachment();
+#endif
+ if (renderer->isImage() || renderer->isWidget() || renderer->isMedia() || isAttachment)
return true;
if (is<Element>(renderer->node())) {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
