Merge r180566 - [GTK] Layout Test accessibility/roles-exposed.html is…

… failing https://bugs.webkit.org/show_bug.cgi?id=141960 Reviewed by Martin Robinson. Source/WebCore: The test was failing because Gtk now uses GtkColorChooserDialog for the color input, making the input field a button which results in the color chooser dialog appearing. As a side effect of this change, the input now has an accessible role of ColorWell, which is currently mapped to ATK_ROLE_COLOR_CHOOSER (which is by definition the dialog which results upon activating the button input field). Changed the Gtk platform mapping to ATK_ROLE_BUTTON, leaving the Efl mapping as-is. No new tests. Instead, updated and unskipped failing test. * accessibility/atk/WebKitAccessibleWrapperAtk.cpp: (atkRole): LayoutTests: * platform/gtk/TestExpectations: Unskip the failing test. * platform/gtk/accessibility/roles-exposed-expected.txt: Update the expectations.
WebKit · Feb 28, 2015 · 5df0434 · 5df0434
1 parent d4b3010
commit 5df0434
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 1 deletion.
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2015-02-24  Joanmarie Diggs  <jdiggs@igalia.com>
+
+        [GTK] Layout Test accessibility/roles-exposed.html is failing
+        https://bugs.webkit.org/show_bug.cgi?id=141960
+
+        Reviewed by Martin Robinson.
+
+        * platform/gtk/TestExpectations: Unskip the failing test.
+        * platform/gtk/accessibility/roles-exposed-expected.txt: Update the expectations.
+
 2015-02-24  Dhi Aurrahman  <diorahman@rockybars.com>
 
         Always serialize :lang()'s arguments to strings

diff --git a/LayoutTests/platform/gtk/accessibility/roles-exposed-expected.txt b/LayoutTests/platform/gtk/accessibility/roles-exposed-expected.txt
@@ -137,7 +137,7 @@ input[type='button']
       AXRole: AXButton
 
 input[type='color']
-      AXRole: AXTextField
+      AXRole: AXButton
 
 input[type='checkbox']
       AXRole: AXCheckBox

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,23 @@
+2015-02-24  Joanmarie Diggs  <jdiggs@igalia.com>
+
+        [GTK] Layout Test accessibility/roles-exposed.html is failing
+        https://bugs.webkit.org/show_bug.cgi?id=141960
+
+        Reviewed by Martin Robinson.
+
+        The test was failing because Gtk now uses GtkColorChooserDialog for the
+        color input, making the input field a button which results in the color
+        chooser dialog appearing. As a side effect of this change, the input now
+        has an accessible role of ColorWell, which is currently mapped to
+        ATK_ROLE_COLOR_CHOOSER (which is by definition the dialog which results
+        upon activating the button input field). Changed the Gtk platform mapping
+        to ATK_ROLE_BUTTON, leaving the Efl mapping as-is.
+
+        No new tests. Instead, updated and unskipped failing test.
+
+        * accessibility/atk/WebKitAccessibleWrapperAtk.cpp:
+        (atkRole):
+
 2015-02-26  Michael Catanzaro  <mcatanzaro@igalia.com>
 
         [FreeType] REGRESSION(r180563): Introduced crashes

diff --git a/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp b/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp
@@ -565,7 +565,12 @@ static AtkRole atkRole(AccessibilityObject* coreObject)
     case SplitterRole:
         return ATK_ROLE_SEPARATOR;
     case ColorWellRole:
+#if PLATFORM(GTK)
+        // ATK_ROLE_COLOR_CHOOSER is defined as a dialog (i.e. it's what appears when you push the button).
+        return ATK_ROLE_PUSH_BUTTON;
+#elif PLATFORM(EFL)
         return ATK_ROLE_COLOR_CHOOSER;
+#endif
     case ListRole:
         return ATK_ROLE_LIST;
     case ScrollBarRole: