Changeset 158757 in webkit

Timestamp:

Nov 6, 2013 10:17:03 AM (11 years ago)

Author:

Michał Pakuła vel Rutka

Message:

[ATK] accessibility/title-ui-element-correctness.html fails
​https://bugs.webkit.org/show_bug.cgi?id=99825

Reviewed by Mario Sanchez Prada.

Source/WebCore:

When calling setAtkRelationSetFromCoreObject a new ATK_LABELLED_BY_RELATION
is added, adding proper label element as a relation. When the document structure
has been changed and a different label should be linked as a relation, current ATK
implementation adds it as a next target on relation's target list, while
WTR/DumpRenderTree implementation takes only first one into account.
This patch adds a new function removing current relations before adding new ones.

Covered by existing tests.

• accessibility/atk/WebKitAccessibleWrapperAtk.cpp:

(removeAtkRelationFromRelationSetByType):
(setAtkRelationSetFromCoreObject):

LayoutTests:

Remove failure test expectation for the test fixed by this patch.

• platform/efl-wk1/TestExpectations:
• platform/efl-wk2/TestExpectations:
• platform/gtk/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/efl-wk1/TestExpectations (modified) (1 diff)
• LayoutTests/platform/efl-wk2/TestExpectations (modified) (1 diff)
• LayoutTests/platform/gtk/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-11-06  Michał Pakuła vel Rutka  <m.pakula@samsung.com>
+
+        [ATK] accessibility/title-ui-element-correctness.html fails
+        https://bugs.webkit.org/show_bug.cgi?id=99825
+
+        Reviewed by Mario Sanchez Prada.
+
+        Remove failure test expectation for the test fixed by this patch.
+
+        * platform/efl-wk1/TestExpectations:
+        * platform/efl-wk2/TestExpectations:
+        * platform/gtk/TestExpectations:
+
 2013-11-06  Mario Sanchez Prada  <mario.prada@samsung.com>
 

trunk/LayoutTests/platform/efl-wk1/TestExpectations

@@ -132 +132 @@
 webkit.org/b/112014 accessibility/textarea-insertion-point-line-number.html [ Failure ]
 webkit.org/b/112018 accessibility/th-as-title-ui.html [ Failure ]
-webkit.org/b/112019 accessibility/title-ui-element-correctness.html [ Failure ]
 webkit.org/b/112021 accessibility/visible-elements.html [ Failure Crash ]
 

trunk/LayoutTests/platform/efl-wk2/TestExpectations

@@ -164 +164 @@
 webkit.org/b/112014 accessibility/textarea-insertion-point-line-number.html [ Failure ]
 webkit.org/b/112018 accessibility/th-as-title-ui.html [ Failure ]
-webkit.org/b/112019 accessibility/title-ui-element-correctness.html [ Failure ]
 webkit.org/b/112021 accessibility/visible-elements.html [ Failure Crash ]
 

trunk/LayoutTests/platform/gtk/TestExpectations

@@ -1223 +1223 @@
 webkit.org/b/98950 transitions/blendmode-transitions.html [ Failure ]
 
-webkit.org/b/99825 accessibility/title-ui-element-correctness.html [ Failure ]
-
 webkit.org/b/98718 svg/animations/animate-css-xml-attributeType.html [ Failure ]
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-11-06  Michał Pakuła vel Rutka  <m.pakula@samsung.com>
+
+        [ATK] accessibility/title-ui-element-correctness.html fails
+        https://bugs.webkit.org/show_bug.cgi?id=99825
+
+        Reviewed by Mario Sanchez Prada.
+
+        When calling setAtkRelationSetFromCoreObject a new ATK_LABELLED_BY_RELATION
+        is added, adding proper label element as a relation. When the document structure
+        has been changed and a different label should be linked as a relation, current ATK
+        implementation adds it as a next target on relation's target list, while
+        WTR/DumpRenderTree implementation takes only first one into account.
+        This patch adds a new function removing current relations before adding new ones.
+
+        Covered by existing tests.
+
+        * accessibility/atk/WebKitAccessibleWrapperAtk.cpp:
+        (removeAtkRelationFromRelationSetByType):
+        (setAtkRelationSetFromCoreObject):
+
 2013-11-06  Daniel Bates  <dabates@apple.com>
 

trunk/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp

@@ -192 +192 @@
 }
 
+static void removeAtkRelationByType(AtkRelationSet* relationSet, AtkRelationType relationType)
+{
+    int count = atk_relation_set_get_n_relations(relationSet);
+    for (int i = 0; i < count; i++) {
+        AtkRelation* relation = atk_relation_set_get_relation(relationSet, i);
+        if (atk_relation_get_relation_type(relation) == relationType) {
+            atk_relation_set_remove(relationSet, relation);
+            break;
+        }
+    }
+}
+
 static void setAtkRelationSetFromCoreObject(AccessibilityObject* coreObject, AtkRelationSet* relationSet)
 {
     if (coreObject->isFieldset()) {
         AccessibilityObject* label = coreObject->titleUIElement();
-        if (label)
+        if (label) {
+            removeAtkRelationByType(relationSet, ATK_RELATION_LABELLED_BY);
             atk_relation_set_add_relation_by_type(relationSet, ATK_RELATION_LABELLED_BY, label->wrapper());
+        }
         return;
     }
@@ -213 +227 @@
     if (coreObject->isControl()) {
         AccessibilityObject* label = coreObject->correspondingLabelForControlElement();
-        if (label)
+        if (label) {
+            removeAtkRelationByType(relationSet, ATK_RELATION_LABELLED_BY);
             atk_relation_set_add_relation_by_type(relationSet, ATK_RELATION_LABELLED_BY, label->wrapper());
+        }
     } else {
         AccessibilityObject* control = coreObject->correspondingControlForLabelElement();