webkitgtk-2.4.9webkitgtk-2.4.9

1 files changed, 53 insertions, 294 deletions

diff --git a/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp b/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp
index 29cd3a848..440377937 100644
--- a/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp
+++ b/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp
@@ -35,13 +35,10 @@
 #include "NotImplemented.h"
 #include <JavaScriptCore/JSStringRef.h>
 #include <JavaScriptCore/OpaqueJSString.h>
-#if ATK_CHECK_VERSION(2,11,90)
-#include <WebKit/WKBundleFrame.h>
-#endif
 #include <atk/atk.h>
 #include <wtf/Assertions.h>
-#include <wtf/glib/GRefPtr.h>
-#include <wtf/glib/GUniquePtr.h>
+#include <wtf/gobject/GRefPtr.h>
+#include <wtf/gobject/GUniquePtr.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/StringBuilder.h>
 #include <wtf/text/WTFString.h>
@@ -51,13 +48,6 @@ namespace WTR {
 
 namespace {
 
-#if ATK_CHECK_VERSION(2,11,92)
-enum RangeLimit {
-    RangeLimitMinimum,
-    RangeLimitMaximum
-};
-#endif
-
 enum AtkAttributeType {
     ObjectAttributeType,
     TextAttributeType
@@ -71,8 +61,6 @@ enum AttributeDomain {
 enum AttributesIndex {
     // Attribute names.
     InvalidNameIndex = 0,
-    PosInSetIndex,
-    SetSizeIndex,
     PlaceholderNameIndex,
     SortNameIndex,
 
@@ -88,8 +76,6 @@ enum AttributesIndex {
 const String attributesMap[][2] = {
     // Attribute names.
     { "AXInvalid", "invalid" },
-    { "AXARIAPosInSet", "posinset" },
-    { "AXARIASetSize", "setsize" },
     { "AXPlaceholderValue", "placeholder-text" } ,
     { "AXSortDirection", "sort" },
 
@@ -217,10 +203,7 @@ bool checkElementState(PlatformUIElement element, AtkStateType stateType)
 JSStringRef indexRangeInTable(PlatformUIElement element, bool isRowRange)
 {
     GUniquePtr<gchar> rangeString(g_strdup("{0, 0}"));
-#if ATK_CHECK_VERSION(2,11,90)
-    if (!ATK_IS_TABLE_CELL(element.get()))
-        return JSStringCreateWithUTF8CString(rangeString.get());
-#else
+
     if (!ATK_IS_OBJECT(element.get()))
         return JSStringCreateWithUTF8CString(rangeString.get());
 
@@ -232,20 +215,11 @@ JSStringRef indexRangeInTable(PlatformUIElement element, bool isRowRange)
     gint indexInParent = atk_object_get_index_in_parent(ATK_OBJECT(element.get()));
     if (indexInParent == -1)
         return JSStringCreateWithUTF8CString(rangeString.get());
-#endif
 
-    gint row = -1;
-    gint column = -1;
-    gint rowSpan = -1;
-    gint columnSpan = -1;
-#if ATK_CHECK_VERSION(2,11,90)
-    atk_table_cell_get_row_column_span(ATK_TABLE_CELL(element.get()), &row, &column, &rowSpan, &columnSpan);
-#else
+    int row = -1;
+    int column = -1;
     row = atk_table_get_row_at_index(ATK_TABLE(axTable), indexInParent);
     column = atk_table_get_column_at_index(ATK_TABLE(axTable), indexInParent);
-    rowSpan = atk_table_get_row_extent_at(ATK_TABLE(axTable), row, column);
-    columnSpan = atk_table_get_column_extent_at(ATK_TABLE(axTable), row, column);
-#endif
 
     // Get the actual values, if row and columns are valid values.
     if (row != -1 && column != -1) {
@@ -253,10 +227,10 @@ JSStringRef indexRangeInTable(PlatformUIElement element, bool isRowRange)
         int length = 0;
         if (isRowRange) {
             base = row;
-            length = rowSpan;
+            length = atk_table_get_row_extent_at(ATK_TABLE(axTable), row, column);
         } else {
             base = column;
-            length = columnSpan;
+            length = atk_table_get_column_extent_at(ATK_TABLE(axTable), row, column);
         }
         rangeString.reset(g_strdup_printf("{%d, %d}", base, length));
     }
@@ -269,13 +243,6 @@ void alterCurrentValue(PlatformUIElement element, int factor)
     if (!ATK_IS_VALUE(element.get()))
         return;
 
-#if ATK_CHECK_VERSION(2,11,92)
-    double currentValue;
-    atk_value_get_value_and_text(ATK_VALUE(element.get()), &currentValue, nullptr);
-
-    double increment = atk_value_get_increment(ATK_VALUE(element.get()));
-    atk_value_set_value(ATK_VALUE(element.get()), currentValue + factor * increment);
-#else
     GValue currentValue = G_VALUE_INIT;
     atk_value_get_current_value(ATK_VALUE(element.get()), &currentValue);
 
@@ -291,7 +258,6 @@ void alterCurrentValue(PlatformUIElement element, int factor)
     g_value_unset(&newValue);
     g_value_unset(&increment);
     g_value_unset(&currentValue);
-#endif
 }
 
 gchar* replaceCharactersForResults(gchar* str)
@@ -339,8 +305,6 @@ const gchar* roleToString(AtkObject* object)
         return "AXDialog";
     case ATK_ROLE_CANVAS:
         return "AXCanvas";
-    case ATK_ROLE_CAPTION:
-        return "AXCaption";
     case ATK_ROLE_CHECK_BOX:
         return "AXCheckBox";
     case ATK_ROLE_COLOR_CHOOSER:
@@ -456,10 +420,6 @@ const gchar* roleToString(AtkObject* object)
 #if ATK_CHECK_VERSION(2, 11, 3)
     case ATK_ROLE_ARTICLE:
         return "AXArticle";
-    case ATK_ROLE_AUDIO:
-        return "AXAudio";
-    case ATK_ROLE_BLOCK_QUOTE:
-        return "AXBlockquote";
     case ATK_ROLE_DEFINITION:
         return "AXDefinition";
     case ATK_ROLE_LOG:
@@ -470,8 +430,6 @@ const gchar* roleToString(AtkObject* object)
         return "AXMath";
     case ATK_ROLE_TIMER:
         return "AXTimer";
-    case ATK_ROLE_VIDEO:
-        return "AXVideo";
 #endif
 #if ATK_CHECK_VERSION(2, 11, 4)
     case ATK_ROLE_DESCRIPTION_LIST:
@@ -481,20 +439,6 @@ const gchar* roleToString(AtkObject* object)
     case ATK_ROLE_DESCRIPTION_VALUE:
         return "AXDescriptionValue";
 #endif
-#if ATK_CHECK_VERSION(2, 15, 2)
-    case ATK_ROLE_STATIC:
-        return "AXStatic";
-#endif
-#if ATK_CHECK_VERSION(2, 15, 4)
-    case ATK_ROLE_MATH_FRACTION:
-        return "AXMathFraction";
-    case ATK_ROLE_MATH_ROOT:
-        return "AXMathRoot";
-    case ATK_ROLE_SUBSCRIPT:
-        return "AXSubscript";
-    case ATK_ROLE_SUPERSCRIPT:
-        return "AXSuperscript";
-#endif
     default:
         // We want to distinguish ATK_ROLE_UNKNOWN from a known AtkRole which
         // our DRT isn't properly handling.
@@ -608,53 +552,6 @@ static Vector<RefPtr<AccessibilityUIElement> > getVisibleCells(AccessibilityUIEl
     return visibleCells;
 }
 
-#if ATK_CHECK_VERSION(2,11,90)
-static Vector<RefPtr<AccessibilityUIElement>> convertGPtrArrayToVector(const GPtrArray* array)
-{
-    Vector<RefPtr<AccessibilityUIElement>> cells;
-    for (guint i = 0; i < array->len; i++) {
-        if (AtkObject* atkObject = static_cast<AtkObject*>(g_ptr_array_index(array, i)))
-            cells.append(AccessibilityUIElement::create(atkObject));
-    }
-    return cells;
-}
-
-static JSValueRef convertToJSObjectArray(const Vector<RefPtr<AccessibilityUIElement>>& children)
-{
-    WKBundleFrameRef mainFrame = WKBundlePageGetMainFrame(InjectedBundle::singleton().page()->page());
-    JSContextRef context = WKBundleFrameGetJavaScriptContext(mainFrame);
-
-    size_t elementCount = children.size();
-    auto valueElements = std::make_unique<JSValueRef[]>(elementCount);
-    for (size_t i = 0; i < elementCount; i++)
-        valueElements[i] = JSObjectMake(context, children[i]->wrapperClass(), children[i].get());
-
-    return JSObjectMakeArray(context, elementCount, valueElements.get(), nullptr);
-}
-#endif
-
-#if ATK_CHECK_VERSION(2,11,92)
-static double rangeMinMaxValue(AtkValue* atkValue, RangeLimit rangeLimit)
-{
-    AtkRange* range = atk_value_get_range(atkValue);
-    if (!range)
-        return 0;
-
-    double rangeValue = 0;
-    switch (rangeLimit) {
-    case RangeLimitMinimum:
-        rangeValue = atk_range_get_lower_limit(range);
-        break;
-    case RangeLimitMaximum:
-        rangeValue = atk_range_get_upper_limit(range);
-        break;
-    };
-
-    atk_range_free(range);
-    return rangeValue;
-}
-#endif
-
 } // namespace
 
 AccessibilityUIElement::AccessibilityUIElement(PlatformUIElement element)
@@ -747,16 +644,28 @@ PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::childAtIndex(unsigned
     return nullptr;
 }
 
-static PassRefPtr<AccessibilityUIElement> accessibilityElementAtIndex(AtkObject* element, AtkRelationType relationType, unsigned index)
+PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::linkedUIElementAtIndex(unsigned index)
+{
+    // FIXME: implement
+    return nullptr;
+}
+
+PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::ariaOwnsElementAtIndex(unsigned index)
+{
+    // FIXME: implement
+    return nullptr;
+}
+
+PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::ariaFlowToElementAtIndex(unsigned index)
 {
-    if (!ATK_IS_OBJECT(element))
+    if (!ATK_IS_OBJECT(m_element.get()))
         return nullptr;
 
-    AtkRelationSet* relationSet = atk_object_ref_relation_set(element);
+    AtkRelationSet* relationSet = atk_object_ref_relation_set(ATK_OBJECT(m_element.get()));
     if (!relationSet)
         return nullptr;
 
-    AtkRelation* relation = atk_relation_set_get_relation_by_type(relationSet, relationType);
+    AtkRelation* relation = atk_relation_set_get_relation_by_type(relationSet, ATK_RELATION_FLOWS_TO);
     if (!relation)
         return nullptr;
 
@@ -764,34 +673,12 @@ static PassRefPtr<AccessibilityUIElement> accessibilityElementAtIndex(AtkObject*
     if (!targetList || !targetList->len || index >= targetList->len)
         return nullptr;
 
-    AtkObject* target = static_cast<AtkObject*>(g_ptr_array_index(targetList, index));
     g_object_unref(relationSet);
 
+    AtkObject* target = static_cast<AtkObject*>(g_ptr_array_index(targetList, index));
     return target ? AccessibilityUIElement::create(target) : nullptr;
 }
 
-PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::linkedUIElementAtIndex(unsigned index)
-{
-    // FIXME: implement
-    return nullptr;
-}
-
-PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::ariaOwnsElementAtIndex(unsigned index)
-{
-    // FIXME: implement
-    return nullptr;
-}
-
-PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::ariaFlowToElementAtIndex(unsigned index)
-{
-    return accessibilityElementAtIndex(m_element.get(), ATK_RELATION_FLOWS_TO, index);
-}
-
-PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::ariaControlsElementAtIndex(unsigned index)
-{
-    return accessibilityElementAtIndex(m_element.get(), ATK_RELATION_CONTROLLER_FOR, index);
-}
-
 PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::disclosedRowAtIndex(unsigned index)
 {
     // FIXME: implement
@@ -800,35 +687,20 @@ PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::disclosedRowAtIndex(u
 
 PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::rowAtIndex(unsigned index)
 {
-    // ATK doesn't have API to get an accessible row by index directly. It does, however, have
-    // API to get cells in the row specified by index. The parent of a cell should be the row.
-    AtkTable* axTable = ATK_TABLE(m_element.get());
-    unsigned nColumns = columnCount();
-    for (unsigned col = 0; col < nColumns; col++) {
-        // Find the first cell in this row that only spans one row.
-        if (atk_table_get_row_extent_at(axTable, index, col) == 1) {
-            AtkObject* cell = atk_table_ref_at(axTable, index, col);
-            return cell ? AccessibilityUIElement::create(atk_object_get_parent(cell)) : nullptr;
-        }
-    }
-
+    // FIXME: implement
     return nullptr;
 }
 
 PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::selectedChildAtIndex(unsigned index) const
 {
-    if (!ATK_SELECTION(m_element.get()))
-        return nullptr;
-
-    GRefPtr<AtkObject> child = adoptGRef(atk_selection_ref_selection(ATK_SELECTION(m_element.get()), index));
-    return child ? AccessibilityUIElement::create(child.get()) : nullptr;
+    // FIXME: implement
+    return nullptr;
 }
 
 unsigned AccessibilityUIElement::selectedChildrenCount() const
 {
-    if (!ATK_IS_SELECTION(m_element.get()))
-        return 0;
-    return atk_selection_get_selection_count(ATK_SELECTION(m_element.get()));
+    // FIXME: implement
+    return 0;
 }
 
 PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::selectedRowAtIndex(unsigned index)
@@ -940,19 +812,7 @@ JSRetainPtr<JSStringRef> AccessibilityUIElement::stringAttributeValue(JSStringRe
 
 double AccessibilityUIElement::numberAttributeValue(JSStringRef attribute)
 {
-    if (!ATK_IS_OBJECT(m_element.get()))
-        return 0;
-
-    String atkAttributeName = coreAttributeToAtkAttribute(attribute);
-    if (atkAttributeName.isEmpty())
-        return 0;
-
-    if (atkAttributeName == "setsize" || atkAttributeName == "posinset") {
-        String attributeValue = getAttributeSetValueForId(ATK_OBJECT(m_element.get()), ObjectAttributeType, atkAttributeName);
-        if (!attributeValue.isEmpty())
-            return attributeValue.toDouble();
-    }
-
+    // FIXME: implement
     return 0;
 }
 
@@ -964,40 +824,14 @@ JSValueRef AccessibilityUIElement::uiElementArrayAttributeValue(JSStringRef attr
 
 JSValueRef AccessibilityUIElement::rowHeaders() const
 {
-#if ATK_CHECK_VERSION(2,11,90)
-    if (!ATK_IS_TABLE_CELL(m_element.get()))
-        return nullptr;
-
-    GRefPtr<GPtrArray> array = adoptGRef(atk_table_cell_get_row_header_cells(ATK_TABLE_CELL(m_element.get())));
-    if (!array)
-        return nullptr;
-
-    Vector<RefPtr<AccessibilityUIElement>> rows = convertGPtrArrayToVector(array.get());
-    return convertToJSObjectArray(rows);
-#else
+    // FIXME: implement
     return nullptr;
-#endif
 }
 
 JSValueRef AccessibilityUIElement::columnHeaders() const
 {
-#if ATK_CHECK_VERSION(2,11,90)
-    if (!ATK_IS_TABLE_CELL(m_element.get()) && !ATK_IS_TABLE(m_element.get()))
-        return nullptr;
-
-    Vector<RefPtr<AccessibilityUIElement>> columns;
-    if (ATK_IS_TABLE_CELL(m_element.get())) {
-        GRefPtr<GPtrArray> array = adoptGRef(atk_table_cell_get_column_header_cells(ATK_TABLE_CELL(m_element.get())));
-        if (!array)
-            return nullptr;
-
-        columns = convertGPtrArrayToVector(array.get());
-    } else
-        columns = getColumnHeaders(ATK_TABLE(m_element.get()));
-    return convertToJSObjectArray(columns);
-#else
+    // FIXME: implement
     return nullptr;
-#endif
 }
 
 PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::uiElementAttributeValue(JSStringRef attribute) const
@@ -1068,15 +902,6 @@ JSRetainPtr<JSStringRef> AccessibilityUIElement::roleDescription()
     return JSStringCreateWithCharacters(0, 0);
 }
 
-JSRetainPtr<JSStringRef> AccessibilityUIElement::computedRoleString()
-{
-    String role = getAttributeSetValueForId(ATK_OBJECT(m_element.get()), ObjectAttributeType, "computed-role");
-    if (!role.isEmpty())
-        return JSStringCreateWithUTF8CString(role.utf8().data());
-
-    return JSStringCreateWithCharacters(0, 0);
-}
-
 JSRetainPtr<JSStringRef> AccessibilityUIElement::title()
 {
     if (!ATK_IS_OBJECT(m_element.get()))
@@ -1183,12 +1008,8 @@ double AccessibilityUIElement::x()
     if (!ATK_IS_COMPONENT(m_element.get()))
         return 0;
 
-    int x;
-#if ATK_CHECK_VERSION(2,11,90)
-    atk_component_get_extents(ATK_COMPONENT(m_element.get()), &x, nullptr, nullptr, nullptr, ATK_XY_SCREEN);
-#else
-    atk_component_get_position(ATK_COMPONENT(m_element.get()), &x, nullptr, ATK_XY_SCREEN);
-#endif
+    int x, y;
+    atk_component_get_position(ATK_COMPONENT(m_element.get()), &x, &y, ATK_XY_SCREEN);
     return x;
 }
 
@@ -1197,12 +1018,8 @@ double AccessibilityUIElement::y()
     if (!ATK_IS_COMPONENT(m_element.get()))
         return 0;
 
-    int y;
-#if ATK_CHECK_VERSION(2,11,90)
-    atk_component_get_extents(ATK_COMPONENT(m_element.get()), nullptr, &y, nullptr, nullptr, ATK_XY_SCREEN);
-#else
-    atk_component_get_position(ATK_COMPONENT(m_element.get()), nullptr, &y, ATK_XY_SCREEN);
-#endif
+    int x, y;
+    atk_component_get_position(ATK_COMPONENT(m_element.get()), &x, &y, ATK_XY_SCREEN);
     return y;
 }
 
@@ -1211,12 +1028,8 @@ double AccessibilityUIElement::width()
     if (!ATK_IS_COMPONENT(m_element.get()))
         return 0;
 
-    int width;
-#if ATK_CHECK_VERSION(2,11,90)
-    atk_component_get_extents(ATK_COMPONENT(m_element.get()), nullptr, nullptr, &width, nullptr, ATK_XY_WINDOW);
-#else
-    atk_component_get_size(ATK_COMPONENT(m_element.get()), &width, nullptr);
-#endif
+    int width, height;
+    atk_component_get_size(ATK_COMPONENT(m_element.get()), &width, &height);
     return width;
 }
 
@@ -1225,12 +1038,8 @@ double AccessibilityUIElement::height()
     if (!ATK_IS_COMPONENT(m_element.get()))
         return 0;
 
-    int height;
-#if ATK_CHECK_VERSION(2,11,90)
-    atk_component_get_extents(ATK_COMPONENT(m_element.get()), nullptr, nullptr, nullptr, &height, ATK_XY_WINDOW);
-#else
-    atk_component_get_size(ATK_COMPONENT(m_element.get()), nullptr, &height);
-#endif
+    int width, height;
+    atk_component_get_size(ATK_COMPONENT(m_element.get()), &width, &height);
     return height;
 }
 
@@ -1239,13 +1048,11 @@ double AccessibilityUIElement::clickPointX()
     if (!ATK_IS_COMPONENT(m_element.get()))
         return 0;
 
-    int x, width;
-#if ATK_CHECK_VERSION(2,11,90)
-    atk_component_get_extents(ATK_COMPONENT(m_element.get()), &x, nullptr, &width, nullptr, ATK_XY_WINDOW);
-#else
-    atk_component_get_position(ATK_COMPONENT(m_element.get()), &x, nullptr, ATK_XY_WINDOW);
-    atk_component_get_size(ATK_COMPONENT(m_element.get()), &width, nullptr);
-#endif
+    int x, y;
+    atk_component_get_position(ATK_COMPONENT(m_element.get()), &x, &y, ATK_XY_WINDOW);
+
+    int width, height;
+    atk_component_get_size(ATK_COMPONENT(m_element.get()), &width, &height);
 
     return x + width / 2.0;
 }
@@ -1255,13 +1062,11 @@ double AccessibilityUIElement::clickPointY()
     if (!ATK_IS_COMPONENT(m_element.get()))
         return 0;
 
-    int y, height;
-#if ATK_CHECK_VERSION(2,11,90)
-    atk_component_get_extents(ATK_COMPONENT(m_element.get()), nullptr, &y, nullptr, &height, ATK_XY_WINDOW);
-#else
-    atk_component_get_position(ATK_COMPONENT(m_element.get()), nullptr, &y, ATK_XY_WINDOW);
-    atk_component_get_size(ATK_COMPONENT(m_element.get()), nullptr, &height);
-#endif
+    int x, y;
+    atk_component_get_position(ATK_COMPONENT(m_element.get()), &x, &y, ATK_XY_WINDOW);
+
+    int width, height;
+    atk_component_get_size(ATK_COMPONENT(m_element.get()), &width, &height);
 
     return y + height / 2.0;
 }
@@ -1272,17 +1077,11 @@ double AccessibilityUIElement::intValue() const
         return 0;
 
     if (ATK_IS_VALUE(m_element.get())) {
-#if ATK_CHECK_VERSION(2,11,92)
-        double value;
-        atk_value_get_value_and_text(ATK_VALUE(m_element.get()), &value, nullptr);
-        return value;
-#else
         GValue value = G_VALUE_INIT;
         atk_value_get_current_value(ATK_VALUE(m_element.get()), &value);
         if (!G_VALUE_HOLDS_FLOAT(&value))
             return 0;
         return g_value_get_float(&value);
-#endif
     }
 
     // Consider headings as an special case when returning the "int value" of
@@ -1303,16 +1102,13 @@ double AccessibilityUIElement::minValue()
 {
     if (!ATK_IS_VALUE(m_element.get()))
         return 0;
-#if ATK_CHECK_VERSION(2,11,92)
-    return rangeMinMaxValue(ATK_VALUE(m_element.get()), RangeLimitMinimum);
-#else
+
     GValue value = G_VALUE_INIT;
     atk_value_get_minimum_value(ATK_VALUE(m_element.get()), &value);
     if (!G_VALUE_HOLDS_FLOAT(&value))
         return 0;
 
     return g_value_get_float(&value);
-#endif
 }
 
 double AccessibilityUIElement::maxValue()
@@ -1320,16 +1116,12 @@ double AccessibilityUIElement::maxValue()
     if (!ATK_IS_VALUE(m_element.get()))
         return 0;
 
-#if ATK_CHECK_VERSION(2,11,92)
-    return rangeMinMaxValue(ATK_VALUE(m_element.get()), RangeLimitMaximum);
-#else
     GValue value = G_VALUE_INIT;
     atk_value_get_maximum_value(ATK_VALUE(m_element.get()), &value);
     if (!G_VALUE_HOLDS_FLOAT(&value))
         return 0;
 
     return g_value_get_float(&value);
-#endif
 }
 
 JSRetainPtr<JSStringRef> AccessibilityUIElement::valueDescription()
@@ -1487,19 +1279,13 @@ bool AccessibilityUIElement::attributedStringRangeIsMisspelled(unsigned location
     return false;
 }
 
-unsigned AccessibilityUIElement::uiElementCountForSearchPredicate(JSContextRef context, AccessibilityUIElement* startElement, bool isDirectionNext, JSValueRef searchKey, JSStringRef searchText, bool visibleOnly, bool immediateDescendantsOnly)
+unsigned AccessibilityUIElement::uiElementCountForSearchPredicate(JSContextRef context, AccessibilityUIElement* startElement, bool isDirectionNext, JSValueRef searchKey, JSStringRef searchText, bool visibleOnly)
 {
     // FIXME: implement
     return 0;
 }
 
-PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::uiElementForSearchPredicate(JSContextRef context, AccessibilityUIElement* startElement, bool isDirectionNext, JSValueRef searchKey, JSStringRef searchText, bool visibleOnly, bool immediateDescendantsOnly)
-{
-    // FIXME: implement
-    return nullptr;
-}
-
-JSRetainPtr<JSStringRef> AccessibilityUIElement::selectTextWithCriteria(JSContextRef context, JSStringRef ambiguityResolution, JSValueRef searchStrings, JSStringRef replacementString, JSStringRef activity)
+PassRefPtr<AccessibilityUIElement> AccessibilityUIElement::uiElementForSearchPredicate(JSContextRef context, AccessibilityUIElement* startElement, bool isDirectionNext, JSValueRef searchKey, JSStringRef searchText, bool visibleOnly)
 {
     // FIXME: implement
     return nullptr;
@@ -1659,22 +1445,6 @@ void AccessibilityUIElement::setSelectedChild(AccessibilityUIElement* element) c
     // FIXME: implement
 }
 
-void AccessibilityUIElement::setSelectedChildAtIndex(unsigned index) const
-{
-    if (!ATK_IS_SELECTION(m_element.get()))
-        return;
-
-    atk_selection_add_selection(ATK_SELECTION(m_element.get()), index);
-}
-
-void AccessibilityUIElement::removeSelectionAtIndex(unsigned index) const
-{
-    if (!ATK_IS_SELECTION(m_element.get()))
-        return;
-
-    atk_selection_remove_selection(ATK_SELECTION(m_element.get()), index);
-}
-
 JSRetainPtr<JSStringRef> AccessibilityUIElement::accessibilityValue() const
 {
     // FIXME: implement
@@ -1812,12 +1582,6 @@ void AccessibilityUIElement::removeSelection()
 }
 
 // Text markers
-PassRefPtr<AccessibilityTextMarkerRange> AccessibilityUIElement::lineTextMarkerRangeForTextMarker(AccessibilityTextMarker* textMarker)
-{
-    // FIXME: implement
-    return nullptr;
-}
-
 PassRefPtr<AccessibilityTextMarkerRange> AccessibilityUIElement::textMarkerRangeForElement(AccessibilityUIElement* element)
 {
     // FIXME: implement
@@ -1926,11 +1690,6 @@ PassRefPtr<AccessibilityTextMarker> AccessibilityUIElement::endTextMarker()
     return nullptr;
 }
 
-bool AccessibilityUIElement::setSelectedVisibleTextRange(AccessibilityTextMarkerRange*)
-{
-    return false;
-}
-
 void AccessibilityUIElement::scrollToMakeVisible()
 {
     // FIXME: implement