[EFL] Share WebKit-Gtk's Accessibility implementation with others WebKit ports.
authormario@webkit.org <mario@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 16 Nov 2012 13:47:03 +0000 (13:47 +0000)
committermario@webkit.org <mario@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 16 Nov 2012 13:47:03 +0000 (13:47 +0000)
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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@134939 268f45cc-cd09-0410-ab3c-d52691b4dbfc

33 files changed:
Source/WebCore/ChangeLog
Source/WebCore/GNUmakefile.am
Source/WebCore/GNUmakefile.list.am
Source/WebCore/accessibility/atk/AXObjectCacheAtk.cpp [moved from Source/WebCore/accessibility/gtk/AXObjectCacheAtk.cpp with 100% similarity]
Source/WebCore/accessibility/atk/AccessibilityObjectAtk.cpp [moved from Source/WebCore/accessibility/gtk/AccessibilityObjectAtk.cpp with 100% similarity]
Source/WebCore/accessibility/atk/WebKitAccessibleHyperlink.cpp [moved from Source/WebCore/accessibility/gtk/WebKitAccessibleHyperlink.cpp with 96% similarity]
Source/WebCore/accessibility/atk/WebKitAccessibleHyperlink.h [moved from Source/WebCore/accessibility/gtk/WebKitAccessibleHyperlink.h with 100% similarity]
Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceAction.cpp [moved from Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceAction.cpp with 100% similarity]
Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceAction.h [moved from Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceAction.h with 100% similarity]
Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceComponent.cpp [moved from Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceComponent.cpp with 100% similarity]
Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceComponent.h [moved from Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceComponent.h with 100% similarity]
Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceDocument.cpp [moved from Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceDocument.cpp with 100% similarity]
Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceDocument.h [moved from Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceDocument.h with 100% similarity]
Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceEditableText.cpp [moved from Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceEditableText.cpp with 100% similarity]
Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceEditableText.h [moved from Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceEditableText.h with 100% similarity]
Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceHyperlinkImpl.cpp [moved from Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceHyperlinkImpl.cpp with 100% similarity]
Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceHyperlinkImpl.h [moved from Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceHyperlinkImpl.h with 100% similarity]
Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceHypertext.cpp [moved from Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceHypertext.cpp with 100% similarity]
Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceHypertext.h [moved from Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceHypertext.h with 100% similarity]
Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceImage.cpp [moved from Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceImage.cpp with 100% similarity]
Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceImage.h [moved from Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceImage.h with 100% similarity]
Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceSelection.cpp [moved from Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceSelection.cpp with 100% similarity]
Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceSelection.h [moved from Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceSelection.h with 100% similarity]
Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceTable.cpp [moved from Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceTable.cpp with 100% similarity]
Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceTable.h [moved from Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceTable.h with 100% similarity]
Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceText.cpp [moved from Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceText.cpp with 99% similarity]
Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceText.h [moved from Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceText.h with 100% similarity]
Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceValue.cpp [moved from Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceValue.cpp with 100% similarity]
Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceValue.h [moved from Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceValue.h with 100% similarity]
Source/WebCore/accessibility/atk/WebKitAccessibleUtil.cpp [moved from Source/WebCore/accessibility/gtk/WebKitAccessibleUtil.cpp with 96% similarity]
Source/WebCore/accessibility/atk/WebKitAccessibleUtil.h [moved from Source/WebCore/accessibility/gtk/WebKitAccessibleUtil.h with 100% similarity]
Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp [moved from Source/WebCore/accessibility/gtk/WebKitAccessibleWrapperAtk.cpp with 95% similarity]
Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.h [moved from Source/WebCore/accessibility/gtk/WebKitAccessibleWrapperAtk.h with 93% similarity]

index f9ef0fe900ac3993365ffbc48c1ea4d0b0d05549..6d6a5a3ce303296561166a8f01cd283164e8061a 100644 (file)
@@ -1,3 +1,75 @@
+2012-11-16  Mario Sanchez Prada  <mario@webkit.org>
+
+        [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.
+
 2012-11-16  Shinya Kawanaka  <shinyak@chromium.org>
 
         Changing pseudoClass (:indeterminate) should cause distribution
index ca85066271c725e2fd14fdf286ac652caa6e4973..5efb13e58bc54eb34a911eb9b0645d640c1b0d52 100644 (file)
@@ -106,7 +106,7 @@ webcore_cppflags += \
 webcoregtk_cppflags += \
        -DWEBKITGTK_API_VERSION_STRING=\"@WEBKITGTK_API_VERSION@\" \
        -DWTF_USE_SOUP=1 \
-       -I$(srcdir)/Source/WebCore/accessibility/gtk \
+       -I$(srcdir)/Source/WebCore/accessibility/atk \
        -I$(srcdir)/Source/WebCore/loader/gtk \
        -I$(srcdir)/Source/WebCore/page/gtk \
        -I$(srcdir)/Source/WebCore/platform/cairo \
index ae6036df82f16072a2fce867a195fa81482b5b2d..ff66208f527401bb804faf7693f0d648663f7d4b 100644 (file)
@@ -5891,36 +5891,36 @@ webcore_platform_sources += \
 
 # WebCore files that use GTK/GDK or any other dependency that requires GTK+.
 webcoregtk_sources += \
-       Source/WebCore/accessibility/gtk/AccessibilityObjectAtk.cpp \
-       Source/WebCore/accessibility/gtk/AXObjectCacheAtk.cpp \
-       Source/WebCore/accessibility/gtk/WebKitAccessibleHyperlink.h \
-       Source/WebCore/accessibility/gtk/WebKitAccessibleHyperlink.cpp \
-       Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceAction.cpp \
-       Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceAction.h \
-       Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceComponent.cpp \
-       Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceComponent.h \
-       Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceDocument.cpp \
-       Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceDocument.h \
-       Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceEditableText.cpp \
-       Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceEditableText.h \
-       Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceHyperlinkImpl.cpp \
-       Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceHyperlinkImpl.h \
-       Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceHypertext.cpp \
-       Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceHypertext.h \
-       Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceImage.cpp \
-       Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceImage.h \
-       Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceSelection.cpp \
-       Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceSelection.h \
-       Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceTable.cpp \
-       Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceTable.h \
-       Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceText.cpp \
-       Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceText.h \
-       Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceValue.cpp \
-       Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceValue.h \
-       Source/WebCore/accessibility/gtk/WebKitAccessibleUtil.cpp \
-       Source/WebCore/accessibility/gtk/WebKitAccessibleUtil.h \
-       Source/WebCore/accessibility/gtk/WebKitAccessibleWrapperAtk.cpp \
-       Source/WebCore/accessibility/gtk/WebKitAccessibleWrapperAtk.h \
+       Source/WebCore/accessibility/atk/AccessibilityObjectAtk.cpp \
+       Source/WebCore/accessibility/atk/AXObjectCacheAtk.cpp \
+       Source/WebCore/accessibility/atk/WebKitAccessibleHyperlink.h \
+       Source/WebCore/accessibility/atk/WebKitAccessibleHyperlink.cpp \
+       Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceAction.cpp \
+       Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceAction.h \
+       Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceComponent.cpp \
+       Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceComponent.h \
+       Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceDocument.cpp \
+       Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceDocument.h \
+       Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceEditableText.cpp \
+       Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceEditableText.h \
+       Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceHyperlinkImpl.cpp \
+       Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceHyperlinkImpl.h \
+       Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceHypertext.cpp \
+       Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceHypertext.h \
+       Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceImage.cpp \
+       Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceImage.h \
+       Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceSelection.cpp \
+       Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceSelection.h \
+       Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceTable.cpp \
+       Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceTable.h \
+       Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceText.cpp \
+       Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceText.h \
+       Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceValue.cpp \
+       Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceValue.h \
+       Source/WebCore/accessibility/atk/WebKitAccessibleUtil.cpp \
+       Source/WebCore/accessibility/atk/WebKitAccessibleUtil.h \
+       Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp \
+       Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.h \
        Source/WebCore/editing/gtk/FrameSelectionGtk.cpp \
        Source/WebCore/page/gtk/DragControllerGtk.cpp \
        Source/WebCore/page/gtk/EventHandlerGtk.cpp \
similarity index 100%
rename from Source/WebCore/accessibility/gtk/AXObjectCacheAtk.cpp
rename to Source/WebCore/accessibility/atk/AXObjectCacheAtk.cpp
index 949c3833dfed7f6f86501a38b63776b72a63bc4d..560a60a8831777fc608e8366855c3513e6c50f7a 100644 (file)
 #include "AccessibilityRenderObject.h"
 #include "Document.h"
 #include "Element.h"
-#include <wtf/gobject/GOwnPtr.h>
 #include "HTMLSelectElement.h"
 #include "Range.h"
 #include "TextIterator.h"
 #include "WebKitAccessibleWrapperAtk.h"
+#include <wtf/gobject/GOwnPtr.h>
 
 namespace WebCore {
 
similarity index 96%
rename from Source/WebCore/accessibility/gtk/WebKitAccessibleHyperlink.cpp
rename to Source/WebCore/accessibility/atk/WebKitAccessibleHyperlink.cpp
index 2e4c19364f31f826823b8fd6d49e66f452811f1b..6ae56ff13b93ce79ed5426f395a904c18c83db81 100644 (file)
@@ -339,11 +339,11 @@ static void webkitAccessibleHyperlinkClassInit(AtkHyperlinkClass* klass)
     klass->is_selected_link = webkitAccessibleHyperlinkIsSelectedLink;
 
     g_object_class_install_property(gobjectClass, PROP_HYPERLINK_IMPL,
-                                    g_param_spec_object("hyperlink-impl",
-                                                        "Hyperlink implementation",
-                                                        "The associated WebKitAccessible instance.",
-                                                        WEBKIT_TYPE_ACCESSIBLE,
-                                                        (GParamFlags)(G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS)));
+        g_param_spec_object("hyperlink-impl",
+            "Hyperlink implementation",
+            "The associated WebKitAccessible instance.",
+            WEBKIT_TYPE_ACCESSIBLE,
+            (GParamFlags)(G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS)));
 
     g_type_class_add_private(gobjectClass, sizeof(WebKitAccessibleHyperlinkPrivate));
 }
similarity index 99%
rename from Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceText.cpp
rename to Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceText.cpp
index 29e7f13fca4f0bdea3264f4e7f0f7f609d9464f4..e16654adfbc873397e0b2277108be719da5bbe4d 100644 (file)
@@ -35,7 +35,6 @@
 #include "Document.h"
 #include "Font.h"
 #include "FrameView.h"
-#include <wtf/gobject/GOwnPtr.h>
 #include "HostWindow.h"
 #include "InlineTextBox.h"
 #include "NotImplemented.h"
@@ -47,6 +46,7 @@
 #include "WebKitAccessibleUtil.h"
 #include "WebKitAccessibleWrapperAtk.h"
 #include "htmlediting.h"
+#include <wtf/gobject/GOwnPtr.h>
 
 #if PLATFORM(GTK)
 #include <libgail-util/gail-util.h>
@@ -211,15 +211,13 @@ static AtkAttributeSet* getAttributeSetForAccessibilityObject(const Accessibilit
 
     Color bgColor = style->visitedDependentColor(CSSPropertyBackgroundColor);
     if (bgColor.isValid()) {
-        buffer.set(g_strdup_printf("%i,%i,%i",
-                                   bgColor.red(), bgColor.green(), bgColor.blue()));
+        buffer.set(g_strdup_printf("%i,%i,%i", bgColor.red(), bgColor.green(), bgColor.blue()));
         result = addToAtkAttributeSet(result, atk_text_attribute_get_name(ATK_TEXT_ATTR_BG_COLOR), buffer.get());
     }
 
     Color fgColor = style->visitedDependentColor(CSSPropertyColor);
     if (fgColor.isValid()) {
-        buffer.set(g_strdup_printf("%i,%i,%i",
-                                   fgColor.red(), fgColor.green(), fgColor.blue()));
+        buffer.set(g_strdup_printf("%i,%i,%i", fgColor.red(), fgColor.green(), fgColor.blue()));
         result = addToAtkAttributeSet(result, atk_text_attribute_get_name(ATK_TEXT_ATTR_FG_COLOR), buffer.get());
     }
 
similarity index 96%
rename from Source/WebCore/accessibility/gtk/WebKitAccessibleUtil.cpp
rename to Source/WebCore/accessibility/atk/WebKitAccessibleUtil.cpp
index a3a0e17c56a7c64f290497b45e9936a0b47855c2..2d5d1795192ca1cda3605d0eb4284f3ab6d5b212 100644 (file)
@@ -164,6 +164,6 @@ bool selectionBelongsToObject(AccessibilityObject* coreObject, VisibleSelection&
     Node* lastDescendant = node->lastDescendant();
     ExceptionCode ec = 0;
     return (range->intersectsNode(node, ec)
-            && (range->endContainer() != node || range->endOffset())
-            && (range->startContainer() != lastDescendant || range->startOffset() != lastOffsetInNode(lastDescendant)));
+        && (range->endContainer() != node || range->endOffset())
+        && (range->startContainer() != lastDescendant || range->startOffset() != lastOffsetInNode(lastDescendant)));
 }
similarity index 95%
rename from Source/WebCore/accessibility/gtk/WebKitAccessibleWrapperAtk.cpp
rename to Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp
index 46feea5b9b4afcfe9093478b47eec10f7cb73287..bd78d5c8e4cce762dfeaa845cf027f20c23ece56 100644 (file)
@@ -206,7 +206,7 @@ static void setAtkRelationSetFromCoreObject(AccessibilityObject* coreObject, Atk
     }
 }
 
-static gpointer webkit_accessible_parent_class = 0;
+static gpointer webkitAccessibleParentClass = 0;
 
 static bool isRootObject(AccessibilityObject* coreObject)
 {
@@ -257,7 +257,7 @@ static AtkObject* atkParentOfRootObject(AtkObject* object)
 static AtkObject* webkitAccessibleGetParent(AtkObject* object)
 {
     // Check first if the parent has been already set.
-    AtkObject* accessibleParent = ATK_OBJECT_CLASS(webkit_accessible_parent_class)->get_parent(object);
+    AtkObject* accessibleParent = ATK_OBJECT_CLASS(webkitAccessibleParentClass)->get_parent(object);
     if (accessibleParent)
         return accessibleParent;
 
@@ -628,7 +628,7 @@ static void setAtkStateSetFromCoreObject(AccessibilityObject* coreObject, AtkSta
     // isReadOnly is false for listBoxOptions, we need to add one
     // more check so that we do not present them as being "editable".
     if ((!coreObject->isReadOnly()
-         || (coreObject->isControl() && coreObject->canSetValueAttribute()))
+        || (coreObject->isControl() && coreObject->canSetValueAttribute()))
         && !isListBoxOption)
         atk_state_set_add_state(stateSet, ATK_STATE_EDITABLE);
 
@@ -708,7 +708,7 @@ static void setAtkStateSetFromCoreObject(AccessibilityObject* coreObject, AtkSta
 
 static AtkStateSet* webkitAccessibleRefStateSet(AtkObject* object)
 {
-    AtkStateSet* stateSet = ATK_OBJECT_CLASS(webkit_accessible_parent_class)->ref_state_set(object);
+    AtkStateSet* stateSet = ATK_OBJECT_CLASS(webkitAccessibleParentClass)->ref_state_set(object);
     AccessibilityObject* coreObject = core(object);
 
     if (coreObject == fallbackObject()) {
@@ -727,7 +727,7 @@ static AtkStateSet* webkitAccessibleRefStateSet(AtkObject* object)
 
 static AtkRelationSet* webkitAccessibleRefRelationSet(AtkObject* object)
 {
-    AtkRelationSet* relationSet = ATK_OBJECT_CLASS(webkit_accessible_parent_class)->ref_relation_set(object);
+    AtkRelationSet* relationSet = ATK_OBJECT_CLASS(webkitAccessibleParentClass)->ref_relation_set(object);
     AccessibilityObject* coreObject = core(object);
 
     setAtkRelationSetFromCoreObject(coreObject, relationSet);
@@ -737,8 +737,8 @@ static AtkRelationSet* webkitAccessibleRefRelationSet(AtkObject* object)
 
 static void webkitAccessibleInit(AtkObject* object, gpointer data)
 {
-    if (ATK_OBJECT_CLASS(webkit_accessible_parent_class)->initialize)
-        ATK_OBJECT_CLASS(webkit_accessible_parent_class)->initialize(object, data);
+    if (ATK_OBJECT_CLASS(webkitAccessibleParentClass)->initialize)
+        ATK_OBJECT_CLASS(webkitAccessibleParentClass)->initialize(object, data);
 
     WEBKIT_ACCESSIBLE(object)->m_object = reinterpret_cast<AccessibilityObject*>(data);
 }
@@ -748,14 +748,14 @@ static void webkitAccessibleFinalize(GObject* object)
     // This is a good time to clear the return buffer.
     returnString(String());
 
-    G_OBJECT_CLASS(webkit_accessible_parent_class)->finalize(object);
+    G_OBJECT_CLASS(webkitAccessibleParentClass)->finalize(object);
 }
 
-static void webkit_accessible_class_init(AtkObjectClass* klass)
+static void webkitAccessibleClassInit(AtkObjectClass* klass)
 {
     GObjectClass* gobjectClass = G_OBJECT_CLASS(klass);
 
-    webkit_accessible_parent_class = g_type_class_peek_parent(klass);
+    webkitAccessibleParentClass = g_type_class_peek_parent(klass);
 
     gobjectClass->finalize = webkitAccessibleFinalize;
 
@@ -773,16 +773,16 @@ static void webkit_accessible_class_init(AtkObjectClass* klass)
 }
 
 GType
-webkit_accessible_get_type(void)
+webkitAccessibleGetType(void)
 {
-    static volatile gsize type_volatile = 0;
+    static volatile gsize typeVolatile = 0;
 
-    if (g_once_init_enter(&type_volatile)) {
+    if (g_once_init_enter(&typeVolatile)) {
         static const GTypeInfo tinfo = {
             sizeof(WebKitAccessibleClass),
             (GBaseInitFunc) 0,
             (GBaseFinalizeFunc) 0,
-            (GClassInitFunc) webkit_accessible_class_init,
+            (GClassInitFunc) webkitAccessibleClassInit,
             (GClassFinalizeFunc) 0,
             0, /* class data */
             sizeof(WebKitAccessible), /* instance size */
@@ -791,12 +791,11 @@ webkit_accessible_get_type(void)
             0 /* value table */
         };
 
-        GType type = g_type_register_static(ATK_TYPE_OBJECT,
-                                            "WebKitAccessible", &tinfo, GTypeFlags(0));
-        g_once_init_leave(&type_volatile, type);
+        GType type = g_type_register_static(ATK_TYPE_OBJECT, "WebKitAccessible", &tinfo, GTypeFlags(0));
+        g_once_init_leave(&typeVolatile, type);
     }
 
-    return type_volatile;
+    return typeVolatile;
 }
 
 static const GInterfaceInfo AtkInterfacesInitFunctions[] = {
@@ -970,14 +969,12 @@ static GType getAccessibilityTypeFromObject(AccessibilityObject* coreObject)
     if (type)
         return type;
 
-    type = g_type_register_static(WEBKIT_TYPE_ACCESSIBLE,
-                                  atkTypeName,
-                                  &typeInfo, GTypeFlags(0));
+    type = g_type_register_static(WEBKIT_TYPE_ACCESSIBLE, atkTypeName, &typeInfo, GTypeFlags(0));
     for (guint i = 0; i < G_N_ELEMENTS(AtkInterfacesInitFunctions); i++) {
         if (interfaceMask & (1 << i))
             g_type_add_interface_static(type,
-                                        GetAtkInterfaceTypeFromWAIType(static_cast<WAIType>(i)),
-                                        &AtkInterfacesInitFunctions[i]);
+                GetAtkInterfaceTypeFromWAIType(static_cast<WAIType>(i)),
+                &AtkInterfacesInitFunctions[i]);
     }
 
     return type;
similarity index 93%
rename from Source/WebCore/accessibility/gtk/WebKitAccessibleWrapperAtk.h
rename to Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.h
index d27bf9587a71058cb1ea717110d1bd214d1f181f..111184e96c27e9427b876d1eb62258be5c25f424 100644 (file)
@@ -30,7 +30,7 @@ class AccessibilityObject;
 
 G_BEGIN_DECLS
 
-#define WEBKIT_TYPE_ACCESSIBLE                  (webkit_accessible_get_type ())
+#define WEBKIT_TYPE_ACCESSIBLE                  (webkitAccessibleGetType ())
 #define WEBKIT_ACCESSIBLE(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), WEBKIT_TYPE_ACCESSIBLE, WebKitAccessible))
 #define WEBKIT_ACCESSIBLE_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), WEBKIT_TYPE_ACCESSIBLE, WebKitAccessibleClass))
 #define WEBKIT_IS_ACCESSIBLE(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), WEBKIT_TYPE_ACCESSIBLE))
@@ -46,10 +46,10 @@ struct _WebKitAccessible {
 };
 
 struct _WebKitAccessibleClass {
-    AtkObjectClass parent_class;
+    AtkObjectClass parentClass;
 };
 
-GType webkit_accessible_get_type(void) G_GNUC_CONST;
+GType webkitAccessibleGetType(void) G_GNUC_CONST;
 
 WebKitAccessible* webkitAccessibleNew(WebCore::AccessibilityObject*);