Changeset 105604 in webkit


Ignore:
Timestamp:
Jan 23, 2012 2:21:03 AM (12 years ago)
Author:
mario@webkit.org
Message:

[GTK] Refactor GTK's accessibilitity code to be more modular
https://bugs.webkit.org/show_bug.cgi?id=76783

Reviewed by Martin Robinson.

Source/WebCore:

Rename the file for the ATK AccessibilityObject wrapper to be more
coherent with the rest of the files in the same directory.

  • accessibility/gtk/WebKitAccessibleWrapperAtk.cpp: Renamed from

Source/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp.
(fallbackObject):
(returnString):
(core):
(webkit_accessible_get_name):
(webkit_accessible_get_description):
(setAtkRelationSetFromCoreObject):
(isRootObject):
(atkParentOfRootObject):
(webkit_accessible_get_parent):
(getNChildrenForTable):
(webkit_accessible_get_n_children):
(getChildForTable):
(webkit_accessible_ref_child):
(getIndexInParentForCellInRow):
(webkit_accessible_get_index_in_parent):
(addAttributeToSet):
(webkit_accessible_get_attributes):
(atkRole):
(webkit_accessible_get_role):
(selectionBelongsToObject):
(isTextWithCaret):
(setAtkStateSetFromCoreObject):
(webkit_accessible_ref_state_set):
(webkit_accessible_ref_relation_set):
(webkit_accessible_init):
(webkit_accessible_finalize):
(webkit_accessible_class_init):
(webkit_accessible_get_type):
(webkit_accessible_action_do_action):
(webkit_accessible_action_get_n_actions):
(webkit_accessible_action_get_description):
(webkit_accessible_action_get_keybinding):
(webkit_accessible_action_get_name):
(atk_action_interface_init):
(listObjectForSelection):
(optionFromList):
(optionFromSelection):
(webkit_accessible_selection_add_selection):
(webkit_accessible_selection_clear_selection):
(webkit_accessible_selection_ref_selection):
(webkit_accessible_selection_get_selection_count):
(webkit_accessible_selection_is_child_selected):
(webkit_accessible_selection_remove_selection):
(webkit_accessible_selection_select_all_selection):
(atk_selection_interface_init):
(utf8Substr):
(convertUniCharToUTF8):
(textForRenderer):
(textForObject):
(webkit_accessible_text_get_text):
(getGailTextUtilForAtk):
(getPangoLayoutForAtk):
(webkit_accessible_text_get_text_after_offset):
(webkit_accessible_text_get_text_at_offset):
(webkit_accessible_text_get_text_before_offset):
(webkit_accessible_text_get_character_at_offset):
(webkit_accessible_text_get_caret_offset):
(baselinePositionForRenderObject):
(getAttributeSetForAccessibilityObject):
(compareAttribute):
(attributeSetDifference):
(accessibilityObjectLength):
(getAccessibilityObjectForOffset):
(getRunAttributesFromAccesibilityObject):
(webkit_accessible_text_get_run_attributes):
(webkit_accessible_text_get_default_attributes):
(textExtents):
(webkit_accessible_text_get_character_extents):
(webkit_accessible_text_get_range_extents):
(webkit_accessible_text_get_character_count):
(webkit_accessible_text_get_offset_at_point):
(getSelectionOffsetsForObject):
(webkit_accessible_text_get_n_selections):
(webkit_accessible_text_get_selection):
(webkit_accessible_text_add_selection):
(webkit_accessible_text_set_selection):
(webkit_accessible_text_remove_selection):
(webkit_accessible_text_set_caret_offset):
(atk_text_interface_init):
(webkit_accessible_editable_text_set_run_attributes):
(webkit_accessible_editable_text_set_text_contents):
(webkit_accessible_editable_text_insert_text):
(webkit_accessible_editable_text_copy_text):
(webkit_accessible_editable_text_cut_text):
(webkit_accessible_editable_text_delete_text):
(webkit_accessible_editable_text_paste_text):
(atk_editable_text_interface_init):
(contentsToAtk):
(atkToContents):
(webkit_accessible_component_ref_accessible_at_point):
(webkit_accessible_component_get_extents):
(webkit_accessible_component_grab_focus):
(atk_component_interface_init):
(webkit_accessible_image_get_image_position):
(webkit_accessible_image_get_image_description):
(webkit_accessible_image_get_image_size):
(atk_image_interface_init):
(cell):
(cellIndex):
(cellAtIndex):
(webkit_accessible_table_ref_at):
(webkit_accessible_table_get_index_at):
(webkit_accessible_table_get_column_at_index):
(webkit_accessible_table_get_row_at_index):
(webkit_accessible_table_get_n_columns):
(webkit_accessible_table_get_n_rows):
(webkit_accessible_table_get_column_extent_at):
(webkit_accessible_table_get_row_extent_at):
(webkit_accessible_table_get_column_header):
(webkit_accessible_table_get_row_header):
(webkit_accessible_table_get_caption):
(webkit_accessible_table_get_column_description):
(webkit_accessible_table_get_row_description):
(atk_table_interface_init):
(webkitAccessibleHypertextGetLink):
(webkitAccessibleHypertextGetNLinks):
(webkitAccessibleHypertextGetLinkIndex):
(atkHypertextInterfaceInit):
(webkitAccessibleHyperlinkImplGetHyperlink):
(atkHyperlinkImplInterfaceInit):
(documentAttributeValue):
(webkit_accessible_document_get_attribute_value):
(webkit_accessible_document_get_attributes):
(webkit_accessible_document_get_locale):
(atk_document_interface_init):
(webkitAccessibleValueGetCurrentValue):
(webkitAccessibleValueGetMaximumValue):
(webkitAccessibleValueGetMinimumValue):
(webkitAccessibleValueSetCurrentValue):
(webkitAccessibleValueGetMinimumIncrement):
(atkValueInterfaceInit):
(GetAtkInterfaceTypeFromWAIType):
(getInterfaceMaskFromObject):
(getUniqueAccessibilityTypeName):
(getAccessibilityTypeFromObject):
(webkit_accessible_new):
(webkit_accessible_get_accessibility_object):
(webkit_accessible_detach):
(webkit_accessible_get_focused_element):
(objectFocusedAndCaretOffsetUnignored):

  • accessibility/gtk/WebKitAccessibleWrapperAtk.h: Renamed from

Source/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.h.

Update the include for the AccessibilityObject wrapper header.

  • accessibility/gtk/AXObjectCacheAtk.cpp: Update include.
  • accessibility/gtk/WebKitAccessibleHyperlink.cpp: Ditto.
  • accessibility/gtk/WebKitAccessibleHyperlink.h: Ditto.
  • editing/gtk/FrameSelectionGtk.cpp:

Update filename for the ATK wrapper in build files.

  • GNUmakefile.list.am: Updated.
  • WebCore.gypi: Updated.

Source/WebKit/gtk:

Update the include for the AccessibilityObject wrapper header.

  • WebCoreSupport/DumpRenderTreeSupportGtk.cpp: Update include.
  • webkit/webkitwebframe.cpp: Ditto.
Location:
trunk/Source
Files:
10 edited
2 moved

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r105600 r105604  
     12012-01-22  Mario Sanchez Prada  <msanchez@igalia.com>
     2
     3        [GTK] Refactor GTK's accessibilitity code to be more modular
     4        https://bugs.webkit.org/show_bug.cgi?id=76783
     5
     6        Reviewed by Martin Robinson.
     7
     8        Rename the file for the ATK AccessibilityObject wrapper to be more
     9        coherent with the rest of the files in the same directory.
     10
     11        * accessibility/gtk/WebKitAccessibleWrapperAtk.cpp: Renamed from
     12        Source/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp.
     13        (fallbackObject):
     14        (returnString):
     15        (core):
     16        (webkit_accessible_get_name):
     17        (webkit_accessible_get_description):
     18        (setAtkRelationSetFromCoreObject):
     19        (isRootObject):
     20        (atkParentOfRootObject):
     21        (webkit_accessible_get_parent):
     22        (getNChildrenForTable):
     23        (webkit_accessible_get_n_children):
     24        (getChildForTable):
     25        (webkit_accessible_ref_child):
     26        (getIndexInParentForCellInRow):
     27        (webkit_accessible_get_index_in_parent):
     28        (addAttributeToSet):
     29        (webkit_accessible_get_attributes):
     30        (atkRole):
     31        (webkit_accessible_get_role):
     32        (selectionBelongsToObject):
     33        (isTextWithCaret):
     34        (setAtkStateSetFromCoreObject):
     35        (webkit_accessible_ref_state_set):
     36        (webkit_accessible_ref_relation_set):
     37        (webkit_accessible_init):
     38        (webkit_accessible_finalize):
     39        (webkit_accessible_class_init):
     40        (webkit_accessible_get_type):
     41        (webkit_accessible_action_do_action):
     42        (webkit_accessible_action_get_n_actions):
     43        (webkit_accessible_action_get_description):
     44        (webkit_accessible_action_get_keybinding):
     45        (webkit_accessible_action_get_name):
     46        (atk_action_interface_init):
     47        (listObjectForSelection):
     48        (optionFromList):
     49        (optionFromSelection):
     50        (webkit_accessible_selection_add_selection):
     51        (webkit_accessible_selection_clear_selection):
     52        (webkit_accessible_selection_ref_selection):
     53        (webkit_accessible_selection_get_selection_count):
     54        (webkit_accessible_selection_is_child_selected):
     55        (webkit_accessible_selection_remove_selection):
     56        (webkit_accessible_selection_select_all_selection):
     57        (atk_selection_interface_init):
     58        (utf8Substr):
     59        (convertUniCharToUTF8):
     60        (textForRenderer):
     61        (textForObject):
     62        (webkit_accessible_text_get_text):
     63        (getGailTextUtilForAtk):
     64        (getPangoLayoutForAtk):
     65        (webkit_accessible_text_get_text_after_offset):
     66        (webkit_accessible_text_get_text_at_offset):
     67        (webkit_accessible_text_get_text_before_offset):
     68        (webkit_accessible_text_get_character_at_offset):
     69        (webkit_accessible_text_get_caret_offset):
     70        (baselinePositionForRenderObject):
     71        (getAttributeSetForAccessibilityObject):
     72        (compareAttribute):
     73        (attributeSetDifference):
     74        (accessibilityObjectLength):
     75        (getAccessibilityObjectForOffset):
     76        (getRunAttributesFromAccesibilityObject):
     77        (webkit_accessible_text_get_run_attributes):
     78        (webkit_accessible_text_get_default_attributes):
     79        (textExtents):
     80        (webkit_accessible_text_get_character_extents):
     81        (webkit_accessible_text_get_range_extents):
     82        (webkit_accessible_text_get_character_count):
     83        (webkit_accessible_text_get_offset_at_point):
     84        (getSelectionOffsetsForObject):
     85        (webkit_accessible_text_get_n_selections):
     86        (webkit_accessible_text_get_selection):
     87        (webkit_accessible_text_add_selection):
     88        (webkit_accessible_text_set_selection):
     89        (webkit_accessible_text_remove_selection):
     90        (webkit_accessible_text_set_caret_offset):
     91        (atk_text_interface_init):
     92        (webkit_accessible_editable_text_set_run_attributes):
     93        (webkit_accessible_editable_text_set_text_contents):
     94        (webkit_accessible_editable_text_insert_text):
     95        (webkit_accessible_editable_text_copy_text):
     96        (webkit_accessible_editable_text_cut_text):
     97        (webkit_accessible_editable_text_delete_text):
     98        (webkit_accessible_editable_text_paste_text):
     99        (atk_editable_text_interface_init):
     100        (contentsToAtk):
     101        (atkToContents):
     102        (webkit_accessible_component_ref_accessible_at_point):
     103        (webkit_accessible_component_get_extents):
     104        (webkit_accessible_component_grab_focus):
     105        (atk_component_interface_init):
     106        (webkit_accessible_image_get_image_position):
     107        (webkit_accessible_image_get_image_description):
     108        (webkit_accessible_image_get_image_size):
     109        (atk_image_interface_init):
     110        (cell):
     111        (cellIndex):
     112        (cellAtIndex):
     113        (webkit_accessible_table_ref_at):
     114        (webkit_accessible_table_get_index_at):
     115        (webkit_accessible_table_get_column_at_index):
     116        (webkit_accessible_table_get_row_at_index):
     117        (webkit_accessible_table_get_n_columns):
     118        (webkit_accessible_table_get_n_rows):
     119        (webkit_accessible_table_get_column_extent_at):
     120        (webkit_accessible_table_get_row_extent_at):
     121        (webkit_accessible_table_get_column_header):
     122        (webkit_accessible_table_get_row_header):
     123        (webkit_accessible_table_get_caption):
     124        (webkit_accessible_table_get_column_description):
     125        (webkit_accessible_table_get_row_description):
     126        (atk_table_interface_init):
     127        (webkitAccessibleHypertextGetLink):
     128        (webkitAccessibleHypertextGetNLinks):
     129        (webkitAccessibleHypertextGetLinkIndex):
     130        (atkHypertextInterfaceInit):
     131        (webkitAccessibleHyperlinkImplGetHyperlink):
     132        (atkHyperlinkImplInterfaceInit):
     133        (documentAttributeValue):
     134        (webkit_accessible_document_get_attribute_value):
     135        (webkit_accessible_document_get_attributes):
     136        (webkit_accessible_document_get_locale):
     137        (atk_document_interface_init):
     138        (webkitAccessibleValueGetCurrentValue):
     139        (webkitAccessibleValueGetMaximumValue):
     140        (webkitAccessibleValueGetMinimumValue):
     141        (webkitAccessibleValueSetCurrentValue):
     142        (webkitAccessibleValueGetMinimumIncrement):
     143        (atkValueInterfaceInit):
     144        (GetAtkInterfaceTypeFromWAIType):
     145        (getInterfaceMaskFromObject):
     146        (getUniqueAccessibilityTypeName):
     147        (getAccessibilityTypeFromObject):
     148        (webkit_accessible_new):
     149        (webkit_accessible_get_accessibility_object):
     150        (webkit_accessible_detach):
     151        (webkit_accessible_get_focused_element):
     152        (objectFocusedAndCaretOffsetUnignored):
     153        * accessibility/gtk/WebKitAccessibleWrapperAtk.h: Renamed from
     154        Source/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.h.
     155
     156        Update the include for the AccessibilityObject wrapper header.
     157
     158        * accessibility/gtk/AXObjectCacheAtk.cpp: Update include.
     159        * accessibility/gtk/WebKitAccessibleHyperlink.cpp: Ditto.
     160        * accessibility/gtk/WebKitAccessibleHyperlink.h: Ditto.
     161        * editing/gtk/FrameSelectionGtk.cpp:
     162
     163        Update filename for the ATK wrapper in build files.
     164
     165        * GNUmakefile.list.am: Updated.
     166        * WebCore.gypi: Updated.
     167
    11682012-01-20  Pavel Feldman  <pfeldman@google.com>
    2169
  • trunk/Source/WebCore/GNUmakefile.list.am

    r105514 r105604  
    44224422webcoregtk_sources += \
    44234423        Source/WebCore/accessibility/gtk/AccessibilityObjectAtk.cpp \
    4424         Source/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp \
    4425         Source/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.h \
    44264424        Source/WebCore/accessibility/gtk/AXObjectCacheAtk.cpp \
    44274425        Source/WebCore/accessibility/gtk/WebKitAccessibleHyperlink.h \
    44284426        Source/WebCore/accessibility/gtk/WebKitAccessibleHyperlink.cpp \
     4427        Source/WebCore/accessibility/gtk/WebKitAccessibleWrapperAtk.cpp \
     4428        Source/WebCore/accessibility/gtk/WebKitAccessibleWrapperAtk.h \
    44294429        Source/WebCore/bindings/js/ScriptControllerGtk.cpp \
    44304430        Source/WebCore/editing/gtk/FrameSelectionGtk.cpp \
  • trunk/Source/WebCore/WebCore.gypi

    r105569 r105604  
    17671767            'accessibility/gtk/AXObjectCacheAtk.cpp',
    17681768            'accessibility/gtk/AccessibilityObjectAtk.cpp',
    1769             'accessibility/gtk/AccessibilityObjectWrapperAtk.cpp',
    1770             'accessibility/gtk/AccessibilityObjectWrapperAtk.h',
    17711769            'accessibility/gtk/WebKitAccessibleHyperlink.cpp',
    17721770            'accessibility/gtk/WebKitAccessibleHyperlink.h',
     1771            'accessibility/gtk/WebKitAccessibleWrapperAtk.cpp',
     1772            'accessibility/gtk/WebKitAccessibleWrapperAtk.h',
    17731773            'accessibility/mac/AXObjectCacheMac.mm',
    17741774            'accessibility/mac/AccessibilityObjectMac.mm',
  • trunk/Source/WebCore/accessibility/gtk/AXObjectCacheAtk.cpp

    r102062 r105604  
    2222
    2323#include "AccessibilityObject.h"
    24 #include "AccessibilityObjectWrapperAtk.h"
    2524#include "Document.h"
    2625#include "Element.h"
     
    2928#include "Range.h"
    3029#include "TextIterator.h"
     30#include "WebKitAccessibleWrapperAtk.h"
    3131
    3232namespace WebCore {
  • trunk/Source/WebCore/accessibility/gtk/WebKitAccessibleHyperlink.cpp

    r95901 r105604  
    2525#include "AXObjectCache.h"
    2626#include "AccessibilityObject.h"
    27 #include "AccessibilityObjectWrapperAtk.h"
    2827#include "NotImplemented.h"
    2928#include "Position.h"
     
    3231#include "RenderObject.h"
    3332#include "TextIterator.h"
     33#include "WebKitAccessibleWrapperAtk.h"
    3434#include "htmlediting.h"
    3535
  • trunk/Source/WebCore/accessibility/gtk/WebKitAccessibleHyperlink.h

    r95901 r105604  
    2020#ifndef WebKitAccessibleHyperlink_h
    2121#define WebKitAccessibleHyperlink_h
    22 
    23 #include "AccessibilityObjectWrapperAtk.h"
    2422
    2523#include <atk/atk.h>
  • trunk/Source/WebCore/accessibility/gtk/WebKitAccessibleWrapperAtk.cpp

    r105603 r105604  
    11/*
    22 * Copyright (C) 2008 Nuanti Ltd.
    3  * Copyright (C) 2009 Igalia S.L.
    43 * Copyright (C) 2009 Jan Alonzo
     4 * Copyright (C) 2009, 2010, 2011, 2012 Igalia S.L.
    55 *
    66 * Portions from Mozilla a11y, copyright as follows:
     
    3030
    3131#include "config.h"
    32 #include "AccessibilityObjectWrapperAtk.h"
     32#include "WebKitAccessibleWrapperAtk.h"
    3333
    3434#if HAVE(ACCESSIBILITY)
     
    4949#include "FrameView.h"
    5050#include "GOwnPtr.h"
    51 #include "HostWindow.h"
    5251#include "HTMLNames.h"
    5352#include "HTMLSelectElement.h"
    5453#include "HTMLTableCaptionElement.h"
    5554#include "HTMLTableElement.h"
     55#include "HostWindow.h"
    5656#include "InlineTextBox.h"
    5757#include "IntRect.h"
     
    167167}
    168168
    169 static gchar* webkit_accessible_text_get_text(AtkText* text, gint startOffset, gint endOffset);
     169static gchar* webkit_accessible_text_get_text(AtkText*, gint startOffset, gint endOffset);
    170170
    171171static const gchar* webkit_accessible_get_name(AtkObject* object)
     
    547547        return ATK_ROLE_MENU_ITEM;
    548548    case ColumnRole:
    549         //return ATK_ROLE_TABLE_COLUMN_HEADER; // Is this right?
     549        // return ATK_ROLE_TABLE_COLUMN_HEADER; // Is this right?
    550550        return ATK_ROLE_UNKNOWN; // Matches Mozilla
    551551    case RowRole:
    552         //return ATK_ROLE_TABLE_ROW_HEADER; // Is this right?
     552        // return ATK_ROLE_TABLE_ROW_HEADER; // Is this right?
    553553        return ATK_ROLE_LIST_ITEM; // Matches Mozilla
    554554    case ToolbarRole:
     
    557557        return ATK_ROLE_PROGRESS_BAR; // Is this right?
    558558    case ProgressIndicatorRole:
    559         //return ATK_ROLE_SPIN_BUTTON; // Some confusion about this role in AccessibilityRenderObject.cpp
     559        // return ATK_ROLE_SPIN_BUTTON; // Some confusion about this role in AccessibilityRenderObject.cpp
    560560        return ATK_ROLE_PROGRESS_BAR;
    561561    case WindowRole:
     
    598598        return ATK_ROLE_TEXT;
    599599    case WebAreaRole:
    600         //return ATK_ROLE_HTML_CONTAINER; // Is this right?
     600        // return ATK_ROLE_HTML_CONTAINER; // Is this right?
    601601        return ATK_ROLE_DOCUMENT_FRAME;
    602602    case HeadingRole:
     
    702702    // isReadOnly is false for listBoxOptions, we need to add one
    703703    // more check so that we do not present them as being "editable".
    704     if ((!coreObject->isReadOnly() ||
    705         (coreObject->isControl() && coreObject->canSetValueAttribute())) &&
    706         !isListBoxOption)
     704    if ((!coreObject->isReadOnly()
     705         || (coreObject->isControl() && coreObject->canSetValueAttribute()))
     706        && !isListBoxOption)
    707707        atk_state_set_add_state(stateSet, ATK_STATE_EDITABLE);
    708708
     
    878878static gboolean webkit_accessible_action_do_action(AtkAction* action, gint i)
    879879{
    880     g_return_val_if_fail(i == 0, FALSE);
     880    g_return_val_if_fail(!i, FALSE);
    881881    return core(action)->performDefaultAction();
    882882}
     
    889889static const gchar* webkit_accessible_action_get_description(AtkAction* action, gint i)
    890890{
    891     g_return_val_if_fail(i == 0, 0);
     891    g_return_val_if_fail(!i, 0);
    892892    // TODO: Need a way to provide/localize action descriptions.
    893893    notImplemented();
     
    897897static const gchar* webkit_accessible_action_get_keybinding(AtkAction* action, gint i)
    898898{
    899     g_return_val_if_fail(i == 0, 0);
     899    g_return_val_if_fail(!i, 0);
    900900    // FIXME: Construct a proper keybinding string.
    901901    return returnString(core(action)->accessKey().string());
     
    904904static const gchar* webkit_accessible_action_get_name(AtkAction* action, gint i)
    905905{
    906     g_return_val_if_fail(i == 0, 0);
     906    g_return_val_if_fail(!i, 0);
    907907    return returnString(core(action)->actionVerb());
    908908}
     
    10221022        listBox->setSelectedChildren(selectedItems);
    10231023        listBox->selectedChildren(selectedItems);
    1024         return selectedItems.size() == 0;
     1024        return !selectedItems.size();
    10251025    }
    10261026    return false;
     
    15111511
    15121512// Returns an AtkAttributeSet with the elements of a1 which are either
    1513 // not present or different in a2.  Neither a1 nor a2 should be used
     1513// not present or different in a2. Neither a1 nor a2 should be used
    15141514// after calling this function.
    15151515static AtkAttributeSet* attributeSetDifference(AtkAttributeSet* a1, AtkAttributeSet* a2)
     
    16651665
    16661666    IntRect extents = coreObject->doAXBoundsForRange(PlainTextRange(startOffset, rangeLength));
    1667     switch(coords) {
     1667    switch (coords) {
    16681668    case ATK_XY_SCREEN:
    16691669        if (Document* document = coreObject->document())
     
    19371937    AccessibilityObject* coreObject = core(text);
    19381938    // FIXME: Not implemented in WebCore
    1939     //coreObject->setSelectedTextRange(PlainTextRange(*position, 0));
    1940     //coreObject->setSelectedText(String::fromUTF8(string));
     1939    // coreObject->setSelectedTextRange(PlainTextRange(*position, 0));
     1940    // coreObject->setSelectedText(String::fromUTF8(string));
    19411941
    19421942    Document* document = coreObject->document();
     
    19651965    AccessibilityObject* coreObject = core(text);
    19661966    // FIXME: Not implemented in WebCore
    1967     //coreObject->setSelectedTextRange(PlainTextRange(start_pos, end_pos - start_pos));
    1968     //coreObject->setSelectedText(String());
     1967    // coreObject->setSelectedTextRange(PlainTextRange(start_pos, end_pos - start_pos));
     1968    // coreObject->setSelectedText(String());
    19691969
    19701970    Document* document = coreObject->document();
     
    21502150{
    21512151    AccessibilityTableCell* axCell = cellAtIndex(table, index);
    2152     if (axCell){
     2152    if (axCell) {
    21532153        pair<int, int> columnRange;
    21542154        axCell->columnIndexRange(columnRange);
     
    21612161{
    21622162    AccessibilityTableCell* axCell = cellAtIndex(table, index);
    2163     if (axCell){
     2163    if (axCell) {
    21642164        pair<int, int> rowRange;
    21652165        axCell->rowIndexRange(rowRange);
     
    24052405{
    24062406    AtkAttributeSet* attributeSet = 0;
    2407     const gchar* attributes [] = {"DocType", "Encoding", "URI"};
     2407    const gchar* attributes[] = { "DocType", "Encoding", "URI" };
    24082408
    24092409    for (unsigned i = 0; i < G_N_ELEMENTS(attributes); i++) {
  • trunk/Source/WebCore/accessibility/gtk/WebKitAccessibleWrapperAtk.h

    r105603 r105604  
    22 * Copyright (C) 2008 Nuanti Ltd.
    33 * Copyright (C) 2009 Jan Alonzo
     4 * Copyright (C) 2009, 2010, 2011, 2012 Igalia S.L.
    45 *
    56 * This library is free software; you can redistribute it and/or
     
    1920 */
    2021
    21 #ifndef AccessibilityObjectWrapperAtk_h
    22 #define AccessibilityObjectWrapperAtk_h
     22#ifndef WebKitAccessibleWrapperAtk_h
     23#define WebKitAccessibleWrapperAtk_h
    2324
    2425#include <atk/atk.h>
    2526
    2627namespace WebCore {
    27     class AccessibilityObject;
     28class AccessibilityObject;
    2829}
    2930
     
    4041typedef struct _WebKitAccessibleClass           WebKitAccessibleClass;
    4142
    42 struct _WebKitAccessible
    43 {
     43struct _WebKitAccessible {
    4444    AtkObject parent;
    4545    WebCore::AccessibilityObject* m_object;
    4646};
    4747
    48 struct _WebKitAccessibleClass
    49 {
     48struct _WebKitAccessibleClass {
    5049    AtkObjectClass parent_class;
    5150};
    5251
    53 GType webkit_accessible_get_type (void) G_GNUC_CONST;
     52GType webkit_accessible_get_type(void) G_GNUC_CONST;
    5453
    55 WebKitAccessible* webkit_accessible_new (WebCore::AccessibilityObject* core_object);
     54WebKitAccessible* webkit_accessible_new(WebCore::AccessibilityObject*);
    5655
    57 WebCore::AccessibilityObject* webkit_accessible_get_accessibility_object (WebKitAccessible* accessible);
     56WebCore::AccessibilityObject* webkit_accessible_get_accessibility_object(WebKitAccessible*);
    5857
    59 void webkit_accessible_detach (WebKitAccessible* accessible);
     58void webkit_accessible_detach(WebKitAccessible*);
    6059
    61 AtkObject* webkit_accessible_get_focused_element(WebKitAccessible* accessible);
     60AtkObject* webkit_accessible_get_focused_element(WebKitAccessible*);
    6261
    6362WebCore::AccessibilityObject* objectFocusedAndCaretOffsetUnignored(WebCore::AccessibilityObject*, int& offset);
     
    6564G_END_DECLS
    6665
    67 #endif // AccessibilityObjectWrapperAtk_h
     66#endif // WebKitAccessibleWrapperAtk_h
  • trunk/Source/WebCore/editing/gtk/FrameSelectionGtk.cpp

    r105590 r105604  
    2121#include "FrameSelection.h"
    2222
    23 #include "AccessibilityObjectWrapperAtk.h"
    2423#include "AXObjectCache.h"
    2524#include "Frame.h"
    2625#include "RefPtr.h"
     26#include "WebKitAccessibleWrapperAtk.h"
    2727
    2828#include <gtk/gtk.h>
  • trunk/Source/WebKit/gtk/ChangeLog

    r105590 r105604  
     12012-01-22  Mario Sanchez Prada  <msanchez@igalia.com>
     2
     3        [GTK] Refactor GTK's accessibilitity code to be more modular
     4        https://bugs.webkit.org/show_bug.cgi?id=76783
     5
     6        Reviewed by Martin Robinson.
     7
     8        Update the include for the AccessibilityObject wrapper header.
     9
     10        * WebCoreSupport/DumpRenderTreeSupportGtk.cpp: Update include.
     11        * webkit/webkitwebframe.cpp: Ditto.
     12
    1132012-01-22  Mario Sanchez Prada  <msanchez@igalia.com>
    214
  • trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp

    r104591 r105604  
    2626#include "AXObjectCache.h"
    2727#include "AccessibilityObject.h"
    28 #include "AccessibilityObjectWrapperAtk.h"
    2928#include "AnimationController.h"
    3029#include "DOMWrapperWorld.h"
     
    6160#include "Settings.h"
    6261#include "TextIterator.h"
     62#include "WebKitAccessibleWrapperAtk.h"
    6363#include "WebKitDOMRangePrivate.h"
    6464#include "WorkerThread.h"
  • trunk/Source/WebKit/gtk/webkit/webkitwebframe.cpp

    r102627 r105604  
    2929
    3030#include "AXObjectCache.h"
    31 #include "AccessibilityObjectWrapperAtk.h"
    3231#include "AnimationController.h"
    3332#include "DOMObjectCache.h"
     
    5655#include "SubstituteData.h"
    5756#include "TextIterator.h"
     57#include "WebKitAccessibleWrapperAtk.h"
    5858#include "markup.h"
    5959#include "webkit/WebKitDOMRangePrivate.h"
Note: See TracChangeset for help on using the changeset viewer.