Title: [134951] trunk/Source/WebKit2
Revision
134951
Author
commit-qu...@webkit.org
Date
2012-11-16 08:01:48 -0800 (Fri, 16 Nov 2012)

Log Message

[WK2][GTK][EFL] Share WebKit2-GTK's WebProcess Accessibility implementation with other WebKit ports.
https://bugs.webkit.org/show_bug.cgi?id=101748

Patch by Krzysztof Czech <k.cz...@samsung.com> on 2012-11-16
Reviewed by Martin Robinson.

Remove and rename files related to Accessibility from WebPage/gtk to WebPage/atk.

* GNUmakefile.am:
* GNUmakefile.list.am:
* WebProcess/WebPage/atk/WebPageAccessibilityObject.h: Renamed from Source/WebKit2/WebProcess/WebPage/gtk/WebPageAccessibilityObject.h.
(WebKit):
(_WebPageAccessibilityObject):
(_WebPageAccessibilityObjectClass):
* WebProcess/WebPage/atk/WebPageAccessibilityObjectAtk.cpp: Renamed from Source/WebKit2/WebProcess/WebPage/gtk/WebPageAccessibilityObject.cpp.
(accessibilityRootObjectWrapper):
(webPageAccessibilityObjectInitialize):
(webPageAccessibilityObjectGetIndexInParent):
(webPageAccessibilityObjectGetNChildren):
(webPageAccessibilityObjectRefChild):
(web_page_accessibility_object_init):
(web_page_accessibility_object_class_init):
(webPageAccessibilityObjectNew):
(webPageAccessibilityObjectRefresh):

Modified Paths

Added Paths

Removed Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (134950 => 134951)


--- trunk/Source/WebKit2/ChangeLog	2012-11-16 15:47:06 UTC (rev 134950)
+++ trunk/Source/WebKit2/ChangeLog	2012-11-16 16:01:48 UTC (rev 134951)
@@ -1,3 +1,29 @@
+2012-11-16  Krzysztof Czech  <k.cz...@samsung.com>
+
+        [WK2][GTK][EFL] Share WebKit2-GTK's WebProcess Accessibility implementation with other WebKit ports.
+        https://bugs.webkit.org/show_bug.cgi?id=101748
+
+        Reviewed by Martin Robinson.
+
+        Remove and rename files related to Accessibility from WebPage/gtk to WebPage/atk.
+
+        * GNUmakefile.am:
+        * GNUmakefile.list.am:
+        * WebProcess/WebPage/atk/WebPageAccessibilityObject.h: Renamed from Source/WebKit2/WebProcess/WebPage/gtk/WebPageAccessibilityObject.h.
+        (WebKit):
+        (_WebPageAccessibilityObject):
+        (_WebPageAccessibilityObjectClass):
+        * WebProcess/WebPage/atk/WebPageAccessibilityObjectAtk.cpp: Renamed from Source/WebKit2/WebProcess/WebPage/gtk/WebPageAccessibilityObject.cpp.
+        (accessibilityRootObjectWrapper):
+        (webPageAccessibilityObjectInitialize):
+        (webPageAccessibilityObjectGetIndexInParent):
+        (webPageAccessibilityObjectGetNChildren):
+        (webPageAccessibilityObjectRefChild):
+        (web_page_accessibility_object_init):
+        (web_page_accessibility_object_class_init):
+        (webPageAccessibilityObjectNew):
+        (webPageAccessibilityObjectRefresh):
+
 2012-11-16  Alexandru Chiculita  <ach...@adobe.com>
 
         [Texmap][CSS Shaders] Make the CustomFilterValidatedProgram maintain the platform compiled program

Modified: trunk/Source/WebKit2/GNUmakefile.am (134950 => 134951)


--- trunk/Source/WebKit2/GNUmakefile.am	2012-11-16 15:47:06 UTC (rev 134950)
+++ trunk/Source/WebKit2/GNUmakefile.am	2012-11-16 16:01:48 UTC (rev 134951)
@@ -88,6 +88,7 @@
 	-I$(srcdir)/Source/WebKit2/WebProcess/WebCoreSupport/gtk \
 	-I$(srcdir)/Source/WebKit2/WebProcess/WebCoreSupport/soup \
 	-I$(srcdir)/Source/WebKit2/WebProcess/WebPage \
+    -I$(srcdir)/Source/WebKit2/WebProcess/WebPage/atk \
 	-I$(srcdir)/Source/WebKit2/WebProcess/WebPage/gtk \
 	-I$(top_builddir)/DerivedSources/WebKit2 \
 	-I$(top_builddir)/DerivedSources/WebKit2/include \

Modified: trunk/Source/WebKit2/GNUmakefile.list.am (134950 => 134951)


--- trunk/Source/WebKit2/GNUmakefile.list.am	2012-11-16 15:47:06 UTC (rev 134950)
+++ trunk/Source/WebKit2/GNUmakefile.list.am	2012-11-16 16:01:48 UTC (rev 134951)
@@ -1167,9 +1167,9 @@
 	Source/WebKit2/WebProcess/WebPage/FindController.h \
 	Source/WebKit2/WebProcess/WebPage/TapHighlightController.cpp \
 	Source/WebKit2/WebProcess/WebPage/TapHighlightController.h \
+    Source/WebKit2/WebProcess/WebPage/atk/WebPageAccessibilityObject.h \
+    Source/WebKit2/WebProcess/WebPage/atk/WebPageAccessibilityObjectAtk.cpp \
 	Source/WebKit2/WebProcess/WebPage/gtk/WebInspectorGtk.cpp \
-	Source/WebKit2/WebProcess/WebPage/gtk/WebPageAccessibilityObject.h \
-	Source/WebKit2/WebProcess/WebPage/gtk/WebPageAccessibilityObject.cpp \
 	Source/WebKit2/WebProcess/WebPage/gtk/WebPageGtk.cpp \
 	Source/WebKit2/WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp \
 	Source/WebKit2/WebProcess/WebPage/gtk/WebPrintOperationGtk.h \

Copied: trunk/Source/WebKit2/WebProcess/WebPage/atk/WebPageAccessibilityObject.h (from rev 134950, trunk/Source/WebKit2/WebProcess/WebPage/gtk/WebPageAccessibilityObject.h) (0 => 134951)


--- trunk/Source/WebKit2/WebProcess/WebPage/atk/WebPageAccessibilityObject.h	                        (rev 0)
+++ trunk/Source/WebKit2/WebProcess/WebPage/atk/WebPageAccessibilityObject.h	2012-11-16 16:01:48 UTC (rev 134951)
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2012 Igalia S.L.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WebPageAccessibilityObject_h
+#define WebPageAccessibilityObject_h
+
+#include <atk/atk.h>
+
+namespace WebKit {
+class WebPage;
+}
+
+G_BEGIN_DECLS
+
+#define WEB_TYPE_PAGE_ACCESSIBILITY_OBJECT              (web_page_accessibility_object_get_type())
+#define WEB_PAGE_ACCESSIBILITY_OBJECT(object)           (G_TYPE_CHECK_INSTANCE_CAST((object), WEB_TYPE_PAGE_ACCESSIBILITY_OBJECT, WebPageAccessibilityObject))
+#define WEB_PAGE_ACCESSIBILITY_OBJECT_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST((klass), WEB_TYPE_PAGE_ACCESSIBILITY_OBJECT, WebPageAccessibilityObjectClass))
+#define WEB_IS_PAGE_ACCESSIBILITY_OBJECT(object)        (G_TYPE_CHECK_INSTANCE_TYPE((object), WEB_TYPE_PAGE_ACCESSIBILITY_OBJECT))
+#define WEB_IS_PAGE_ACCESSIBILITY_OBJECT_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE((klass), WEB_TYPE_PAGE_ACCESSIBILITY_OBJECT))
+#define WEB_PAGE_ACCESSIBILITY_OBJECT_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS((object), WEB_TYPE_PAGE_ACCESSIBILITY_OBJECT, WebPageAccessibilityObjectClass))
+
+typedef struct _WebPageAccessibilityObject WebPageAccessibilityObject;
+typedef struct _WebPageAccessibilityObjectClass WebPageAccessibilityObjectClass;
+
+struct _WebPageAccessibilityObject {
+    AtkPlug parent;
+    WebKit::WebPage* m_page;
+};
+
+struct _WebPageAccessibilityObjectClass {
+    AtkPlugClass parentClass;
+};
+
+GType web_page_accessibility_object_get_type();
+
+WebPageAccessibilityObject* webPageAccessibilityObjectNew(WebKit::WebPage*);
+
+void webPageAccessibilityObjectRefresh(WebPageAccessibilityObject*);
+
+G_END_DECLS
+
+#endif // WebPageAccessibilityObject_h

Copied: trunk/Source/WebKit2/WebProcess/WebPage/atk/WebPageAccessibilityObjectAtk.cpp (from rev 134950, trunk/Source/WebKit2/WebProcess/WebPage/gtk/WebPageAccessibilityObject.cpp) (0 => 134951)


--- trunk/Source/WebKit2/WebProcess/WebPage/atk/WebPageAccessibilityObjectAtk.cpp	                        (rev 0)
+++ trunk/Source/WebKit2/WebProcess/WebPage/atk/WebPageAccessibilityObjectAtk.cpp	2012-11-16 16:01:48 UTC (rev 134951)
@@ -0,0 +1,140 @@
+/*
+ * Copyright (C) 2012 Igalia S.L.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "WebPageAccessibilityObject.h"
+
+#include "WebPage.h"
+#include <WebCore/AXObjectCache.h>
+#include <WebCore/Frame.h>
+#include <WebCore/Page.h>
+
+using namespace WebKit;
+using namespace WebCore;
+
+G_DEFINE_TYPE(WebPageAccessibilityObject, web_page_accessibility_object, ATK_TYPE_PLUG)
+
+static AtkObject* accessibilityRootObjectWrapper(AtkObject* atkObject)
+{
+    if (!AXObjectCache::accessibilityEnabled())
+        AXObjectCache::enableAccessibility();
+
+    WebPageAccessibilityObject* accessible = WEB_PAGE_ACCESSIBILITY_OBJECT(atkObject);
+    if (!accessible->m_page)
+        return 0;
+
+    Page* corePage = accessible->m_page->corePage();
+    if (!corePage)
+        return 0;
+
+    Frame* coreFrame = corePage->mainFrame();
+    if (!coreFrame || !coreFrame->document())
+        return 0;
+
+    AccessibilityObject* coreRootObject = coreFrame->document()->axObjectCache()->rootObject();
+    if (!coreRootObject)
+        return 0;
+
+    AtkObject* rootObject = coreRootObject->wrapper();
+    if (!rootObject || !ATK_IS_OBJECT(rootObject))
+        return 0;
+
+    return rootObject;
+}
+
+static void webPageAccessibilityObjectInitialize(AtkObject* atkObject, gpointer data)
+{
+    if (ATK_OBJECT_CLASS(web_page_accessibility_object_parent_class)->initialize)
+        ATK_OBJECT_CLASS(web_page_accessibility_object_parent_class)->initialize(atkObject, data);
+
+    WEB_PAGE_ACCESSIBILITY_OBJECT(atkObject)->m_page = reinterpret_cast<WebPage*>(data);
+    atk_object_set_role(atkObject, ATK_ROLE_FILLER);
+}
+
+static gint webPageAccessibilityObjectGetIndexInParent(AtkObject *atkObject)
+{
+    // An AtkPlug is the only child an AtkSocket can have.
+    return 0;
+}
+
+static gint webPageAccessibilityObjectGetNChildren(AtkObject* atkObject)
+{
+    AtkObject* rootObject = accessibilityRootObjectWrapper(atkObject);
+    if (!rootObject)
+        return 0;
+
+    return 1;
+}
+
+static AtkObject* webPageAccessibilityObjectRefChild(AtkObject* atkObject, gint index)
+{
+    // It's supposed to have either one child or zero.
+    if (index && index != 1)
+        return 0;
+
+    AtkObject* rootObject = accessibilityRootObjectWrapper(atkObject);
+    if (!rootObject)
+        return 0;
+
+    atk_object_set_parent(rootObject, atkObject);
+    g_object_ref(rootObject);
+
+    return rootObject;
+}
+
+static void web_page_accessibility_object_init(WebPageAccessibilityObject* accessible)
+{
+}
+
+static void web_page_accessibility_object_class_init(WebPageAccessibilityObjectClass* klass)
+{
+    AtkObjectClass* atkObjectClass = ATK_OBJECT_CLASS(klass);
+
+    // No need to implement get_parent() here since this is a subclass
+    // of AtkPlug and all the logic related to that function will be
+    // implemented by the ATK bridge.
+    atkObjectClass->initialize = webPageAccessibilityObjectInitialize;
+    atkObjectClass->get_index_in_parent = webPageAccessibilityObjectGetIndexInParent;
+    atkObjectClass->get_n_children = webPageAccessibilityObjectGetNChildren;
+    atkObjectClass->ref_child = webPageAccessibilityObjectRefChild;
+}
+
+WebPageAccessibilityObject* webPageAccessibilityObjectNew(WebPage* page)
+{
+    AtkObject* object = ATK_OBJECT(g_object_new(WEB_TYPE_PAGE_ACCESSIBILITY_OBJECT, NULL));
+    atk_object_initialize(object, page);
+    return WEB_PAGE_ACCESSIBILITY_OBJECT(object);
+}
+
+void webPageAccessibilityObjectRefresh(WebPageAccessibilityObject* accessible)
+{
+    // We just need to ensure that there's a connection in the ATK
+    // world between this accessibility object and the AtkObject of
+    // the accessibility object for the root of the DOM tree.
+    AtkObject* rootObject = accessibilityRootObjectWrapper(ATK_OBJECT(accessible));
+    if (!rootObject)
+        return;
+    atk_object_set_parent(rootObject, ATK_OBJECT(accessible));
+}

Deleted: trunk/Source/WebKit2/WebProcess/WebPage/gtk/WebPageAccessibilityObject.cpp (134950 => 134951)


--- trunk/Source/WebKit2/WebProcess/WebPage/gtk/WebPageAccessibilityObject.cpp	2012-11-16 15:47:06 UTC (rev 134950)
+++ trunk/Source/WebKit2/WebProcess/WebPage/gtk/WebPageAccessibilityObject.cpp	2012-11-16 16:01:48 UTC (rev 134951)
@@ -1,140 +0,0 @@
-/*
- * Copyright (C) 2012 Igalia S.L.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "WebPageAccessibilityObject.h"
-
-#include "WebPage.h"
-#include <WebCore/AXObjectCache.h>
-#include <WebCore/Frame.h>
-#include <WebCore/Page.h>
-
-using namespace WebKit;
-using namespace WebCore;
-
-G_DEFINE_TYPE(WebPageAccessibilityObject, web_page_accessibility_object, ATK_TYPE_PLUG)
-
-static AtkObject* accessibilityRootObjectWrapper(AtkObject* atkObject)
-{
-    if (!AXObjectCache::accessibilityEnabled())
-        AXObjectCache::enableAccessibility();
-
-    WebPageAccessibilityObject* accessible = WEB_PAGE_ACCESSIBILITY_OBJECT(atkObject);
-    if (!accessible->m_page)
-        return 0;
-
-    Page* page = accessible->m_page->corePage();
-    if (!page)
-        return 0;
-
-    Frame* core = page->mainFrame();
-    if (!core || !core->document())
-        return 0;
-
-    AccessibilityObject* root = core->document()->axObjectCache()->rootObject();
-    if (!root)
-        return 0;
-
-    AtkObject* axRoot = root->wrapper();
-    if (!axRoot || !ATK_IS_OBJECT(axRoot))
-        return 0;
-
-    return axRoot;
-}
-
-static void webPageAccessibilityObjectInitialize(AtkObject* atkObject, gpointer data)
-{
-    if (ATK_OBJECT_CLASS(web_page_accessibility_object_parent_class)->initialize)
-        ATK_OBJECT_CLASS(web_page_accessibility_object_parent_class)->initialize(atkObject, data);
-
-    WEB_PAGE_ACCESSIBILITY_OBJECT(atkObject)->m_page = reinterpret_cast<WebPage*>(data);
-    atk_object_set_role(atkObject, ATK_ROLE_FILLER);
-}
-
-static gint webPageAccessibilityObjectGetIndexInParent(AtkObject *atkObject)
-{
-    // An AtkPlug is the only child an AtkSocket can have.
-    return 0;
-}
-
-static gint webPageAccessibilityObjectGetNChildren(AtkObject* atkObject)
-{
-    AtkObject* rootObject = accessibilityRootObjectWrapper(atkObject);
-    if (!rootObject)
-        return 0;
-
-    return 1;
-}
-
-static AtkObject* webPageAccessibilityObjectRefChild(AtkObject* atkObject, gint index)
-{
-    // It's supposed to have either one child or zero.
-    if (index && index != 1)
-        return 0;
-
-    AtkObject* rootObject = accessibilityRootObjectWrapper(atkObject);
-    if (!rootObject)
-        return 0;
-
-    atk_object_set_parent(rootObject, atkObject);
-    g_object_ref(rootObject);
-
-    return rootObject;
-}
-
-static void web_page_accessibility_object_init(WebPageAccessibilityObject* accessible)
-{
-}
-
-static void web_page_accessibility_object_class_init(WebPageAccessibilityObjectClass* klass)
-{
-    AtkObjectClass* atkObjectClass = ATK_OBJECT_CLASS(klass);
-
-    // No need to implement get_parent() here since this is a subclass
-    // of AtkPlug and all the logic related to that function will be
-    // implemented by the ATK bridge.
-    atkObjectClass->initialize = webPageAccessibilityObjectInitialize;
-    atkObjectClass->get_index_in_parent = webPageAccessibilityObjectGetIndexInParent;
-    atkObjectClass->get_n_children = webPageAccessibilityObjectGetNChildren;
-    atkObjectClass->ref_child = webPageAccessibilityObjectRefChild;
-}
-
-WebPageAccessibilityObject* webPageAccessibilityObjectNew(WebPage* page)
-{
-    AtkObject* object = ATK_OBJECT(g_object_new(WEB_TYPE_PAGE_ACCESSIBILITY_OBJECT, NULL));
-    atk_object_initialize(object, page);
-    return WEB_PAGE_ACCESSIBILITY_OBJECT(object);
-}
-
-void webPageAccessibilityObjectRefresh(WebPageAccessibilityObject* accessible)
-{
-    // We just need to ensure that there's a connection in the ATK
-    // world between this accessibility object and the AtkObject of
-    // the accessibility object for the root of the DOM tree.
-    AtkObject* rootObject = accessibilityRootObjectWrapper(ATK_OBJECT(accessible));
-    if (!rootObject)
-        return;
-    atk_object_set_parent(rootObject, ATK_OBJECT(accessible));
-}

Deleted: trunk/Source/WebKit2/WebProcess/WebPage/gtk/WebPageAccessibilityObject.h (134950 => 134951)


--- trunk/Source/WebKit2/WebProcess/WebPage/gtk/WebPageAccessibilityObject.h	2012-11-16 15:47:06 UTC (rev 134950)
+++ trunk/Source/WebKit2/WebProcess/WebPage/gtk/WebPageAccessibilityObject.h	2012-11-16 16:01:48 UTC (rev 134951)
@@ -1,64 +0,0 @@
-/*
- * Copyright (C) 2012 Igalia S.L.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WebPageAccessibilityObject_h
-#define WebPageAccessibilityObject_h
-
-#include <atk/atk.h>
-
-namespace WebKit {
-class WebPage;
-}
-
-G_BEGIN_DECLS
-
-#define WEB_TYPE_PAGE_ACCESSIBILITY_OBJECT              (web_page_accessibility_object_get_type())
-#define WEB_PAGE_ACCESSIBILITY_OBJECT(object)           (G_TYPE_CHECK_INSTANCE_CAST((object), WEB_TYPE_PAGE_ACCESSIBILITY_OBJECT, WebPageAccessibilityObject))
-#define WEB_PAGE_ACCESSIBILITY_OBJECT_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST((klass), WEB_TYPE_PAGE_ACCESSIBILITY_OBJECT, WebPageAccessibilityObjectClass))
-#define WEB_IS_PAGE_ACCESSIBILITY_OBJECT(object)        (G_TYPE_CHECK_INSTANCE_TYPE((object), WEB_TYPE_PAGE_ACCESSIBILITY_OBJECT))
-#define WEB_IS_PAGE_ACCESSIBILITY_OBJECT_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE((klass), WEB_TYPE_PAGE_ACCESSIBILITY_OBJECT))
-#define WEB_PAGE_ACCESSIBILITY_OBJECT_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS((object), WEB_TYPE_PAGE_ACCESSIBILITY_OBJECT, WebPageAccessibilityObjectClass))
-
-typedef struct _WebPageAccessibilityObject WebPageAccessibilityObject;
-typedef struct _WebPageAccessibilityObjectClass WebPageAccessibilityObjectClass;
-
-struct _WebPageAccessibilityObject {
-    AtkPlug parent;
-    WebKit::WebPage* m_page;
-};
-
-struct _WebPageAccessibilityObjectClass {
-    AtkPlugClass parentClass;
-};
-
-GType web_page_accessibility_object_get_type();
-
-WebPageAccessibilityObject* webPageAccessibilityObjectNew(WebKit::WebPage*);
-
-void webPageAccessibilityObjectRefresh(WebPageAccessibilityObject*);
-
-G_END_DECLS
-
-#endif // WebPageAccessibilityObject_h
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to