Changeset 33591 in webkit

Timestamp:

May 19, 2008 6:12:20 PM (16 years ago)

Author:

alp@webkit.org

Message:

2008-05-19 Alp Toker <​alp@nuanti.com>

Reviewed by Anders and Beth.

​http://bugs.webkit.org/show_bug.cgi?id=16495
[GTK] Accessibility support with ATK/AT-SPI

Initial ATK/AT-SPI accessibility support for the GTK+ port.

Location:

trunk

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/wtf/Platform.h (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/GNUmakefile.am (modified) (1 diff)
• WebCore/page/AccessibilityObject.cpp (modified) (2 diffs)
• WebCore/page/AccessibilityObject.h (modified) (6 diffs)
• WebCore/page/gtk/AXObjectCacheAtk.cpp (added)
• WebCore/page/gtk/AccessibilityObjectWrapperAtk.cpp (added)
• WebCore/page/gtk/AccessibilityObjectWrapperAtk.h (added)
• WebKit/gtk/ChangeLog (modified) (1 diff)
• WebKit/gtk/webkit/webkitwebview.cpp (modified) (5 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-05-19  Alp Toker  <alp@nuanti.com>
+
+        Reviewed by Anders and Beth.
+
+        http://bugs.webkit.org/show_bug.cgi?id=16495
+        [GTK] Accessibility support with ATK/AT-SPI
+
+        Initial ATK/AT-SPI accessibility support for the GTK+ port.
+
+        * wtf/Platform.h:
+
 2008-05-19  Kevin McCullough  <kmccullough@apple.com>
 

trunk/JavaScriptCore/wtf/Platform.h

@@ -237 +237 @@
 #if PLATFORM(MAC) || PLATFORM(WIN)
 #define ENABLE_DASHBOARD_SUPPORT 1
+#endif
+
+#if PLATFORM(MAC) || PLATFORM(WIN) || PLATFORM(GTK)
 #define HAVE_ACCESSIBILITY 1
 #endif

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-05-19  Alp Toker  <alp@nuanti.com>
+
+        Reviewed by Anders and Beth.
+
+        http://bugs.webkit.org/show_bug.cgi?id=16495
+        [GTK] Accessibility support with ATK/AT-SPI
+
+        Initial ATK/AT-SPI accessibility support for the GTK+ port.
+
+        * GNUmakefile.am:
+        * page/AccessibilityObject.cpp:
+        (WebCore::AccessibilityObject::AccessibilityObject):
+        (WebCore::AccessibilityObject::detach):
+        * page/AccessibilityObject.h:
+        * page/gtk/AXObjectCacheAtk.cpp: Added.
+        (WebCore::AXObjectCache::detachWrapper):
+        (WebCore::AXObjectCache::attachWrapper):
+        (WebCore::AXObjectCache::postNotification):
+        (WebCore::AXObjectCache::postNotificationToElement):
+        (WebCore::AXObjectCache::handleFocusedUIElementChanged):
+        * page/gtk/AccessibilityObjectWrapperAtk.cpp: Added.
+        (WebCore::):
+        (WebCore::AccessibilityObject::wrapper):
+        (WebCore::AccessibilityObject::setWrapper):
+        * page/gtk/AccessibilityObjectWrapperAtk.h: Added.
+
 2008-05-19  Anders Carlsson  <andersca@apple.com>
 

trunk/WebCore/GNUmakefile.am

@@ -1031 +1031 @@
         WebCore/platform/text/TextBoundariesICU.cpp \
         WebCore/platform/text/TextBreakIteratorICU.cpp \
+        WebCore/page/gtk/AXObjectCacheAtk.cpp \
+        WebCore/page/gtk/AccessibilityObjectWrapperAtk.cpp \
         WebCore/page/gtk/EventHandlerGtk.cpp \
         WebCore/page/gtk/FrameGtk.cpp \

trunk/WebCore/page/AccessibilityObject.cpp

@@ -64 +64 @@
     : m_id(0)
     , m_haveChildren(false)
+#if PLATFORM(GTK)
+    , m_wrapper(0)
+#endif
 {
 }
@@ -76 +79 @@
     removeAXObjectID();
 #if HAVE(ACCESSIBILITY)
-    m_wrapper = 0;
+    setWrapper(0);
 #endif    
 }

trunk/WebCore/page/AccessibilityObject.h

@@ -1 +1 @@
 /*
  * Copyright (C) 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2008 Nuanti Ltd.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -56 +57 @@
 @class WebCoreTextMarkerRange;
 #else
-class AccessibilityObjectWrapper;
 class NSArray;
 class NSAttributedString;
@@ -66 +66 @@
 class WebCoreTextMarker;
 class WebCoreTextMarkerRange;
+#if PLATFORM(GTK)
+typedef struct _AtkObject AtkObject;
+typedef struct _AtkObject AccessibilityObjectWrapper;
+#else
+class AccessibilityObjectWrapper;
+#endif
 #endif
 
@@ -349 +355 @@
 
 #if HAVE(ACCESSIBILITY)
+#if PLATFORM(GTK)
+    AccessibilityObjectWrapper* wrapper() const;
+    void setWrapper(AccessibilityObjectWrapper*);
+#else
     AccessibilityObjectWrapper* wrapper() const { return m_wrapper.get(); }
     void setWrapper(AccessibilityObjectWrapper* wrapper) 
@@ -355 +365 @@
     }
 #endif
+#endif
 
 protected:
@@ -369 +380 @@
 #elif PLATFORM(WIN)
     COMPtr<AccessibilityObjectWrapper> m_wrapper;
+#elif PLATFORM(GTK)
+    AtkObject* m_wrapper;
 #endif
 };

trunk/WebKit/gtk/ChangeLog

@@ +1 @@
+2008-05-19  Alp Toker  <alp@nuanti.com>
+
+        Reviewed by Anders and Beth.
+
+        http://bugs.webkit.org/show_bug.cgi?id=16495
+        [GTK] Accessibility support with ATK/AT-SPI
+
+        Initial ATK/AT-SPI accessibility support for the GTK+ port.
+
+        * webkit/webkitwebview.cpp:
+
 2008-05-06  Christian Dywan  <christian@twotoasts.de>
 

trunk/WebKit/gtk/webkit/webkitwebview.cpp

@@ -5 +5 @@
  *  Copyright (C) 2007 Alp Toker <alp@atoker.com>
  *  Copyright (C) 2008 Jan Alonzo <jmalonzo@unpluggable.com>
+ *  Copyright (C) 2008 Nuanti Ltd.
  *
  *  This library is free software; you can redistribute it and/or
@@ -29 +30 @@
 #include "webkitwebhistoryitem.h"
 
+#include "AXObjectCache.h"
 #include "NotImplemented.h"
 #include "BackForwardList.h"
@@ -37 +39 @@
 #include "ContextMenuController.h"
 #include "Cursor.h"
+#include "Document.h"
 #include "DragClientGtk.h"
 #include "Editor.h"
@@ -715 +718 @@
 }
 
+static AtkObject* webkit_web_view_get_accessible(GtkWidget* widget)
+{
+    WebKitWebView* webView = WEBKIT_WEB_VIEW(widget);
+    AXObjectCache::enableAccessibility();
+
+    Frame* coreFrame = core(webView)->mainFrame();
+    if (!coreFrame)
+        return NULL;
+
+    Document* doc = coreFrame->document();
+    if (!doc)
+        return NULL;
+
+    AccessibilityObject* coreAccessible = doc->axObjectCache()->get(doc->renderer());
+    if (!coreAccessible || !coreAccessible->wrapper())
+        return NULL;
+
+    return coreAccessible->wrapper();
+}
+
 static void webkit_web_view_class_init(WebKitWebViewClass* webViewClass)
 {
@@ -1081 +1104 @@
     widgetClass->popup_menu = webkit_web_view_popup_menu_handler;
     widgetClass->focus_in_event = webkit_web_view_focus_in_event;
+    widgetClass->get_accessible = webkit_web_view_get_accessible;
 
     GtkContainerClass* containerClass = GTK_CONTAINER_CLASS(webViewClass);