Title: [128740] releases/WebKitGTK/webkit-1.10
- Revision
- 128740
- Author
- carlo...@webkit.org
- Date
- 2012-09-17 04:05:51 -0700 (Mon, 17 Sep 2012)
Log Message
Merge r127825 - [Gtk] accessibility/canvas-description-and-role expected results needed
https://bugs.webkit.org/show_bug.cgi?id=95644
Patch by Joanmarie Diggs <jdi...@igalia.com> on 2012-09-06
Reviewed by Martin Robinson.
Source/WebCore:
The new accessibility CanvasRole should be mapped to ATK_ROLE_CANVAS
rather than ATK_ROLE_IMAGE.
No new test because the CanvasRole came with a new layout test lacking
expected results for Gtk. The generated expected results for that test
reflect the revised mapping to ATK_ROLE_CANVAS.
* accessibility/gtk/WebKitAccessibleWrapperAtk.cpp:
(atkRole):
LayoutTests:
Generated expected results for Gtk. These results reflect the revised
mapping of CanvasRole to ATK_ROLE_CANVAS rather than ATK_ROLE_IMAGE.
* platform/gtk/accessibility/canvas-description-and-role-expected.txt: Added.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-1.10/LayoutTests/ChangeLog (128739 => 128740)
--- releases/WebKitGTK/webkit-1.10/LayoutTests/ChangeLog 2012-09-17 11:05:05 UTC (rev 128739)
+++ releases/WebKitGTK/webkit-1.10/LayoutTests/ChangeLog 2012-09-17 11:05:51 UTC (rev 128740)
@@ -1,3 +1,15 @@
+2012-09-06 Joanmarie Diggs <jdi...@igalia.com>
+
+ [Gtk] accessibility/canvas-description-and-role expected results needed
+ https://bugs.webkit.org/show_bug.cgi?id=95644
+
+ Reviewed by Martin Robinson.
+
+ Generated expected results for Gtk. These results reflect the revised
+ mapping of CanvasRole to ATK_ROLE_CANVAS rather than ATK_ROLE_IMAGE.
+
+ * platform/gtk/accessibility/canvas-description-and-role-expected.txt: Added.
+
2012-09-05 Zan Dobersek <zandober...@gmail.com>
Unreviewed GTK gardening.
Modified: releases/WebKitGTK/webkit-1.10/LayoutTests/platform/gtk/accessibility/canvas-description-and-role-expected.txt (128739 => 128740)
--- releases/WebKitGTK/webkit-1.10/LayoutTests/platform/gtk/accessibility/canvas-description-and-role-expected.txt 2012-09-17 11:05:05 UTC (rev 128739)
+++ releases/WebKitGTK/webkit-1.10/LayoutTests/platform/gtk/accessibility/canvas-description-and-role-expected.txt 2012-09-17 11:05:51 UTC (rev 128740)
@@ -5,9 +5,9 @@
PASS axContainer.childrenCount is 2
Canvas 1 description: AXDescription: Canvas label
-Canvas 1 role: AXRole: AXCanvas
+Canvas 1 role: AXRole: canvas
Canvas 2 description: AXDescription:
-Canvas 2 role: AXRole: AXCanvas
+Canvas 2 role: AXRole: canvas
PASS successfullyParsed is true
TEST COMPLETE
Modified: releases/WebKitGTK/webkit-1.10/Source/WebCore/ChangeLog (128739 => 128740)
--- releases/WebKitGTK/webkit-1.10/Source/WebCore/ChangeLog 2012-09-17 11:05:05 UTC (rev 128739)
+++ releases/WebKitGTK/webkit-1.10/Source/WebCore/ChangeLog 2012-09-17 11:05:51 UTC (rev 128740)
@@ -1,3 +1,20 @@
+2012-09-06 Joanmarie Diggs <jdi...@igalia.com>
+
+ [Gtk] accessibility/canvas-description-and-role expected results needed
+ https://bugs.webkit.org/show_bug.cgi?id=95644
+
+ Reviewed by Martin Robinson.
+
+ The new accessibility CanvasRole should be mapped to ATK_ROLE_CANVAS
+ rather than ATK_ROLE_IMAGE.
+
+ No new test because the CanvasRole came with a new layout test lacking
+ expected results for Gtk. The generated expected results for that test
+ reflect the revised mapping to ATK_ROLE_CANVAS.
+
+ * accessibility/gtk/WebKitAccessibleWrapperAtk.cpp:
+ (atkRole):
+
2012-08-29 Dominic Mazzoni <dmazz...@google.com>
AX: Canvas should have a distinct role
Modified: releases/WebKitGTK/webkit-1.10/Source/WebCore/accessibility/gtk/WebKitAccessibleWrapperAtk.cpp (128739 => 128740)
--- releases/WebKitGTK/webkit-1.10/Source/WebCore/accessibility/gtk/WebKitAccessibleWrapperAtk.cpp 2012-09-17 11:05:05 UTC (rev 128739)
+++ releases/WebKitGTK/webkit-1.10/Source/WebCore/accessibility/gtk/WebKitAccessibleWrapperAtk.cpp 2012-09-17 11:05:51 UTC (rev 128740)
@@ -501,7 +501,6 @@
case WebCoreLinkRole:
case ImageMapLinkRole:
return ATK_ROLE_LINK;
- case CanvasRole:
case ImageMapRole:
case ImageRole:
return ATK_ROLE_IMAGE;
@@ -525,6 +524,8 @@
return ATK_ROLE_SECTION;
case FormRole:
return ATK_ROLE_FORM;
+ case CanvasRole:
+ return ATK_ROLE_CANVAS;
default:
return ATK_ROLE_UNKNOWN;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
