[webkit-changes] [152109] tags/Safari-537.47

Thu, 27 Jun 2013 10:42:25 -0700

Title: [152109] tags/Safari-537.47

Diff

Modified: tags/Safari-537.47/LayoutTests/ChangeLog (152108 => 152109)


--- tags/Safari-537.47/LayoutTests/ChangeLog	2013-06-27 17:40:30 UTC (rev 152108)
+++ tags/Safari-537.47/LayoutTests/ChangeLog	2013-06-27 17:42:57 UTC (rev 152109)
@@ -1,5 +1,20 @@
 2013-06-27  Lucas Forschler  <lforsch...@apple.com>
 
+        Merge r151868
+
+    2013-06-21  Brent Fulgham  <bfulg...@apple.com>
+
+            AX: Title for ListItemRole should consist of concatenated child text elements.
+            https://bugs.webkit.org/show_bug.cgi?id=117892
+
+            Reviewed by Chris Fleizach.
+
+            * accessibility/listitem-title.html: Added.
+            * platform/mac/accessibility/listitem-title-expected.txt: Added.
+            * platform/win/accessibility/listitem-title-expected.txt: Added.
+
+2013-06-27  Lucas Forschler  <lforsch...@apple.com>
+
         Merge r151841
 
     2013-06-20  Brent Fulgham  <bfulg...@apple.com>

Copied: tags/Safari-537.47/LayoutTests/accessibility/listitem-title.html (from rev 151868, trunk/LayoutTests/accessibility/listitem-title.html) (0 => 152109)


--- tags/Safari-537.47/LayoutTests/accessibility/listitem-title.html	                        (rev 0)
+++ tags/Safari-537.47/LayoutTests/accessibility/listitem-title.html	2013-06-27 17:42:57 UTC (rev 152109)
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<html>
+<script>
+    if (window.testRunner)
+        testRunner.dumpAsText();
+</script>
+<body id="body">
+    
+    <ul>
+      <li><span class="a">test</span><span class="b">1</span></li>
+      <li id="test b"><span class="a">test</span><span class="b">2</span></li>
+    </ul>
+
+    <ol>
+      <li id="test a"><span class="a">test</span><span class="b">1</span></li>
+      <li><span class="a">test</span><span class="b">2</span></li>
+    </ol>
+
+    <BR><BR><BR><hr><BR>
+    <div id="result"></div>    
+
+    <script>
+        if (window.accessibilityController) {
+            var result = document.getElementById("result");
+
+            var ulListElement = window.accessibilityController.accessibleElementById("test a");
+            result.innerText += 'il in ul title: ' + ulListElement.title + "\n\n";
+
+            var olListElement = window.accessibilityController.accessibleElementById("test b");
+            result.innerText += 'il in ol title: ' + olListElement.title + "\n\n";
+        }
+    </script>
+</body>
+</html>

Copied: tags/Safari-537.47/LayoutTests/platform/mac/listitem-title-actual.txt (from rev 151868, trunk/LayoutTests/platform/mac/listitem-title-actual.txt) (0 => 152109)


--- tags/Safari-537.47/LayoutTests/platform/mac/listitem-title-actual.txt	                        (rev 0)
+++ tags/Safari-537.47/LayoutTests/platform/mac/listitem-title-actual.txt	2013-06-27 17:42:57 UTC (rev 152109)
@@ -0,0 +1,13 @@
+test1
+test2
+test1
+test2
+
+
+
+
+il in ul title: AXTitle: test 1
+
+il in ol title: AXTitle: test 2
+
+

Copied: tags/Safari-537.47/LayoutTests/platform/win/accessibility/listitem-title-expected.txt (from rev 151868, trunk/LayoutTests/platform/win/accessibility/listitem-title-expected.txt) (0 => 152109)


--- tags/Safari-537.47/LayoutTests/platform/win/accessibility/listitem-title-expected.txt	                        (rev 0)
+++ tags/Safari-537.47/LayoutTests/platform/win/accessibility/listitem-title-expected.txt	2013-06-27 17:42:57 UTC (rev 152109)
@@ -0,0 +1,13 @@
+test1
+test2
+test1
+test2
+
+
+
+
+il in ul title: test 1
+
+il in ol title: test 2
+
+

Modified: tags/Safari-537.47/Source/WebCore/ChangeLog (152108 => 152109)


--- tags/Safari-537.47/Source/WebCore/ChangeLog	2013-06-27 17:40:30 UTC (rev 152108)
+++ tags/Safari-537.47/Source/WebCore/ChangeLog	2013-06-27 17:42:57 UTC (rev 152109)
@@ -1,5 +1,23 @@
 2013-06-27  Lucas Forschler  <lforsch...@apple.com>
 
+        Merge r151868
+
+    2013-06-21  Brent Fulgham  <bfulg...@apple.com>
+
+            AX: Title for ListItemRole should consist of concatenated child text elements.
+            https://bugs.webkit.org/show_bug.cgi?id=117892
+
+            Reviewed by Chris Fleizach.
+
+            accessibility/listitem-title.html
+
+            * accessibility/AccessibilityNodeObject.cpp:
+            (WebCore::AccessibilityNodeObject::visibleText): Add ListItemRole to set of
+            elements that concatenate their children for display purposes.
+            (WebCore::AccessibilityNodeObject::title): Ditto.
+
+2013-06-27  Lucas Forschler  <lforsch...@apple.com>
+
         Merge r151841
 
     2013-06-20  Brent Fulgham  <bfulg...@apple.com>

Modified: tags/Safari-537.47/Source/WebCore/accessibility/AccessibilityNodeObject.cpp (152108 => 152109)


--- tags/Safari-537.47/Source/WebCore/accessibility/AccessibilityNodeObject.cpp	2013-06-27 17:40:30 UTC (rev 152108)
+++ tags/Safari-537.47/Source/WebCore/accessibility/AccessibilityNodeObject.cpp	2013-06-27 17:42:57 UTC (rev 152109)
@@ -1261,6 +1261,7 @@
     case ToggleButtonRole:
     case CheckBoxRole:
     case ListBoxOptionRole:
+    case ListItemRole:
     case MenuButtonRole:
     case MenuItemRole:
     case RadioButtonRole:
@@ -1605,6 +1606,7 @@
     case ToggleButtonRole:
     case CheckBoxRole:
     case ListBoxOptionRole:
+    case ListItemRole:
     case MenuButtonRole:
     case MenuItemRole:
     case RadioButtonRole:

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to