Diff
Modified: releases/WebKitGTK/webkit-1.10/LayoutTests/ChangeLog (128737 => 128738)
--- releases/WebKitGTK/webkit-1.10/LayoutTests/ChangeLog 2012-09-17 11:02:05 UTC (rev 128737)
+++ releases/WebKitGTK/webkit-1.10/LayoutTests/ChangeLog 2012-09-17 11:03:44 UTC (rev 128738)
@@ -1,3 +1,21 @@
+2012-08-29 Dominic Mazzoni <dmazz...@google.com>
+
+ AX: Canvas should have a distinct role
+ https://bugs.webkit.org/show_bug.cgi?id=95248
+
+ Reviewed by Chris Fleizach.
+
+ Add new tests for canvas role.
+
+ * accessibility/canvas.html: Deleted.
+ * accessibility/canvas-expected.txt: Deleted.
+ * accessibility/canvas-description-and-role.html: Added.
+ * platform/chromium/accessibility/canvas-description-and-role-expected.txt: Added.
+ * platform/gtk/TestExpectations:
+ * platform/mac/accessibility/canvas.html: Added.
+ * platform/mac/accessibility/canvas-expected.txt: Added.
+ * platform/mac/accessibility/canvas-description-and-role-expected.txt: Added.
+
2012-08-28 Dominic Mazzoni <dmazz...@google.com>
AX: Focusable elements without a role should not be ignored
Added: releases/WebKitGTK/webkit-1.10/LayoutTests/accessibility/canvas-description-and-role.html (0 => 128738)
--- releases/WebKitGTK/webkit-1.10/LayoutTests/accessibility/canvas-description-and-role.html (rev 0)
+++ releases/WebKitGTK/webkit-1.10/LayoutTests/accessibility/canvas-description-and-role.html 2012-09-17 11:03:44 UTC (rev 128738)
@@ -0,0 +1,36 @@
+<!DOCTYPE HTML>
+<html>
+<body>
+<script src=""
+
+<style>canvas { display: inline; border: 1px solid #000; }</style>
+ <!-- No whitespace between canvases on purpose, so there's the same
+ number of children of the container element on all platforms. -->
+ <div id="container" tabIndex=0 aria-label="Container"><canvas id="canvas1" width="100" height="100" aria-label="Canvas label">Fallback text</canvas><canvas id="canvas2" width="100" height="100"><button>Inner button</button></canvas><canvas id="canvas3-skipped" width="100" height="100"></canvas></div>
+
+<div id="console"></div>
+<script>
+description("This test makes sure that a canvas with and without fallback content each has the right role and description.")
+
+if (window.testRunner && window.accessibilityController) {
+ window.testRunner.dumpAsText();
+
+ document.getElementById('container').focus();
+ var axContainer = accessibilityController.focusedElement;
+
+ shouldBe("axContainer.childrenCount", "2");
+
+ var axCanvas1 = axContainer.childAtIndex(0);
+ debug('Canvas 1 description: ' + axCanvas1.description);
+ debug('Canvas 1 role: ' + axCanvas1.role);
+
+ var axCanvas2 = axContainer.childAtIndex(1);
+ debug('Canvas 2 description: ' + axCanvas2.description);
+ debug('Canvas 2 role: ' + axCanvas2.role);
+}
+
+</script>
+
+<script src=""
+</body>
+</html>
Deleted: releases/WebKitGTK/webkit-1.10/LayoutTests/accessibility/canvas-expected.txt (128737 => 128738)
--- releases/WebKitGTK/webkit-1.10/LayoutTests/accessibility/canvas-expected.txt 2012-09-17 11:02:05 UTC (rev 128737)
+++ releases/WebKitGTK/webkit-1.10/LayoutTests/accessibility/canvas-expected.txt 2012-09-17 11:03:44 UTC (rev 128738)
@@ -1,2 +0,0 @@
-Test passed
-
Deleted: releases/WebKitGTK/webkit-1.10/LayoutTests/accessibility/canvas.html (128737 => 128738)
--- releases/WebKitGTK/webkit-1.10/LayoutTests/accessibility/canvas.html 2012-09-17 11:02:05 UTC (rev 128737)
+++ releases/WebKitGTK/webkit-1.10/LayoutTests/accessibility/canvas.html 2012-09-17 11:03:44 UTC (rev 128738)
@@ -1,63 +0,0 @@
-<html>
-<script type="text/_javascript_">
-
- function drawCanvas(context) {
- context.lineWidth = 10.0;
- context.lineCap = "round";
-
- context.beginPath();
-
- // Draw a bounds rect (default color is black)
- context.strokeRect(0, 0, 300, 300);
-
- context.strokeStyle = "#808080";
-
- // Draw a vertical line
- context.moveTo(150, 100);
- context.lineTo(150, 200);
- context.stroke();
-
- // Draw a horizontal line
- context.moveTo(100, 150);
- context.lineTo(200, 150);
- context.stroke();
- }
-
- function _onload() {
- var context = document.getElementById("myCanvas").getContext("2d");
- drawCanvas(context);
- }
-</script>
-<script>
- if (window.testRunner)
- testRunner.dumpAsText();
-</script>
-<body id="body" _onload_="_onload()">
-
-<html>
-
- <!-- This test makes sure that a canvas element shows up as an image -->
-
- <canvas id="myCanvas" style="width:300px;height:300px;" width='300' height='300' alt="canvas 1"></canvas>
-
- <div id="result"></div>
-
- <script>
- if (window.accessibilityController) {
- var result = document.getElementById("result");
-
- var body = document.getElementById("body");
- body.focus();
- var canvasElement = accessibilityController.focusedElement.childAtIndex(0).childAtIndex(0);
-
- var pattern = "AXRole: AXImage";
- if (canvasElement.allAttributes().indexOf(pattern) != -1) {
- result.innerText += "Test passed\n";
- }
- else {
- result.innerText += "Test failed\n" + canvasElement.allAttributes();
- }
- }
- </script>
-</body>
-</html>
Added: releases/WebKitGTK/webkit-1.10/LayoutTests/platform/chromium/accessibility/canvas-description-and-role-expected.txt (0 => 128738)
--- releases/WebKitGTK/webkit-1.10/LayoutTests/platform/chromium/accessibility/canvas-description-and-role-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-1.10/LayoutTests/platform/chromium/accessibility/canvas-description-and-role-expected.txt 2012-09-17 11:03:44 UTC (rev 128738)
@@ -0,0 +1,14 @@
+This test makes sure that a canvas with and without fallback content each has the right role and description.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS axContainer.childrenCount is 2
+Canvas 1 description: AXDescription: Canvas label
+Canvas 1 role: AXRole: AXCanvas
+Canvas 2 description: AXDescription:
+Canvas 2 role: AXRole: AXCanvas
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Modified: releases/WebKitGTK/webkit-1.10/LayoutTests/platform/gtk/TestExpectations (128737 => 128738)
--- releases/WebKitGTK/webkit-1.10/LayoutTests/platform/gtk/TestExpectations 2012-09-17 11:02:05 UTC (rev 128737)
+++ releases/WebKitGTK/webkit-1.10/LayoutTests/platform/gtk/TestExpectations 2012-09-17 11:03:44 UTC (rev 128738)
@@ -614,7 +614,7 @@
BUGWKGTK : accessibility/aria-text-role.html = TEXT
BUGWKGTK : accessibility/aria-used-on-image-maps.html = TEXT
BUGWKGTK : accessibility/button-press-action.html = TEXT
-BUGWKGTK : accessibility/canvas.html = TEXT
+BUGWKGTK : accessibility/canvas-description-and-role.html = TEXT
BUGWKGTK : accessibility/canvas-fallback-content.html = TEXT
BUGWKGTK : accessibility/editable-webarea-context-menu-point.html = TEXT
BUGWKGTK : accessibility/ellipsis-text.html = TEXT
Added: releases/WebKitGTK/webkit-1.10/LayoutTests/platform/mac/accessibility/canvas-description-and-role-expected.txt (0 => 128738)
--- releases/WebKitGTK/webkit-1.10/LayoutTests/platform/mac/accessibility/canvas-description-and-role-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-1.10/LayoutTests/platform/mac/accessibility/canvas-description-and-role-expected.txt 2012-09-17 11:03:44 UTC (rev 128738)
@@ -0,0 +1,14 @@
+This test makes sure that a canvas with and without fallback content each has the right role and description.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS axContainer.childrenCount is 2
+Canvas 1 description: AXDescription: Canvas label
+Canvas 1 role: AXRole: AXImage
+Canvas 2 description: AXDescription:
+Canvas 2 role: AXRole: AXGroup
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Copied: releases/WebKitGTK/webkit-1.10/LayoutTests/platform/mac/accessibility/canvas-expected.txt (from rev 128737, releases/WebKitGTK/webkit-1.10/LayoutTests/accessibility/canvas-expected.txt) (0 => 128738)
--- releases/WebKitGTK/webkit-1.10/LayoutTests/platform/mac/accessibility/canvas-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-1.10/LayoutTests/platform/mac/accessibility/canvas-expected.txt 2012-09-17 11:03:44 UTC (rev 128738)
@@ -0,0 +1,2 @@
+Test passed
+
Copied: releases/WebKitGTK/webkit-1.10/LayoutTests/platform/mac/accessibility/canvas.html (from rev 128737, releases/WebKitGTK/webkit-1.10/LayoutTests/accessibility/canvas.html) (0 => 128738)
--- releases/WebKitGTK/webkit-1.10/LayoutTests/platform/mac/accessibility/canvas.html (rev 0)
+++ releases/WebKitGTK/webkit-1.10/LayoutTests/platform/mac/accessibility/canvas.html 2012-09-17 11:03:44 UTC (rev 128738)
@@ -0,0 +1,63 @@
+<html>
+<script type="text/_javascript_">
+
+ function drawCanvas(context) {
+ context.lineWidth = 10.0;
+ context.lineCap = "round";
+
+ context.beginPath();
+
+ // Draw a bounds rect (default color is black)
+ context.strokeRect(0, 0, 300, 300);
+
+ context.strokeStyle = "#808080";
+
+ // Draw a vertical line
+ context.moveTo(150, 100);
+ context.lineTo(150, 200);
+ context.stroke();
+
+ // Draw a horizontal line
+ context.moveTo(100, 150);
+ context.lineTo(200, 150);
+ context.stroke();
+ }
+
+ function _onload() {
+ var context = document.getElementById("myCanvas").getContext("2d");
+ drawCanvas(context);
+ }
+</script>
+<script>
+ if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+<body id="body" _onload_="_onload()">
+
+<html>
+
+ <!-- This test makes sure that a canvas element shows up as an image -->
+
+ <canvas id="myCanvas" style="width:300px;height:300px;" width='300' height='300' alt="canvas 1"></canvas>
+
+ <div id="result"></div>
+
+ <script>
+ if (window.accessibilityController) {
+ var result = document.getElementById("result");
+
+ var body = document.getElementById("body");
+ body.focus();
+ var canvasElement = accessibilityController.focusedElement.childAtIndex(0).childAtIndex(0);
+
+ var pattern = "AXRole: AXImage";
+ if (canvasElement.allAttributes().indexOf(pattern) != -1) {
+ result.innerText += "Test passed\n";
+ }
+ else {
+ result.innerText += "Test failed\n" + canvasElement.allAttributes();
+ }
+ }
+ </script>
+</body>
+</html>
Modified: releases/WebKitGTK/webkit-1.10/Source/WebCore/ChangeLog (128737 => 128738)
--- releases/WebKitGTK/webkit-1.10/Source/WebCore/ChangeLog 2012-09-17 11:02:05 UTC (rev 128737)
+++ releases/WebKitGTK/webkit-1.10/Source/WebCore/ChangeLog 2012-09-17 11:03:44 UTC (rev 128738)
@@ -1,3 +1,34 @@
+2012-08-29 Dominic Mazzoni <dmazz...@google.com>
+
+ AX: Canvas should have a distinct role
+ https://bugs.webkit.org/show_bug.cgi?id=95248
+
+ Reviewed by Chris Fleizach.
+
+ Add new role for a canvas element, and a method to determine if
+ a canvas has fallback content, so each platform can decide on the
+ appropriate role mapping to use.
+
+ Test: accessibility/canvas-description-and-role.html
+
+ * accessibility/AccessibilityNodeObject.cpp:
+ (WebCore::AccessibilityNodeObject::canvasHasFallbackContent):
+ (WebCore):
+ * accessibility/AccessibilityNodeObject.h:
+ (AccessibilityNodeObject):
+ * accessibility/AccessibilityObject.h:
+ (WebCore::AccessibilityObject::isCanvas):
+ (WebCore::AccessibilityObject::canvasHasFallbackContent):
+ * accessibility/AccessibilityRenderObject.cpp:
+ (WebCore::AccessibilityRenderObject::accessibilityIsIgnored):
+ (WebCore::AccessibilityRenderObject::determineAccessibilityRole):
+ (WebCore::AccessibilityRenderObject::canHaveChildren):
+ * accessibility/gtk/WebKitAccessibleWrapperAtk.cpp:
+ (atkRole):
+ * accessibility/mac/WebAccessibilityObjectWrapper.mm:
+ (createAccessibilityRoleMap):
+ (-[WebAccessibilityObjectWrapper role]):
+
2012-08-28 Dominic Mazzoni <dmazz...@google.com>
AX: Focusable elements without a role should not be ignored
Modified: releases/WebKitGTK/webkit-1.10/Source/WebCore/accessibility/AccessibilityNodeObject.cpp (128737 => 128738)
--- releases/WebKitGTK/webkit-1.10/Source/WebCore/accessibility/AccessibilityNodeObject.cpp 2012-09-17 11:02:05 UTC (rev 128737)
+++ releases/WebKitGTK/webkit-1.10/Source/WebCore/accessibility/AccessibilityNodeObject.cpp 2012-09-17 11:03:44 UTC (rev 128738)
@@ -306,6 +306,23 @@
return m_role == UnknownRole;
}
+bool AccessibilityNodeObject::canvasHasFallbackContent() const
+{
+ Node* node = this->node();
+ if (!node || !node->hasTagName(canvasTag))
+ return false;
+
+ // If it has any children that are elements, we'll assume it might be fallback
+ // content. If it has no children or its only children are not elements
+ // (e.g. just text nodes), it doesn't have fallback content.
+ for (Node* child = node->firstChild(); child; child = child->nextSibling()) {
+ if (child->isElementNode())
+ return true;
+ }
+
+ return false;
+}
+
bool AccessibilityNodeObject::canSetFocusAttribute() const
{
Node* node = this->node();
Modified: releases/WebKitGTK/webkit-1.10/Source/WebCore/accessibility/AccessibilityNodeObject.h (128737 => 128738)
--- releases/WebKitGTK/webkit-1.10/Source/WebCore/accessibility/AccessibilityNodeObject.h 2012-09-17 11:02:05 UTC (rev 128737)
+++ releases/WebKitGTK/webkit-1.10/Source/WebCore/accessibility/AccessibilityNodeObject.h 2012-09-17 11:03:44 UTC (rev 128738)
@@ -66,6 +66,8 @@
virtual bool isAccessibilityNodeObject() const { return true; }
+ virtual bool canvasHasFallbackContent() const;
+
virtual bool canSetFocusAttribute() const;
virtual AccessibilityObject* firstChild() const;
Modified: releases/WebKitGTK/webkit-1.10/Source/WebCore/accessibility/AccessibilityObject.h (128737 => 128738)
--- releases/WebKitGTK/webkit-1.10/Source/WebCore/accessibility/AccessibilityObject.h 2012-09-17 11:02:05 UTC (rev 128737)
+++ releases/WebKitGTK/webkit-1.10/Source/WebCore/accessibility/AccessibilityObject.h 2012-09-17 11:03:44 UTC (rev 128738)
@@ -103,6 +103,7 @@
BrowserRole,
BusyIndicatorRole,
ButtonRole,
+ CanvasRole,
CellRole,
CheckBoxRole,
ColorWellRole,
@@ -380,6 +381,7 @@
bool isListItem() const { return roleValue() == ListItemRole; }
bool isCheckboxOrRadio() const { return isCheckbox() || isRadioButton(); }
bool isScrollView() const { return roleValue() == ScrollAreaRole; }
+ bool isCanvas() const { return roleValue() == CanvasRole; }
bool isBlockquote() const;
bool isLandmark() const;
@@ -457,6 +459,7 @@
virtual const AtomicString& invalidStatus() const;
bool supportsARIAExpanded() const;
AccessibilitySortDirection sortDirection() const;
+ virtual bool canvasHasFallbackContent() const { return false; }
// ARIA drag and drop
virtual bool supportsARIADropping() const { return false; }
Modified: releases/WebKitGTK/webkit-1.10/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (128737 => 128738)
--- releases/WebKitGTK/webkit-1.10/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2012-09-17 11:02:05 UTC (rev 128737)
+++ releases/WebKitGTK/webkit-1.10/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2012-09-17 11:03:44 UTC (rev 128738)
@@ -1492,7 +1492,7 @@
return ariaDescription;
Node* node = m_renderer->node();
- if (isImage() || isInputImage() || isNativeImage()) {
+ if (isImage() || isInputImage() || isNativeImage() || isCanvas()) {
if (node && node->isHTMLElement()) {
const AtomicString& alt = toHTMLElement(node)->getAttribute(altAttr);
if (alt.isEmpty())
@@ -1984,13 +1984,6 @@
return true;
}
- if (node && node->hasTagName(canvasTag)) {
- RenderHTMLCanvas* canvas = toRenderHTMLCanvas(m_renderer);
- if (canvas->height() <= 1 || canvas->width() <= 1)
- return true;
- return false;
- }
-
if (isNativeImage()) {
// check for one-dimensional image
RenderImage* image = toRenderImage(m_renderer);
@@ -2005,7 +1998,16 @@
}
return false;
}
-
+
+ if (isCanvas()) {
+ if (canvasHasFallbackContent())
+ return false;
+ RenderHTMLCanvas* canvas = toRenderHTMLCanvas(m_renderer);
+ if (canvas->height() <= 1 || canvas->width() <= 1)
+ return true;
+ // Otherwise fall through; use presence of help text, title, or description to decide.
+ }
+
if (isWebArea() || m_renderer->isListMarker())
return false;
@@ -3187,7 +3189,7 @@
return ImageRole;
}
if (node && node->hasTagName(canvasTag))
- return ImageRole;
+ return CanvasRole;
if (cssBox && cssBox->isRenderView())
return WebAreaRole;
@@ -3432,10 +3434,6 @@
if (!m_renderer)
return false;
- // Canvas is a special case; its role is ImageRole but it is allowed to have children.
- if (node() && node()->hasTagName(canvasTag))
- return true;
-
// Elements that should not have children
switch (roleValue()) {
case ImageRole:
Modified: releases/WebKitGTK/webkit-1.10/Source/WebCore/accessibility/gtk/WebKitAccessibleWrapperAtk.cpp (128737 => 128738)
--- releases/WebKitGTK/webkit-1.10/Source/WebCore/accessibility/gtk/WebKitAccessibleWrapperAtk.cpp 2012-09-17 11:02:05 UTC (rev 128737)
+++ releases/WebKitGTK/webkit-1.10/Source/WebCore/accessibility/gtk/WebKitAccessibleWrapperAtk.cpp 2012-09-17 11:03:44 UTC (rev 128738)
@@ -501,6 +501,7 @@
case WebCoreLinkRole:
case ImageMapLinkRole:
return ATK_ROLE_LINK;
+ case CanvasRole:
case ImageMapRole:
case ImageRole:
return ATK_ROLE_IMAGE;
Modified: releases/WebKitGTK/webkit-1.10/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapper.mm (128737 => 128738)
--- releases/WebKitGTK/webkit-1.10/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapper.mm 2012-09-17 11:02:05 UTC (rev 128737)
+++ releases/WebKitGTK/webkit-1.10/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapper.mm 2012-09-17 11:03:44 UTC (rev 128738)
@@ -1578,7 +1578,8 @@
{ FormRole, NSAccessibilityGroupRole },
{ SpinButtonRole, NSAccessibilityIncrementorRole },
{ FooterRole, NSAccessibilityGroupRole },
- { ToggleButtonRole, NSAccessibilityButtonRole }
+ { ToggleButtonRole, NSAccessibilityButtonRole },
+ { CanvasRole, NSAccessibilityImageRole }
};
AccessibilityRoleMap& roleMap = *new AccessibilityRoleMap;
@@ -1599,7 +1600,10 @@
{
if (m_object->isAttachment())
return [[self attachmentView] accessibilityAttributeValue:NSAccessibilityRoleAttribute];
- NSString* string = roleValueToNSString(m_object->roleValue());
+ AccessibilityRole role = m_object->roleValue();
+ if (role == CanvasRole && m_object->canvasHasFallbackContent())
+ role = GroupRole;
+ NSString* string = roleValueToNSString(role);
if (string != nil)
return string;
return NSAccessibilityUnknownRole;
Modified: releases/WebKitGTK/webkit-1.10/Source/WebKit/chromium/ChangeLog (128737 => 128738)
--- releases/WebKitGTK/webkit-1.10/Source/WebKit/chromium/ChangeLog 2012-09-17 11:02:05 UTC (rev 128737)
+++ releases/WebKitGTK/webkit-1.10/Source/WebKit/chromium/ChangeLog 2012-09-17 11:03:44 UTC (rev 128738)
@@ -1,3 +1,15 @@
+2012-08-29 Dominic Mazzoni <dmazz...@google.com>
+
+ AX: Canvas should have a distinct role
+ https://bugs.webkit.org/show_bug.cgi?id=95248
+
+ Reviewed by Chris Fleizach.
+
+ Add support for canvas accessibility role.
+
+ * public/WebAccessibilityRole.h:
+ * src/AssertMatchingEnums.cpp:
+
2012-08-22 Alec Flett <alecfl...@chromium.org>
IndexedDB: tests for injection/extraction of idb keys
Modified: releases/WebKitGTK/webkit-1.10/Source/WebKit/chromium/public/WebAccessibilityRole.h (128737 => 128738)
--- releases/WebKitGTK/webkit-1.10/Source/WebKit/chromium/public/WebAccessibilityRole.h 2012-09-17 11:02:05 UTC (rev 128737)
+++ releases/WebKitGTK/webkit-1.10/Source/WebKit/chromium/public/WebAccessibilityRole.h 2012-09-17 11:03:44 UTC (rev 128738)
@@ -49,6 +49,7 @@
WebAccessibilityRoleBrowser,
WebAccessibilityRoleBusyIndicator,
WebAccessibilityRoleButton,
+ WebAccessibilityRoleCanvas,
WebAccessibilityRoleCell,
WebAccessibilityRoleCheckBox,
WebAccessibilityRoleColorWell,
Modified: releases/WebKitGTK/webkit-1.10/Source/WebKit/chromium/src/AssertMatchingEnums.cpp (128737 => 128738)
--- releases/WebKitGTK/webkit-1.10/Source/WebKit/chromium/src/AssertMatchingEnums.cpp 2012-09-17 11:02:05 UTC (rev 128737)
+++ releases/WebKitGTK/webkit-1.10/Source/WebKit/chromium/src/AssertMatchingEnums.cpp 2012-09-17 11:03:44 UTC (rev 128738)
@@ -258,6 +258,7 @@
COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleDocumentRegion, DocumentRegionRole);
COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleUserInterfaceTooltip, UserInterfaceTooltipRole);
COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleToggleButton, ToggleButtonRole);
+COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleCanvas, CanvasRole);
COMPILE_ASSERT_MATCHING_ENUM(WebApplicationCacheHost::Uncached, ApplicationCacheHost::UNCACHED);
COMPILE_ASSERT_MATCHING_ENUM(WebApplicationCacheHost::Idle, ApplicationCacheHost::IDLE);
Modified: releases/WebKitGTK/webkit-1.10/Source/WebKit/win/AccessibleBase.cpp (128737 => 128738)
--- releases/WebKitGTK/webkit-1.10/Source/WebKit/win/AccessibleBase.cpp 2012-09-17 11:02:05 UTC (rev 128737)
+++ releases/WebKitGTK/webkit-1.10/Source/WebKit/win/AccessibleBase.cpp 2012-09-17 11:03:44 UTC (rev 128738)
@@ -657,6 +657,7 @@
case WebCore::LinkRole:
case WebCore::WebCoreLinkRole:
return ROLE_SYSTEM_LINK;
+ case WebCore::CanvasRole:
case WebCore::ImageMapRole:
case WebCore::ImageRole:
return ROLE_SYSTEM_GRAPHIC;
Modified: releases/WebKitGTK/webkit-1.10/Source/WebKit/win/ChangeLog (128737 => 128738)
--- releases/WebKitGTK/webkit-1.10/Source/WebKit/win/ChangeLog 2012-09-17 11:02:05 UTC (rev 128737)
+++ releases/WebKitGTK/webkit-1.10/Source/WebKit/win/ChangeLog 2012-09-17 11:03:44 UTC (rev 128738)
@@ -1,3 +1,15 @@
+2012-08-29 Dominic Mazzoni <dmazz...@google.com>
+
+ AX: Canvas should have a distinct role
+ https://bugs.webkit.org/show_bug.cgi?id=95248
+
+ Reviewed by Chris Fleizach.
+
+ Map new CanvasRole to the same as ImageRole.
+
+ * AccessibleBase.cpp:
+ (MSAARole):
+
2012-08-22 Nikhil Bhargava <nbharg...@google.com>
Reduce Font.h includes across project -- improves RenderObject.h compile time
Modified: releases/WebKitGTK/webkit-1.10/Tools/ChangeLog (128737 => 128738)
--- releases/WebKitGTK/webkit-1.10/Tools/ChangeLog 2012-09-17 11:02:05 UTC (rev 128737)
+++ releases/WebKitGTK/webkit-1.10/Tools/ChangeLog 2012-09-17 11:03:44 UTC (rev 128738)
@@ -1,3 +1,15 @@
+2012-08-29 Dominic Mazzoni <dmazz...@google.com>
+
+ AX: Canvas should have a distinct role
+ https://bugs.webkit.org/show_bug.cgi?id=95248
+
+ Reviewed by Chris Fleizach.
+
+ Add support for canvas accessibility role.
+
+ * DumpRenderTree/chromium/TestRunner/AccessibilityUIElementChromium.cpp:
+ (roleToString):
+
2012-09-13 Mario Sanchez Prada <msanc...@igalia.com>
[GTK] "Infinite" loop in AccessibilityUIElementGtk.cpp
Modified: releases/WebKitGTK/webkit-1.10/Tools/DumpRenderTree/chromium/TestRunner/AccessibilityUIElementChromium.cpp (128737 => 128738)
--- releases/WebKitGTK/webkit-1.10/Tools/DumpRenderTree/chromium/TestRunner/AccessibilityUIElementChromium.cpp 2012-09-17 11:02:05 UTC (rev 128737)
+++ releases/WebKitGTK/webkit-1.10/Tools/DumpRenderTree/chromium/TestRunner/AccessibilityUIElementChromium.cpp 2012-09-17 11:03:44 UTC (rev 128738)
@@ -206,6 +206,8 @@
return result.append("UserInterfaceTooltip");
case WebAccessibilityRoleToggleButton:
return result.append("ToggleButton");
+ case WebAccessibilityRoleCanvas:
+ return result.append("Canvas");
default:
// Also matches WebAccessibilityRoleUnknown.
return result.append("Unknown");