Changeset 134939 in webkit


Ignore:
Timestamp:
Nov 16, 2012 5:47:03 AM (11 years ago)
Author:
mario@webkit.org
Message:

[EFL] Share WebKit-Gtk's Accessibility implementation with others WebKit ports.
​https://bugs.webkit.org/show_bug.cgi?id=99578

Reviewed by Martin Robinson.

Renamed WebCore/accessibility/gtk to WebCore/accessibility/atk.

  • GNUmakefile.am:
  • GNUmakefile.list.am:
  • accessibility/atk/AXObjectCacheAtk.cpp: Renamed from

Source/WebCore/accessibility/gtk/AXObjectCacheAtk.cpp.

  • accessibility/atk/AccessibilityObjectAtk.cpp: Renamed from

Source/WebCore/accessibility/gtk/AccessibilityObjectAtk.cpp.

  • accessibility/atk/WebKitAccessibleHyperlink.cpp: Renamed from

Source/WebCore/accessibility/gtk/WebKitAccessibleHyperlink.cpp.

  • accessibility/atk/WebKitAccessibleHyperlink.h: Renamed from

Source/WebCore/accessibility/gtk/WebKitAccessibleHyperlink.h.

  • accessibility/atk/WebKitAccessibleInterfaceAction.cpp: Renamed

from Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceAction.cpp.

  • accessibility/atk/WebKitAccessibleInterfaceAction.h: Renamed

from Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceAction.h.

  • accessibility/atk/WebKitAccessibleInterfaceComponent.cpp:

Renamed from Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceComponent.cpp.

  • accessibility/atk/WebKitAccessibleInterfaceComponent.h: Renamed

from Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceComponent.h.

  • accessibility/atk/WebKitAccessibleInterfaceDocument.cpp: Renamed

from Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceDocument.cpp.

  • accessibility/atk/WebKitAccessibleInterfaceDocument.h: Renamed

from Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceDocument.h.

  • accessibility/atk/WebKitAccessibleInterfaceEditableText.cpp:

Renamed from Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceEditableText.cpp.

  • accessibility/atk/WebKitAccessibleInterfaceEditableText.h:

Renamed from Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceEditableText.h.

  • accessibility/atk/WebKitAccessibleInterfaceHyperlinkImpl.cpp:

Renamed from Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceHyperlinkImpl.cpp.

  • accessibility/atk/WebKitAccessibleInterfaceHyperlinkImpl.h:

Renamed from Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceHyperlinkImpl.h.

  • accessibility/atk/WebKitAccessibleInterfaceHypertext.cpp:

Renamed from Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceHypertext.cpp.

  • accessibility/atk/WebKitAccessibleInterfaceHypertext.h: Renamed

from Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceHypertext.h.

  • accessibility/atk/WebKitAccessibleInterfaceImage.cpp: Renamed

from Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceImage.cpp.

  • accessibility/atk/WebKitAccessibleInterfaceImage.h: Renamed from

Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceImage.h.

  • accessibility/atk/WebKitAccessibleInterfaceSelection.cpp:

Renamed from Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceSelection.cpp.

  • accessibility/atk/WebKitAccessibleInterfaceSelection.h: Renamed

from Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceSelection.h.

  • accessibility/atk/WebKitAccessibleInterfaceTable.cpp: Renamed

from Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceTable.cpp.

  • accessibility/atk/WebKitAccessibleInterfaceTable.h: Renamed from

Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceTable.h.

  • accessibility/atk/WebKitAccessibleInterfaceText.cpp: Renamed

from Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceText.cpp.

  • accessibility/atk/WebKitAccessibleInterfaceText.h: Renamed from

Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceText.h.

  • accessibility/atk/WebKitAccessibleInterfaceValue.cpp: Renamed

from Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceValue.cpp.

  • accessibility/atk/WebKitAccessibleInterfaceValue.h: Renamed from

Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceValue.h.

  • accessibility/atk/WebKitAccessibleUtil.cpp: Renamed from

Source/WebCore/accessibility/gtk/WebKitAccessibleUtil.cpp.

  • accessibility/atk/WebKitAccessibleUtil.h: Renamed from

Source/WebCore/accessibility/gtk/WebKitAccessibleUtil.h.

  • accessibility/atk/WebKitAccessibleWrapperAtk.cpp: Renamed from

Source/WebCore/accessibility/gtk/WebKitAccessibleWrapperAtk.cpp.

  • accessibility/atk/WebKitAccessibleWrapperAtk.h: Renamed from

Source/WebCore/accessibility/gtk/WebKitAccessibleWrapperAtk.h.

Location:
trunk/Source/WebCore
Files:
1 added
3 edited
30 moved

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r134938 r134939  
     12012-11-16  Mario Sanchez Prada  <mario@webkit.org>
     2
     3        [EFL] Share WebKit-Gtk's Accessibility implementation with others WebKit ports.
     4        https://bugs.webkit.org/show_bug.cgi?id=99578
     5
     6        Reviewed by Martin Robinson.
     7
     8        Renamed WebCore/accessibility/gtk to WebCore/accessibility/atk.
     9
     10        * GNUmakefile.am:
     11        * GNUmakefile.list.am:
     12        * accessibility/atk/AXObjectCacheAtk.cpp: Renamed from
     13        Source/WebCore/accessibility/gtk/AXObjectCacheAtk.cpp.
     14        * accessibility/atk/AccessibilityObjectAtk.cpp: Renamed from
     15        Source/WebCore/accessibility/gtk/AccessibilityObjectAtk.cpp.
     16        * accessibility/atk/WebKitAccessibleHyperlink.cpp: Renamed from
     17        Source/WebCore/accessibility/gtk/WebKitAccessibleHyperlink.cpp.
     18        * accessibility/atk/WebKitAccessibleHyperlink.h: Renamed from
     19        Source/WebCore/accessibility/gtk/WebKitAccessibleHyperlink.h.
     20        * accessibility/atk/WebKitAccessibleInterfaceAction.cpp: Renamed
     21        from Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceAction.cpp.
     22        * accessibility/atk/WebKitAccessibleInterfaceAction.h: Renamed
     23        from Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceAction.h.
     24        * accessibility/atk/WebKitAccessibleInterfaceComponent.cpp:
     25        Renamed from Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceComponent.cpp.
     26        * accessibility/atk/WebKitAccessibleInterfaceComponent.h: Renamed
     27        from Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceComponent.h.
     28        * accessibility/atk/WebKitAccessibleInterfaceDocument.cpp: Renamed
     29        from Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceDocument.cpp.
     30        * accessibility/atk/WebKitAccessibleInterfaceDocument.h: Renamed
     31        from Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceDocument.h.
     32        * accessibility/atk/WebKitAccessibleInterfaceEditableText.cpp:
     33        Renamed from Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceEditableText.cpp.
     34        * accessibility/atk/WebKitAccessibleInterfaceEditableText.h:
     35        Renamed from Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceEditableText.h.
     36        * accessibility/atk/WebKitAccessibleInterfaceHyperlinkImpl.cpp:
     37        Renamed from Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceHyperlinkImpl.cpp.
     38        * accessibility/atk/WebKitAccessibleInterfaceHyperlinkImpl.h:
     39        Renamed from Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceHyperlinkImpl.h.
     40        * accessibility/atk/WebKitAccessibleInterfaceHypertext.cpp:
     41        Renamed from Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceHypertext.cpp.
     42        * accessibility/atk/WebKitAccessibleInterfaceHypertext.h: Renamed
     43        from Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceHypertext.h.
     44        * accessibility/atk/WebKitAccessibleInterfaceImage.cpp: Renamed
     45        from Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceImage.cpp.
     46        * accessibility/atk/WebKitAccessibleInterfaceImage.h: Renamed from
     47        Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceImage.h.
     48        * accessibility/atk/WebKitAccessibleInterfaceSelection.cpp:
     49        Renamed from Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceSelection.cpp.
     50        * accessibility/atk/WebKitAccessibleInterfaceSelection.h: Renamed
     51        from Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceSelection.h.
     52        * accessibility/atk/WebKitAccessibleInterfaceTable.cpp: Renamed
     53        from Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceTable.cpp.
     54        * accessibility/atk/WebKitAccessibleInterfaceTable.h: Renamed from
     55        Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceTable.h.
     56        * accessibility/atk/WebKitAccessibleInterfaceText.cpp: Renamed
     57        from Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceText.cpp.
     58        * accessibility/atk/WebKitAccessibleInterfaceText.h: Renamed from
     59        Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceText.h.
     60        * accessibility/atk/WebKitAccessibleInterfaceValue.cpp: Renamed
     61        from Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceValue.cpp.
     62        * accessibility/atk/WebKitAccessibleInterfaceValue.h: Renamed from
     63        Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceValue.h.
     64        * accessibility/atk/WebKitAccessibleUtil.cpp: Renamed from
     65        Source/WebCore/accessibility/gtk/WebKitAccessibleUtil.cpp.
     66        * accessibility/atk/WebKitAccessibleUtil.h: Renamed from
     67        Source/WebCore/accessibility/gtk/WebKitAccessibleUtil.h.
     68        * accessibility/atk/WebKitAccessibleWrapperAtk.cpp: Renamed from
     69        Source/WebCore/accessibility/gtk/WebKitAccessibleWrapperAtk.cpp.
     70        * accessibility/atk/WebKitAccessibleWrapperAtk.h: Renamed from
     71        Source/WebCore/accessibility/gtk/WebKitAccessibleWrapperAtk.h.
     72
    1732012-11-16  Shinya Kawanaka  <shinyak@chromium.org>
    274

  • trunk/Source/WebCore/GNUmakefile.am

    r134864 r134939  
    107107        -DWEBKITGTK_API_VERSION_STRING=\"@WEBKITGTK_API_VERSION@\" \
    108108        -DWTF_USE_SOUP=1 \
    109         -I$(srcdir)/Source/WebCore/accessibility/gtk \
     109        -I$(srcdir)/Source/WebCore/accessibility/atk \
    110110        -I$(srcdir)/Source/WebCore/loader/gtk \
    111111        -I$(srcdir)/Source/WebCore/page/gtk \

  • trunk/Source/WebCore/GNUmakefile.list.am

    r134930 r134939  
    58925892# WebCore files that use GTK/GDK or any other dependency that requires GTK+.
    58935893webcoregtk_sources += \
    5894         Source/WebCore/accessibility/gtk/AccessibilityObjectAtk.cpp \
    5895         Source/WebCore/accessibility/gtk/AXObjectCacheAtk.cpp \
    5896         Source/WebCore/accessibility/gtk/WebKitAccessibleHyperlink.h \
    5897         Source/WebCore/accessibility/gtk/WebKitAccessibleHyperlink.cpp \
    5898         Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceAction.cpp \
    5899         Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceAction.h \
    5900         Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceComponent.cpp \
    5901         Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceComponent.h \
    5902         Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceDocument.cpp \
    5903         Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceDocument.h \
    5904         Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceEditableText.cpp \
    5905         Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceEditableText.h \
    5906         Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceHyperlinkImpl.cpp \
    5907         Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceHyperlinkImpl.h \
    5908         Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceHypertext.cpp \
    5909         Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceHypertext.h \
    5910         Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceImage.cpp \
    5911         Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceImage.h \
    5912         Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceSelection.cpp \
    5913         Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceSelection.h \
    5914         Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceTable.cpp \
    5915         Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceTable.h \
    5916         Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceText.cpp \
    5917         Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceText.h \
    5918         Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceValue.cpp \
    5919         Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceValue.h \
    5920         Source/WebCore/accessibility/gtk/WebKitAccessibleUtil.cpp \
    5921         Source/WebCore/accessibility/gtk/WebKitAccessibleUtil.h \
    5922         Source/WebCore/accessibility/gtk/WebKitAccessibleWrapperAtk.cpp \
    5923         Source/WebCore/accessibility/gtk/WebKitAccessibleWrapperAtk.h \
     5894        Source/WebCore/accessibility/atk/AccessibilityObjectAtk.cpp \
     5895        Source/WebCore/accessibility/atk/AXObjectCacheAtk.cpp \
     5896        Source/WebCore/accessibility/atk/WebKitAccessibleHyperlink.h \
     5897        Source/WebCore/accessibility/atk/WebKitAccessibleHyperlink.cpp \
     5898        Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceAction.cpp \
     5899        Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceAction.h \
     5900        Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceComponent.cpp \
     5901        Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceComponent.h \
     5902        Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceDocument.cpp \
     5903        Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceDocument.h \
     5904        Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceEditableText.cpp \
     5905        Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceEditableText.h \
     5906        Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceHyperlinkImpl.cpp \
     5907        Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceHyperlinkImpl.h \
     5908        Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceHypertext.cpp \
     5909        Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceHypertext.h \
     5910        Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceImage.cpp \
     5911        Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceImage.h \
     5912        Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceSelection.cpp \
     5913        Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceSelection.h \
     5914        Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceTable.cpp \
     5915        Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceTable.h \
     5916        Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceText.cpp \
     5917        Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceText.h \
     5918        Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceValue.cpp \
     5919        Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceValue.h \
     5920        Source/WebCore/accessibility/atk/WebKitAccessibleUtil.cpp \
     5921        Source/WebCore/accessibility/atk/WebKitAccessibleUtil.h \
     5922        Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp \
     5923        Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.h \
    59245924        Source/WebCore/editing/gtk/FrameSelectionGtk.cpp \
    59255925        Source/WebCore/page/gtk/DragControllerGtk.cpp \

  • trunk/Source/WebCore/accessibility/atk/AXObjectCacheAtk.cpp

    r134938 r134939  
    2525#include "Document.h"
    2626#include "Element.h"
    27 #include <wtf/gobject/GOwnPtr.h>
    2827#include "HTMLSelectElement.h"
    2928#include "Range.h"
    3029#include "TextIterator.h"
    3130#include "WebKitAccessibleWrapperAtk.h"
     31#include <wtf/gobject/GOwnPtr.h>
    3232
    3333namespace WebCore {

  • trunk/Source/WebCore/accessibility/atk/WebKitAccessibleHyperlink.cpp

    r134938 r134939  
    340340
    341341    g_object_class_install_property(gobjectClass, PROP_HYPERLINK_IMPL,
    342                                     g_param_spec_object("hyperlink-impl",
    343                                                         "Hyperlink implementation",
    344                                                         "The associated WebKitAccessible instance.",
    345                                                         WEBKIT_TYPE_ACCESSIBLE,
    346                                                         (GParamFlags)(G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS)));
     342        g_param_spec_object("hyperlink-impl",
     343            "Hyperlink implementation",
     344            "The associated WebKitAccessible instance.",
     345            WEBKIT_TYPE_ACCESSIBLE,
     346            (GParamFlags)(G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS)));
    347347
    348348    g_type_class_add_private(gobjectClass, sizeof(WebKitAccessibleHyperlinkPrivate));

  • trunk/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceText.cpp

    r134938 r134939  
    3636#include "Font.h"
    3737#include "FrameView.h"
    38 #include <wtf/gobject/GOwnPtr.h>
    3938#include "HostWindow.h"
    4039#include "InlineTextBox.h"
    … …  
    4847#include "WebKitAccessibleWrapperAtk.h"
    4948#include "htmlediting.h"
     49#include <wtf/gobject/GOwnPtr.h>
    5050
    5151#if PLATFORM(GTK)
    … …  
    212212    Color bgColor = style->visitedDependentColor(CSSPropertyBackgroundColor);
    213213    if (bgColor.isValid()) {
    214         buffer.set(g_strdup_printf("%i,%i,%i",
    215                                    bgColor.red(), bgColor.green(), bgColor.blue()));
     214        buffer.set(g_strdup_printf("%i,%i,%i", bgColor.red(), bgColor.green(), bgColor.blue()));
    216215        result = addToAtkAttributeSet(result, atk_text_attribute_get_name(ATK_TEXT_ATTR_BG_COLOR), buffer.get());
    217216    }
    … …  
    219218    Color fgColor = style->visitedDependentColor(CSSPropertyColor);
    220219    if (fgColor.isValid()) {
    221         buffer.set(g_strdup_printf("%i,%i,%i",
    222                                    fgColor.red(), fgColor.green(), fgColor.blue()));
     220        buffer.set(g_strdup_printf("%i,%i,%i", fgColor.red(), fgColor.green(), fgColor.blue()));
    223221        result = addToAtkAttributeSet(result, atk_text_attribute_get_name(ATK_TEXT_ATTR_FG_COLOR), buffer.get());
    224222    }

  • trunk/Source/WebCore/accessibility/atk/WebKitAccessibleUtil.cpp

    r134938 r134939  
    165165    ExceptionCode ec = 0;
    166166    return (range->intersectsNode(node, ec)
    167             && (range->endContainer() != node || range->endOffset())
    168             && (range->startContainer() != lastDescendant || range->startOffset() != lastOffsetInNode(lastDescendant)));
     167        && (range->endContainer() != node || range->endOffset())
     168        && (range->startContainer() != lastDescendant || range->startOffset() != lastOffsetInNode(lastDescendant)));
    169169}

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

    r134938 r134939  
    207207}
    208208
    209 static gpointer webkit_accessible_parent_class = 0;
     209static gpointer webkitAccessibleParentClass = 0;
    210210
    211211static bool isRootObject(AccessibilityObject* coreObject)
    … …  
    258258{
    259259    // Check first if the parent has been already set.
    260     AtkObject* accessibleParent = ATK_OBJECT_CLASS(webkit_accessible_parent_class)->get_parent(object);
     260    AtkObject* accessibleParent = ATK_OBJECT_CLASS(webkitAccessibleParentClass)->get_parent(object);
    261261    if (accessibleParent)
    262262        return accessibleParent;
    … …  
    629629    // more check so that we do not present them as being "editable".
    630630    if ((!coreObject->isReadOnly()
    631          || (coreObject->isControl() && coreObject->canSetValueAttribute()))
     631        || (coreObject->isControl() && coreObject->canSetValueAttribute()))
    632632        && !isListBoxOption)
    633633        atk_state_set_add_state(stateSet, ATK_STATE_EDITABLE);
    … …  
    709709static AtkStateSet* webkitAccessibleRefStateSet(AtkObject* object)
    710710{
    711     AtkStateSet* stateSet = ATK_OBJECT_CLASS(webkit_accessible_parent_class)->ref_state_set(object);
     711    AtkStateSet* stateSet = ATK_OBJECT_CLASS(webkitAccessibleParentClass)->ref_state_set(object);
    712712    AccessibilityObject* coreObject = core(object);
    713713
    … …  
    728728static AtkRelationSet* webkitAccessibleRefRelationSet(AtkObject* object)
    729729{
    730     AtkRelationSet* relationSet = ATK_OBJECT_CLASS(webkit_accessible_parent_class)->ref_relation_set(object);
     730    AtkRelationSet* relationSet = ATK_OBJECT_CLASS(webkitAccessibleParentClass)->ref_relation_set(object);
    731731    AccessibilityObject* coreObject = core(object);
    732732
    … …  
    738738static void webkitAccessibleInit(AtkObject* object, gpointer data)
    739739{
    740     if (ATK_OBJECT_CLASS(webkit_accessible_parent_class)->initialize)
    741         ATK_OBJECT_CLASS(webkit_accessible_parent_class)->initialize(object, data);
     740    if (ATK_OBJECT_CLASS(webkitAccessibleParentClass)->initialize)
     741        ATK_OBJECT_CLASS(webkitAccessibleParentClass)->initialize(object, data);
    742742
    743743    WEBKIT_ACCESSIBLE(object)->m_object = reinterpret_cast<AccessibilityObject*>(data);
    … …  
    749749    returnString(String());
    750750
    751     G_OBJECT_CLASS(webkit_accessible_parent_class)->finalize(object);
    752 }
    753 
    754 static void webkit_accessible_class_init(AtkObjectClass* klass)
     751    G_OBJECT_CLASS(webkitAccessibleParentClass)->finalize(object);
     752}
     753
     754static void webkitAccessibleClassInit(AtkObjectClass* klass)
    755755{
    756756    GObjectClass* gobjectClass = G_OBJECT_CLASS(klass);
    757757
    758     webkit_accessible_parent_class = g_type_class_peek_parent(klass);
     758    webkitAccessibleParentClass = g_type_class_peek_parent(klass);
    759759
    760760    gobjectClass->finalize = webkitAccessibleFinalize;
    … …  
    774774
    775775GType
    776 webkit_accessible_get_type(void)
    777 {
    778     static volatile gsize type_volatile = 0;
    779 
    780     if (g_once_init_enter(&type_volatile)) {
     776webkitAccessibleGetType(void)
     777{
     778    static volatile gsize typeVolatile = 0;
     779
     780    if (g_once_init_enter(&typeVolatile)) {
    781781        static const GTypeInfo tinfo = {
    782782            sizeof(WebKitAccessibleClass),
    783783            (GBaseInitFunc) 0,
    784784            (GBaseFinalizeFunc) 0,
    785             (GClassInitFunc) webkit_accessible_class_init,
     785            (GClassInitFunc) webkitAccessibleClassInit,
    786786            (GClassFinalizeFunc) 0,
    787787            0, /* class data */
    … …  
    792792        };
    793793
    794         GType type = g_type_register_static(ATK_TYPE_OBJECT,
    795                                             "WebKitAccessible", &tinfo, GTypeFlags(0));
    796         g_once_init_leave(&type_volatile, type);
    797     }
    798 
    799     return type_volatile;
     794        GType type = g_type_register_static(ATK_TYPE_OBJECT, "WebKitAccessible", &tinfo, GTypeFlags(0));
     795        g_once_init_leave(&typeVolatile, type);
     796    }
     797
     798    return typeVolatile;
    800799}
    801800
    … …  
    971970        return type;
    972971
    973     type = g_type_register_static(WEBKIT_TYPE_ACCESSIBLE,
    974                                   atkTypeName,
    975                                   &typeInfo, GTypeFlags(0));
     972    type = g_type_register_static(WEBKIT_TYPE_ACCESSIBLE, atkTypeName, &typeInfo, GTypeFlags(0));
    976973    for (guint i = 0; i < G_N_ELEMENTS(AtkInterfacesInitFunctions); i++) {
    977974        if (interfaceMask & (1 << i))
    978975            g_type_add_interface_static(type,
    979                                         GetAtkInterfaceTypeFromWAIType(static_cast<WAIType>(i)),
    980                                         &AtkInterfacesInitFunctions[i]);
     976                GetAtkInterfaceTypeFromWAIType(static_cast<WAIType>(i)),
     977                &AtkInterfacesInitFunctions[i]);
    981978    }
    982979

  • trunk/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.h

    r134938 r134939  
    3131G_BEGIN_DECLS
    3232
    33 #define WEBKIT_TYPE_ACCESSIBLE                  (webkit_accessible_get_type ())
     33#define WEBKIT_TYPE_ACCESSIBLE                  (webkitAccessibleGetType ())
    3434#define WEBKIT_ACCESSIBLE(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), WEBKIT_TYPE_ACCESSIBLE, WebKitAccessible))
    3535#define WEBKIT_ACCESSIBLE_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), WEBKIT_TYPE_ACCESSIBLE, WebKitAccessibleClass))
    … …  
    4747
    4848struct _WebKitAccessibleClass {
    49     AtkObjectClass parent_class;
     49    AtkObjectClass parentClass;
    5050};
    5151
    52 GType webkit_accessible_get_type(void) G_GNUC_CONST;
     52GType webkitAccessibleGetType(void) G_GNUC_CONST;
    5353
    5454WebKitAccessible* webkitAccessibleNew(WebCore::AccessibilityObject*);
Note: See TracChangeset for help on using the changeset viewer.