Changeset 105724 in webkit


Ignore:
Timestamp:
Jan 24, 2012 3:55:18 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.

New files for the implementation of the AtkHyperlinkImpl interface,
containing the related code from WebKitAccessibleWrapperAtk.cpp.

  • accessibility/gtk/WebKitAccessibleInterfaceHyperlinkImpl.cpp: Added.

(webkitAccessibleHyperlinkImplInterfaceInit):
(webkitAccessibleHyperlinkImplGetHyperlink):

  • accessibility/gtk/WebKitAccessibleInterfaceHyperlinkImpl.h: Added.
  • accessibility/gtk/WebKitAccessibleWrapperAtk.cpp: Remove code

related to the implementation of the AtkHyperlinkImpl interface.
(webkit_accessible_class_init):

Add new files to build files.

  • GNUmakefile.list.am: Add WebKitAccessibleInterfaceHyperlinkImpl.[h|cpp].
  • WebCore.gypi: Ditto.
Location:
trunk/Source/WebCore
Files:
2 added
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r105722 r105724  
     12012-01-24  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        New files for the implementation of the AtkHyperlinkImpl interface,
     9        containing the related code from WebKitAccessibleWrapperAtk.cpp.
     10
     11        * accessibility/gtk/WebKitAccessibleInterfaceHyperlinkImpl.cpp: Added.
     12        (webkitAccessibleHyperlinkImplInterfaceInit):
     13        (webkitAccessibleHyperlinkImplGetHyperlink):
     14        * accessibility/gtk/WebKitAccessibleInterfaceHyperlinkImpl.h: Added.
     15        * accessibility/gtk/WebKitAccessibleWrapperAtk.cpp: Remove code
     16        related to the implementation of the AtkHyperlinkImpl interface.
     17        (webkit_accessible_class_init):
     18
     19        Add new files to build files.
     20
     21        * GNUmakefile.list.am: Add WebKitAccessibleInterfaceHyperlinkImpl.[h|cpp].
     22        * WebCore.gypi: Ditto.
     23
    1242012-01-24  Mario Sanchez Prada  <msanchez@igalia.com>
    225

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

    r105722 r105724  
    44304430        Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceEditableText.cpp \
    44314431        Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceEditableText.h \
     4432        Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceHyperlinkImpl.cpp \
     4433        Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceHyperlinkImpl.h \
    44324434        Source/WebCore/accessibility/gtk/WebKitAccessibleUtil.cpp \
    44334435        Source/WebCore/accessibility/gtk/WebKitAccessibleUtil.h \

  • trunk/Source/WebCore/WebCore.gypi

    r105722 r105724  
    13541354            'accessibility/gtk/WebKitAccessibleInterfaceEditableText.cpp',
    13551355            'accessibility/gtk/WebKitAccessibleInterfaceEditableText.h',
     1356            'accessibility/gtk/WebKitAccessibleInterfaceHyperlinkImpl.cpp',
     1357            'accessibility/gtk/WebKitAccessibleInterfaceHyperlinkImpl.h',
    13561358            'accessibility/gtk/WebKitAccessibleUtil.cpp',
    13571359            'accessibility/gtk/WebKitAccessibleUtil.h',

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

    r105722 r105724  
    6868#include "WebKitAccessibleInterfaceDocument.h"
    6969#include "WebKitAccessibleInterfaceEditableText.h"
     70#include "WebKitAccessibleInterfaceHyperlinkImpl.h"
    7071#include "WebKitAccessibleUtil.h"
    7172#include "htmlediting.h"
    … …  
    8182
    8283using namespace WebCore;
    83 
    84 static GQuark hyperlinkObjectQuark = 0;
    8584
    8685static AccessibilityObject* fallbackObject()
    … …  
    812811    klass->get_attributes = webkit_accessible_get_attributes;
    813812    klass->ref_relation_set = webkit_accessible_ref_relation_set;
    814 
    815     hyperlinkObjectQuark = g_quark_from_static_string("webkit-accessible-hyperlink-object");
    816813}
    817814
    … …  
    21412138}
    21422139
    2143 static AtkHyperlink* webkitAccessibleHyperlinkImplGetHyperlink(AtkHyperlinkImpl* hyperlink)
    2144 {
    2145     AtkHyperlink* hyperlinkObject = ATK_HYPERLINK(g_object_get_qdata(G_OBJECT(hyperlink), hyperlinkObjectQuark));
    2146     if (!hyperlinkObject) {
    2147         hyperlinkObject = ATK_HYPERLINK(webkitAccessibleHyperlinkNew(hyperlink));
    2148         g_object_set_qdata(G_OBJECT(hyperlink), hyperlinkObjectQuark, hyperlinkObject);
    2149     }
    2150     return hyperlinkObject;
    2151 }
    2152 
    2153 static void atkHyperlinkImplInterfaceInit(AtkHyperlinkImplIface* iface)
    2154 {
    2155     iface->get_hyperlink = webkitAccessibleHyperlinkImplGetHyperlink;
    2156 }
    2157 
    21582140static void webkitAccessibleValueGetCurrentValue(AtkValue* value, GValue* gValue)
    21592141{
    … …  
    22262208    {(GInterfaceInitFunc)atkHypertextInterfaceInit,
    22272209     (GInterfaceFinalizeFunc) 0, 0},
    2228     {(GInterfaceInitFunc)atkHyperlinkImplInterfaceInit,
    2229      (GInterfaceFinalizeFunc) 0, 0},
     2210    {reinterpret_cast<GInterfaceInitFunc>(webkitAccessibleHyperlinkImplInterfaceInit), 0, 0},
    22302211    {reinterpret_cast<GInterfaceInitFunc>(webkitAccessibleDocumentInterfaceInit), 0, 0},
    22312212    {(GInterfaceInitFunc)atkValueInterfaceInit,
Note: See TracChangeset for help on using the changeset viewer.