Changeset 158273 in webkit

Timestamp:

Oct 30, 2013 9:06:07 AM (10 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL] accessibility/textarea-selected-text-range.html is failing
​https://bugs.webkit.org/show_bug.cgi?id=112016

Patch by Robert Plociennik <​r.plociennik@samsung.com> on 2013-10-30
Reviewed by Mario Sanchez Prada.

Tools:

Provided implementation for AccessibilityUIElement::selectedTextRange() and
AccessibilityUIElement::setSelectedTextRange().

• DumpRenderTree/atk/AccessibilityUIElementAtk.cpp:

(AccessibilityUIElement::selectedTextRange): Implemented.
(AccessibilityUIElement::setSelectedTextRange): Implemented

• WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp:

(WTR::AccessibilityUIElement::selectedTextRange): Implemented.
(WTR::AccessibilityUIElement::setSelectedTextRange): Implemented.

LayoutTests:

Removed failure expectations.

• platform/efl-wk1/TestExpectations: The test is no longer failing.
• platform/efl-wk2/TestExpectations: The test is no longer failing.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/efl-wk1/TestExpectations (modified) (1 diff)
• LayoutTests/platform/efl-wk2/TestExpectations (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/atk/AccessibilityUIElementAtk.cpp (modified) (1 diff)
• Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-10-30  Robert Plociennik  <r.plociennik@samsung.com>
+
+        [EFL] accessibility/textarea-selected-text-range.html is failing
+        https://bugs.webkit.org/show_bug.cgi?id=112016
+
+        Reviewed by Mario Sanchez Prada.
+
+        Removed failure expectations.
+
+        * platform/efl-wk1/TestExpectations: The test is no longer failing.
+        * platform/efl-wk2/TestExpectations: The test is no longer failing.
+
 2013-10-30  Robert Plociennik  <r.plociennik@samsung.com>
 

trunk/LayoutTests/platform/efl-wk1/TestExpectations

@@ -165 +165 @@
 webkit.org/b/112014 accessibility/textarea-insertion-point-line-number.html [ Failure ]
 webkit.org/b/112015 accessibility/textarea-line-for-index.html [ Failure ]
-webkit.org/b/112016 accessibility/textarea-selected-text-range.html [ Failure ]
 webkit.org/b/112017 accessibility/textbox-role-reports-selection.html [ Failure ]
 webkit.org/b/112018 accessibility/th-as-title-ui.html [ Failure ]

trunk/LayoutTests/platform/efl-wk2/TestExpectations

@@ -165 +165 @@
 webkit.org/b/112014 accessibility/textarea-insertion-point-line-number.html [ Failure ]
 webkit.org/b/112015 accessibility/textarea-line-for-index.html [ Failure ]
-webkit.org/b/112016 accessibility/textarea-selected-text-range.html [ Failure ]
 webkit.org/b/112017 accessibility/textbox-role-reports-selection.html [ Failure ]
 webkit.org/b/112018 accessibility/th-as-title-ui.html [ Failure ]

trunk/Tools/ChangeLog

@@ +1 @@
+2013-10-30  Robert Plociennik  <r.plociennik@samsung.com>
+
+        [EFL] accessibility/textarea-selected-text-range.html is failing
+        https://bugs.webkit.org/show_bug.cgi?id=112016
+
+        Reviewed by Mario Sanchez Prada.
+
+        Provided implementation for AccessibilityUIElement::selectedTextRange() and
+        AccessibilityUIElement::setSelectedTextRange().
+
+        * DumpRenderTree/atk/AccessibilityUIElementAtk.cpp:
+        (AccessibilityUIElement::selectedTextRange): Implemented.
+        (AccessibilityUIElement::setSelectedTextRange): Implemented
+        * WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp:
+        (WTR::AccessibilityUIElement::selectedTextRange): Implemented.
+        (WTR::AccessibilityUIElement::setSelectedTextRange): Implemented.
+
 2013-10-30  Robert Plociennik  <r.plociennik@samsung.com>
 

trunk/Tools/DumpRenderTree/atk/AccessibilityUIElementAtk.cpp

@@ -1036 +1036 @@
 JSStringRef AccessibilityUIElement::selectedTextRange()
 {
-    // FIXME: implement
-    return JSStringCreateWithCharacters(0, 0);
+    if (!ATK_IS_TEXT(m_element))
+        return JSStringCreateWithCharacters(0, 0);
+
+    gint start, end;
+    g_free(atk_text_get_selection(ATK_TEXT(m_element), 0, &start, &end));
+
+    GOwnPtr<gchar> selection(g_strdup_printf("{%d, %d}", start, end - start));
+    return JSStringCreateWithUTF8CString(selection.get());
 }
 
 void AccessibilityUIElement::setSelectedTextRange(unsigned location, unsigned length)
 {
-    // FIXME: implement
+    if (!ATK_IS_TEXT(m_element))
+        return;
+
+    atk_text_set_selection(ATK_TEXT(m_element), 0, location, location + length);
 }
 

trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp

@@ -1176 +1176 @@
 JSRetainPtr<JSStringRef> AccessibilityUIElement::selectedTextRange()
 {
-    // FIXME: implement
-    return JSStringCreateWithCharacters(0, 0);
+    if (!ATK_IS_TEXT(m_element.get()))
+        return JSStringCreateWithCharacters(0, 0);
+
+    gint start, end;
+    g_free(atk_text_get_selection(ATK_TEXT(m_element.get()), 0, &start, &end));
+
+    GOwnPtr<gchar> selection(g_strdup_printf("{%d, %d}", start, end - start));
+    return JSStringCreateWithUTF8CString(selection.get());
 }
 
 void AccessibilityUIElement::setSelectedTextRange(unsigned location, unsigned length)
 {
-    // FIXME: implement
+    if (!ATK_IS_TEXT(m_element.get()))
+        return;
+
+    atk_text_set_selection(ATK_TEXT(m_element.get()), 0, location, location + length);
 }