Title: [127006] trunk
Revision
127006
Author
[email protected]
Date
2012-08-29 09:25:05 -0700 (Wed, 29 Aug 2012)

Log Message

Unreviewed, rolling out r126972.
http://trac.webkit.org/changeset/126972
https://bugs.webkit.org/show_bug.cgi?id=95349

accessibility/canvas-description-and-role.html has been
failing consistently on several bots and Dominic needs some
time to investigate why (Requested by jchaffraix on #webkit).

Patch by Sheriff Bot <[email protected]> on 2012-08-29

Source/WebCore:

* accessibility/AccessibilityNodeObject.cpp:
* accessibility/AccessibilityNodeObject.h:
* accessibility/AccessibilityObject.h:
(AccessibilityObject):
* accessibility/AccessibilityRenderObject.cpp:
(WebCore::AccessibilityRenderObject::accessibilityDescription):
(WebCore::AccessibilityRenderObject::accessibilityIsIgnored):
(WebCore::AccessibilityRenderObject::determineAccessibilityRole):
(WebCore::AccessibilityRenderObject::canHaveChildren):
* accessibility/gtk/WebKitAccessibleWrapperAtk.cpp:
(atkRole):
* accessibility/mac/WebAccessibilityObjectWrapper.mm:
(createAccessibilityRoleMap):
(-[WebAccessibilityObjectWrapper role]):

Source/WebKit/chromium:

* public/WebAccessibilityRole.h:
* src/AssertMatchingEnums.cpp:

Source/WebKit/win:

* AccessibleBase.cpp:
(MSAARole):

Tools:

* DumpRenderTree/chromium/TestRunner/AccessibilityUIElementChromium.cpp:
(roleToString):

LayoutTests:

* accessibility/canvas-description-and-role.html: Removed.
* accessibility/canvas-expected.txt: Renamed from LayoutTests/platform/mac/accessibility/canvas-expected.txt.
* accessibility/canvas.html: Renamed from LayoutTests/platform/mac/accessibility/canvas.html.
* platform/chromium/accessibility/canvas-description-and-role-expected.txt: Removed.
* platform/gtk/TestExpectations:
* platform/mac/accessibility/canvas-description-and-role-expected.txt: Removed.

Modified Paths

Added Paths

Removed Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (127005 => 127006)


--- trunk/LayoutTests/ChangeLog	2012-08-29 16:17:58 UTC (rev 127005)
+++ trunk/LayoutTests/ChangeLog	2012-08-29 16:25:05 UTC (rev 127006)
@@ -1,3 +1,20 @@
+2012-08-29  Sheriff Bot  <[email protected]>
+
+        Unreviewed, rolling out r126972.
+        http://trac.webkit.org/changeset/126972
+        https://bugs.webkit.org/show_bug.cgi?id=95349
+
+        accessibility/canvas-description-and-role.html has been
+        failing consistently on several bots and Dominic needs some
+        time to investigate why (Requested by jchaffraix on #webkit).
+
+        * accessibility/canvas-description-and-role.html: Removed.
+        * accessibility/canvas-expected.txt: Renamed from LayoutTests/platform/mac/accessibility/canvas-expected.txt.
+        * accessibility/canvas.html: Renamed from LayoutTests/platform/mac/accessibility/canvas.html.
+        * platform/chromium/accessibility/canvas-description-and-role-expected.txt: Removed.
+        * platform/gtk/TestExpectations:
+        * platform/mac/accessibility/canvas-description-and-role-expected.txt: Removed.
+
 2012-08-29  Vsevolod Vlasov  <[email protected]>
 
         Web Inspector: Minor debugger-test polish.

Deleted: trunk/LayoutTests/accessibility/canvas-description-and-role.html (127005 => 127006)


--- trunk/LayoutTests/accessibility/canvas-description-and-role.html	2012-08-29 16:17:58 UTC (rev 127005)
+++ trunk/LayoutTests/accessibility/canvas-description-and-role.html	2012-08-29 16:25:05 UTC (rev 127006)
@@ -1,35 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<body>
-<script src=""
-
-    <!-- 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><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>

Copied: trunk/LayoutTests/accessibility/canvas-expected.txt (from rev 127005, trunk/LayoutTests/platform/mac/accessibility/canvas-expected.txt) (0 => 127006)


--- trunk/LayoutTests/accessibility/canvas-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/accessibility/canvas-expected.txt	2012-08-29 16:25:05 UTC (rev 127006)
@@ -0,0 +1,2 @@
+Test passed
+

Copied: trunk/LayoutTests/accessibility/canvas.html (from rev 127005, trunk/LayoutTests/platform/mac/accessibility/canvas.html) (0 => 127006)


--- trunk/LayoutTests/accessibility/canvas.html	                        (rev 0)
+++ trunk/LayoutTests/accessibility/canvas.html	2012-08-29 16:25:05 UTC (rev 127006)
@@ -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>

Deleted: trunk/LayoutTests/platform/chromium/accessibility/canvas-description-and-role-expected.txt (127005 => 127006)


--- trunk/LayoutTests/platform/chromium/accessibility/canvas-description-and-role-expected.txt	2012-08-29 16:17:58 UTC (rev 127005)
+++ trunk/LayoutTests/platform/chromium/accessibility/canvas-description-and-role-expected.txt	2012-08-29 16:25:05 UTC (rev 127006)
@@ -1,14 +0,0 @@
-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: trunk/LayoutTests/platform/gtk/TestExpectations (127005 => 127006)


--- trunk/LayoutTests/platform/gtk/TestExpectations	2012-08-29 16:17:58 UTC (rev 127005)
+++ trunk/LayoutTests/platform/gtk/TestExpectations	2012-08-29 16:25:05 UTC (rev 127006)
@@ -623,7 +623,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-description-and-role.html = TEXT
+BUGWKGTK : accessibility/canvas.html = TEXT
 BUGWKGTK : accessibility/canvas-fallback-content.html = TEXT
 BUGWKGTK : accessibility/editable-webarea-context-menu-point.html = TEXT
 BUGWKGTK : accessibility/ellipsis-text.html = TEXT

Deleted: trunk/LayoutTests/platform/mac/accessibility/canvas-description-and-role-expected.txt (127005 => 127006)


--- trunk/LayoutTests/platform/mac/accessibility/canvas-description-and-role-expected.txt	2012-08-29 16:17:58 UTC (rev 127005)
+++ trunk/LayoutTests/platform/mac/accessibility/canvas-description-and-role-expected.txt	2012-08-29 16:25:05 UTC (rev 127006)
@@ -1,14 +0,0 @@
-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
-

Deleted: trunk/LayoutTests/platform/mac/accessibility/canvas-expected.txt (127005 => 127006)


--- trunk/LayoutTests/platform/mac/accessibility/canvas-expected.txt	2012-08-29 16:17:58 UTC (rev 127005)
+++ trunk/LayoutTests/platform/mac/accessibility/canvas-expected.txt	2012-08-29 16:25:05 UTC (rev 127006)
@@ -1,2 +0,0 @@
-Test passed
-

Deleted: trunk/LayoutTests/platform/mac/accessibility/canvas.html (127005 => 127006)


--- trunk/LayoutTests/platform/mac/accessibility/canvas.html	2012-08-29 16:17:58 UTC (rev 127005)
+++ trunk/LayoutTests/platform/mac/accessibility/canvas.html	2012-08-29 16:25:05 UTC (rev 127006)
@@ -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>

Modified: trunk/Source/WebCore/ChangeLog (127005 => 127006)


--- trunk/Source/WebCore/ChangeLog	2012-08-29 16:17:58 UTC (rev 127005)
+++ trunk/Source/WebCore/ChangeLog	2012-08-29 16:25:05 UTC (rev 127006)
@@ -1,3 +1,28 @@
+2012-08-29  Sheriff Bot  <[email protected]>
+
+        Unreviewed, rolling out r126972.
+        http://trac.webkit.org/changeset/126972
+        https://bugs.webkit.org/show_bug.cgi?id=95349
+
+        accessibility/canvas-description-and-role.html has been
+        failing consistently on several bots and Dominic needs some
+        time to investigate why (Requested by jchaffraix on #webkit).
+
+        * accessibility/AccessibilityNodeObject.cpp:
+        * accessibility/AccessibilityNodeObject.h:
+        * accessibility/AccessibilityObject.h:
+        (AccessibilityObject):
+        * accessibility/AccessibilityRenderObject.cpp:
+        (WebCore::AccessibilityRenderObject::accessibilityDescription):
+        (WebCore::AccessibilityRenderObject::accessibilityIsIgnored):
+        (WebCore::AccessibilityRenderObject::determineAccessibilityRole):
+        (WebCore::AccessibilityRenderObject::canHaveChildren):
+        * accessibility/gtk/WebKitAccessibleWrapperAtk.cpp:
+        (atkRole):
+        * accessibility/mac/WebAccessibilityObjectWrapper.mm:
+        (createAccessibilityRoleMap):
+        (-[WebAccessibilityObjectWrapper role]):
+
 2012-08-29  Vsevolod Vlasov  <[email protected]>
 
         Web Inspector: Minor ResourceScriptMapping polish.

Modified: trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp (127005 => 127006)


--- trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp	2012-08-29 16:17:58 UTC (rev 127005)
+++ trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp	2012-08-29 16:25:05 UTC (rev 127006)
@@ -306,23 +306,6 @@
     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: trunk/Source/WebCore/accessibility/AccessibilityNodeObject.h (127005 => 127006)


--- trunk/Source/WebCore/accessibility/AccessibilityNodeObject.h	2012-08-29 16:17:58 UTC (rev 127005)
+++ trunk/Source/WebCore/accessibility/AccessibilityNodeObject.h	2012-08-29 16:25:05 UTC (rev 127006)
@@ -66,8 +66,6 @@
     
     virtual bool isAccessibilityNodeObject() const { return true; }
 
-    virtual bool canvasHasFallbackContent() const;
-
     virtual bool canSetFocusAttribute() const;
     
     virtual AccessibilityObject* firstChild() const;

Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.h (127005 => 127006)


--- trunk/Source/WebCore/accessibility/AccessibilityObject.h	2012-08-29 16:17:58 UTC (rev 127005)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.h	2012-08-29 16:25:05 UTC (rev 127006)
@@ -104,7 +104,6 @@
     BrowserRole,
     BusyIndicatorRole,
     ButtonRole,
-    CanvasRole,
     CellRole, 
     CheckBoxRole,
     ColorWellRole,
@@ -382,7 +381,6 @@
     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;
     
@@ -460,7 +458,6 @@
     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: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (127005 => 127006)


--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp	2012-08-29 16:17:58 UTC (rev 127005)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp	2012-08-29 16:25:05 UTC (rev 127006)
@@ -1492,7 +1492,7 @@
         return ariaDescription;
     
     Node* node = m_renderer->node();
-    if (isImage() || isInputImage() || isNativeImage() || isCanvas()) {
+    if (isImage() || isInputImage() || isNativeImage()) {
         if (node && node->isHTMLElement()) {
             const AtomicString& alt = toHTMLElement(node)->getAttribute(altAttr);
             if (alt.isEmpty())
@@ -1975,6 +1975,13 @@
                 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);
@@ -1989,16 +1996,7 @@
         }
         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;
     
@@ -3180,7 +3178,7 @@
         return ImageRole;
     }
     if (node && node->hasTagName(canvasTag))
-        return CanvasRole;
+        return ImageRole;
 
     if (cssBox && cssBox->isRenderView())
         return WebAreaRole;
@@ -3425,6 +3423,10 @@
     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: trunk/Source/WebCore/accessibility/gtk/WebKitAccessibleWrapperAtk.cpp (127005 => 127006)


--- trunk/Source/WebCore/accessibility/gtk/WebKitAccessibleWrapperAtk.cpp	2012-08-29 16:17:58 UTC (rev 127005)
+++ trunk/Source/WebCore/accessibility/gtk/WebKitAccessibleWrapperAtk.cpp	2012-08-29 16:25:05 UTC (rev 127006)
@@ -501,7 +501,6 @@
     case WebCoreLinkRole:
     case ImageMapLinkRole:
         return ATK_ROLE_LINK;
-    case CanvasRole:
     case ImageMapRole:
     case ImageRole:
         return ATK_ROLE_IMAGE;

Modified: trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapper.mm (127005 => 127006)


--- trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapper.mm	2012-08-29 16:17:58 UTC (rev 127005)
+++ trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapper.mm	2012-08-29 16:25:05 UTC (rev 127006)
@@ -1578,8 +1578,7 @@
         { FormRole, NSAccessibilityGroupRole },
         { SpinButtonRole, NSAccessibilityIncrementorRole },
         { FooterRole, NSAccessibilityGroupRole },
-        { ToggleButtonRole, NSAccessibilityButtonRole },
-        { CanvasRole, NSAccessibilityImageRole }
+        { ToggleButtonRole, NSAccessibilityButtonRole }
     };
     AccessibilityRoleMap& roleMap = *new AccessibilityRoleMap;
     
@@ -1600,10 +1599,7 @@
 {
     if (m_object->isAttachment())
         return [[self attachmentView] accessibilityAttributeValue:NSAccessibilityRoleAttribute];
-    AccessibilityRole role = m_object->roleValue();
-    if (role == CanvasRole && m_object->canvasHasFallbackContent())
-        role = GroupRole;
-    NSString* string = roleValueToNSString(role);
+    NSString* string = roleValueToNSString(m_object->roleValue());
     if (string != nil)
         return string;
     return NSAccessibilityUnknownRole;

Modified: trunk/Source/WebKit/chromium/ChangeLog (127005 => 127006)


--- trunk/Source/WebKit/chromium/ChangeLog	2012-08-29 16:17:58 UTC (rev 127005)
+++ trunk/Source/WebKit/chromium/ChangeLog	2012-08-29 16:25:05 UTC (rev 127006)
@@ -1,3 +1,16 @@
+2012-08-29  Sheriff Bot  <[email protected]>
+
+        Unreviewed, rolling out r126972.
+        http://trac.webkit.org/changeset/126972
+        https://bugs.webkit.org/show_bug.cgi?id=95349
+
+        accessibility/canvas-description-and-role.html has been
+        failing consistently on several bots and Dominic needs some
+        time to investigate why (Requested by jchaffraix on #webkit).
+
+        * public/WebAccessibilityRole.h:
+        * src/AssertMatchingEnums.cpp:
+
 2012-08-29  Peter Beverloo  <[email protected]>
 
         Unreviewed.  Rolled DEPS.

Modified: trunk/Source/WebKit/chromium/public/WebAccessibilityRole.h (127005 => 127006)


--- trunk/Source/WebKit/chromium/public/WebAccessibilityRole.h	2012-08-29 16:17:58 UTC (rev 127005)
+++ trunk/Source/WebKit/chromium/public/WebAccessibilityRole.h	2012-08-29 16:25:05 UTC (rev 127006)
@@ -49,7 +49,6 @@
     WebAccessibilityRoleBrowser,
     WebAccessibilityRoleBusyIndicator,
     WebAccessibilityRoleButton,
-    WebAccessibilityRoleCanvas,
     WebAccessibilityRoleCell, 
     WebAccessibilityRoleCheckBox,
     WebAccessibilityRoleColorWell,

Modified: trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp (127005 => 127006)


--- trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp	2012-08-29 16:17:58 UTC (rev 127005)
+++ trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp	2012-08-29 16:25:05 UTC (rev 127006)
@@ -261,7 +261,6 @@
 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: trunk/Source/WebKit/win/AccessibleBase.cpp (127005 => 127006)


--- trunk/Source/WebKit/win/AccessibleBase.cpp	2012-08-29 16:17:58 UTC (rev 127005)
+++ trunk/Source/WebKit/win/AccessibleBase.cpp	2012-08-29 16:25:05 UTC (rev 127006)
@@ -657,7 +657,6 @@
         case WebCore::LinkRole:
         case WebCore::WebCoreLinkRole:
             return ROLE_SYSTEM_LINK;
-        case WebCore::CanvasRole:
         case WebCore::ImageMapRole:
         case WebCore::ImageRole:
             return ROLE_SYSTEM_GRAPHIC;

Modified: trunk/Source/WebKit/win/ChangeLog (127005 => 127006)


--- trunk/Source/WebKit/win/ChangeLog	2012-08-29 16:17:58 UTC (rev 127005)
+++ trunk/Source/WebKit/win/ChangeLog	2012-08-29 16:25:05 UTC (rev 127006)
@@ -1,3 +1,16 @@
+2012-08-29  Sheriff Bot  <[email protected]>
+
+        Unreviewed, rolling out r126972.
+        http://trac.webkit.org/changeset/126972
+        https://bugs.webkit.org/show_bug.cgi?id=95349
+
+        accessibility/canvas-description-and-role.html has been
+        failing consistently on several bots and Dominic needs some
+        time to investigate why (Requested by jchaffraix on #webkit).
+
+        * AccessibleBase.cpp:
+        (MSAARole):
+
 2012-08-29  Dominic Mazzoni  <[email protected]>
 
         AX: Canvas should have a distinct role

Modified: trunk/Tools/ChangeLog (127005 => 127006)


--- trunk/Tools/ChangeLog	2012-08-29 16:17:58 UTC (rev 127005)
+++ trunk/Tools/ChangeLog	2012-08-29 16:25:05 UTC (rev 127006)
@@ -1,3 +1,16 @@
+2012-08-29  Sheriff Bot  <[email protected]>
+
+        Unreviewed, rolling out r126972.
+        http://trac.webkit.org/changeset/126972
+        https://bugs.webkit.org/show_bug.cgi?id=95349
+
+        accessibility/canvas-description-and-role.html has been
+        failing consistently on several bots and Dominic needs some
+        time to investigate why (Requested by jchaffraix on #webkit).
+
+        * DumpRenderTree/chromium/TestRunner/AccessibilityUIElementChromium.cpp:
+        (roleToString):
+
 2012-08-29  Raphael Kubo da Costa  <[email protected]>
 
         [EFL] Resolve CMake warnings on overlapping search paths for EFL jhbuild-enabled build

Modified: trunk/Tools/DumpRenderTree/chromium/TestRunner/AccessibilityUIElementChromium.cpp (127005 => 127006)


--- trunk/Tools/DumpRenderTree/chromium/TestRunner/AccessibilityUIElementChromium.cpp	2012-08-29 16:17:58 UTC (rev 127005)
+++ trunk/Tools/DumpRenderTree/chromium/TestRunner/AccessibilityUIElementChromium.cpp	2012-08-29 16:25:05 UTC (rev 127006)
@@ -206,8 +206,6 @@
         return result.append("UserInterfaceTooltip");
     case WebAccessibilityRoleToggleButton:
         return result.append("ToggleButton");
-    case WebAccessibilityRoleCanvas:
-        return result.append("Canvas");
     default:
         // Also matches WebAccessibilityRoleUnknown.
         return result.append("Unknown");
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to