Changeset 140667 in webkit

Timestamp:

Jan 24, 2013 2:11:51 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL][WK2] Expose accessibility hierarchy in WebKit2-EFL.
​https://bugs.webkit.org/show_bug.cgi?id=106216

Patch by Krzysztof Czech <​k.czech@samsung.com> on 2013-01-24
Reviewed by Andreas Kling.

Create WebPage's accessibility object on WebPage initialization.
Wrap around WebCore's accessibility objects.
Updating accessibility hierarchy. Expands accessibility implementation
of WebKit-GTK to be used in EFL.

• PlatformEfl.cmake:
• WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:

(WebKit::WebFrameLoaderClient::dispatchDidClearWindowObjectInWorld):

• WebProcess/WebPage/WebPage.h:

(WebPage):

• WebProcess/WebPage/atk/WebPageAccessibilityObjectAtk.cpp:

(webPageAccessibilityObjectGetIndexInParent):
(web_page_accessibility_object_init):

• WebProcess/WebPage/efl/WebPageEfl.cpp:

(WebKit::WebPage::platformInitialize):
(WebKit):
(WebKit::WebPage::updateAccessibilityTree):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• PlatformEfl.cmake (modified) (2 diffs)
• WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (modified) (1 diff)
• WebProcess/WebPage/WebPage.h (modified) (3 diffs)
• WebProcess/WebPage/atk/WebPageAccessibilityObjectAtk.cpp (modified) (2 diffs)
• WebProcess/WebPage/efl/WebPageEfl.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-01-24  Krzysztof Czech  <k.czech@samsung.com>
+
+        [EFL][WK2] Expose accessibility hierarchy in WebKit2-EFL.
+        https://bugs.webkit.org/show_bug.cgi?id=106216
+
+        Reviewed by Andreas Kling.
+
+        Create WebPage's accessibility object on WebPage initialization.
+        Wrap around WebCore's accessibility objects.
+        Updating accessibility hierarchy. Expands accessibility implementation
+        of WebKit-GTK to be used in EFL.
+
+        * PlatformEfl.cmake:
+        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+        (WebKit::WebFrameLoaderClient::dispatchDidClearWindowObjectInWorld):
+        * WebProcess/WebPage/WebPage.h:
+        (WebPage):
+        * WebProcess/WebPage/atk/WebPageAccessibilityObjectAtk.cpp:
+        (webPageAccessibilityObjectGetIndexInParent):
+        (web_page_accessibility_object_init):
+        * WebProcess/WebPage/efl/WebPageEfl.cpp:
+        (WebKit::WebPage::platformInitialize):
+        (WebKit):
+        (WebKit::WebPage::updateAccessibilityTree):
+
 2013-01-23  Seokju Kwon  <seokju.kwon@gmail.com>
 

trunk/Source/WebKit2/PlatformEfl.cmake

@@ -137 +137 @@
     WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.cpp
 
+    WebProcess/WebPage/atk/WebPageAccessibilityObjectAtk.cpp
     WebProcess/WebPage/efl/WebInspectorEfl.cpp
     WebProcess/WebPage/efl/WebPageEfl.cpp
@@ -412 +413 @@
     )
 endif ()
+
+if (ENABLE_ACCESSIBILITY)
+    list(APPEND WebKit2_INCLUDE_DIRECTORIES
+        "${WEBKIT2_DIR}/WebProcess/WebPage/atk"
+        ${ATK_INCLUDE_DIRS}
+    )
+    list(APPEND WebKit2_LIBRARIES
+        ${ATK_LIBRARIES}
+    )
+endif ()

trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp

@@ -1482 +1482 @@
     webPage->injectedBundleLoaderClient().didClearWindowObjectForFrame(webPage, m_frame, world);
 
-#if PLATFORM(GTK)
+#if HAVE(ACCESSIBILITY) && (PLATFORM(GTK) || PLATFORM(EFL))
     // Ensure the accessibility hierarchy is updated.
     webPage->updateAccessibilityTree();

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h

@@ -79 +79 @@
 #endif
 
+#if HAVE(ACCESSIBILITY) && (PLATFORM(GTK) || PLATFORM(EFL))
+#include "WebPageAccessibilityObject.h"
+#include <wtf/gobject/GRefPtr.h>
+#endif
+
 #if PLATFORM(GTK)
 #include "ArgumentCodersGtk.h"
-#include "WebPageAccessibilityObject.h"
 #include "WebPrintOperationGtk.h"
 #endif
@@ -461 +465 @@
     void cancelComposition();
 #elif PLATFORM(GTK)
-    void updateAccessibilityTree();
 #if USE(TEXTURE_MAPPER_GL)
     void setAcceleratedCompositingWindowId(int64_t nativeWindowHandle);
 #endif
+#endif
+
+#if HAVE(ACCESSIBILITY) && (PLATFORM(GTK) || PLATFORM(EFL))
+    void updateAccessibilityTree();
 #endif
 
@@ -850 +857 @@
     WebCore::KeyboardEvent* m_keyboardEventBeingInterpreted;
 
-#elif PLATFORM(GTK)
+#elif HAVE(ACCESSIBILITY) && (PLATFORM(GTK) || PLATFORM(EFL))
     GRefPtr<WebPageAccessibilityObject> m_accessibilityObject;
 

trunk/Source/WebKit2/WebProcess/WebPage/atk/WebPageAccessibilityObjectAtk.cpp

@@ -76 +76 @@
 }
 
-static gint webPageAccessibilityObjectGetIndexInParent(AtkObject *atkObject)
+static gint webPageAccessibilityObjectGetIndexInParent(AtkObject*)
 {
     // An AtkPlug is the only child an AtkSocket can have.
@@ -107 +107 @@
 }
 
-static void web_page_accessibility_object_init(WebPageAccessibilityObject* accessible)
+static void web_page_accessibility_object_init(WebPageAccessibilityObject*)
 {
 }

trunk/Source/WebKit2/WebProcess/WebPage/efl/WebPageEfl.cpp

@@ -43 +43 @@
 #include <WebCore/Settings.h>
 
+#if HAVE(ACCESSIBILITY)
+#include "WebPageAccessibilityObject.h"
+#endif
+
 using namespace WebCore;
 
@@ -49 +53 @@
 void WebPage::platformInitialize()
 {
-    notImplemented();
-}
+#if HAVE(ACCESSIBILITY)
+    m_accessibilityObject = adoptGRef(webPageAccessibilityObjectNew(this));
+#else
+    notImplemented();
+#endif
+}
+
+#if HAVE(ACCESSIBILITY)
+void WebPage::updateAccessibilityTree()
+{
+    if (!m_accessibilityObject)
+        return;
+
+    webPageAccessibilityObjectRefresh(m_accessibilityObject.get());
+}
+#endif
 
 void WebPage::platformPreferencesDidChange(const WebPreferencesStore&)