Title: [174043] trunk/Source/WebCore
Revision
174043
Author
[email protected]
Date
2014-09-28 01:18:07 -0700 (Sun, 28 Sep 2014)

Log Message

[ATK] WebKitAccessibleWrapperAtk should not depend on GTK
https://bugs.webkit.org/show_bug.cgi?id=137177

Reviewed by Martin Robinson.

It's used to get the web view widget, but there's no GtkWidget in
the web process and platformPageClient is always NULL.

* PlatformGTK.cmake: Move accessibility sources to the WebCore
sources list.
* accessibility/atk/WebKitAccessibleWrapperAtk.cpp:
(atkParentOfRootObject): Remove code to get view GtkWidget.
* editing/atk/FrameSelectionAtk.cpp: Remove unneeded header include.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (174042 => 174043)


--- trunk/Source/WebCore/ChangeLog	2014-09-28 08:14:51 UTC (rev 174042)
+++ trunk/Source/WebCore/ChangeLog	2014-09-28 08:18:07 UTC (rev 174043)
@@ -1,5 +1,21 @@
 2014-09-28  Carlos Garcia Campos  <[email protected]>
 
+        [ATK] WebKitAccessibleWrapperAtk should not depend on GTK
+        https://bugs.webkit.org/show_bug.cgi?id=137177
+
+        Reviewed by Martin Robinson.
+
+        It's used to get the web view widget, but there's no GtkWidget in
+        the web process and platformPageClient is always NULL.
+
+        * PlatformGTK.cmake: Move accessibility sources to the WebCore
+        sources list.
+        * accessibility/atk/WebKitAccessibleWrapperAtk.cpp:
+        (atkParentOfRootObject): Remove code to get view GtkWidget.
+        * editing/atk/FrameSelectionAtk.cpp: Remove unneeded header include.
+
+2014-09-28  Carlos Garcia Campos  <[email protected]>
+
         [GTK] Remove unused GtkPluginWidget
         https://bugs.webkit.org/show_bug.cgi?id=137176
 

Modified: trunk/Source/WebCore/PlatformGTK.cmake (174042 => 174043)


--- trunk/Source/WebCore/PlatformGTK.cmake	2014-09-28 08:14:51 UTC (rev 174042)
+++ trunk/Source/WebCore/PlatformGTK.cmake	2014-09-28 08:18:07 UTC (rev 174043)
@@ -25,6 +25,25 @@
 )
 
 list(APPEND WebCore_SOURCES
+    accessibility/atk/AXObjectCacheAtk.cpp
+    accessibility/atk/AccessibilityObjectAtk.cpp
+    accessibility/atk/WebKitAccessibleHyperlink.cpp
+    accessibility/atk/WebKitAccessibleInterfaceAction.cpp
+    accessibility/atk/WebKitAccessibleInterfaceComponent.cpp
+    accessibility/atk/WebKitAccessibleInterfaceDocument.cpp
+    accessibility/atk/WebKitAccessibleInterfaceEditableText.cpp
+    accessibility/atk/WebKitAccessibleInterfaceHyperlinkImpl.cpp
+    accessibility/atk/WebKitAccessibleInterfaceHypertext.cpp
+    accessibility/atk/WebKitAccessibleInterfaceImage.cpp
+    accessibility/atk/WebKitAccessibleInterfaceSelection.cpp
+    accessibility/atk/WebKitAccessibleInterfaceTable.cpp
+    accessibility/atk/WebKitAccessibleInterfaceTableCell.cpp
+    accessibility/atk/WebKitAccessibleInterfaceText.cpp
+    accessibility/atk/WebKitAccessibleInterfaceValue.cpp
+    accessibility/atk/WebKitAccessibleUtil.cpp
+    accessibility/atk/WebKitAccessibleWrapperAtk.cpp
+
+    editing/atk/FrameSelectionAtk.cpp
     editing/SmartReplace.cpp
 
     loader/soup/CachedRawResourceSoup.cpp
@@ -162,25 +181,6 @@
 )
 
 list(APPEND WebCorePlatformGTK_SOURCES
-    accessibility/atk/AXObjectCacheAtk.cpp
-    accessibility/atk/AccessibilityObjectAtk.cpp
-    accessibility/atk/WebKitAccessibleHyperlink.cpp
-    accessibility/atk/WebKitAccessibleInterfaceAction.cpp
-    accessibility/atk/WebKitAccessibleInterfaceComponent.cpp
-    accessibility/atk/WebKitAccessibleInterfaceDocument.cpp
-    accessibility/atk/WebKitAccessibleInterfaceEditableText.cpp
-    accessibility/atk/WebKitAccessibleInterfaceHyperlinkImpl.cpp
-    accessibility/atk/WebKitAccessibleInterfaceHypertext.cpp
-    accessibility/atk/WebKitAccessibleInterfaceImage.cpp
-    accessibility/atk/WebKitAccessibleInterfaceSelection.cpp
-    accessibility/atk/WebKitAccessibleInterfaceTable.cpp
-    accessibility/atk/WebKitAccessibleInterfaceTableCell.cpp
-    accessibility/atk/WebKitAccessibleInterfaceText.cpp
-    accessibility/atk/WebKitAccessibleInterfaceValue.cpp
-    accessibility/atk/WebKitAccessibleUtil.cpp
-    accessibility/atk/WebKitAccessibleWrapperAtk.cpp
-
-    editing/atk/FrameSelectionAtk.cpp
     editing/gtk/EditorGtk.cpp
 
     page/gtk/DragControllerGtk.cpp

Modified: trunk/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp (174042 => 174043)


--- trunk/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp	2014-09-28 08:14:51 UTC (rev 174042)
+++ trunk/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp	2014-09-28 08:18:07 UTC (rev 174043)
@@ -65,10 +65,6 @@
 #include <glib/gprintf.h>
 #include <wtf/text/CString.h>
 
-#if PLATFORM(GTK)
-#include <gtk/gtk.h>
-#endif
-
 using namespace WebCore;
 
 struct _WebKitAccessiblePrivate {
@@ -294,18 +290,6 @@
         Document* document = coreObject->document();
         if (!document)
             return 0;
-
-#if PLATFORM(GTK)
-        HostWindow* hostWindow = document->view()->hostWindow();
-        if (hostWindow) {
-            PlatformPageClient scrollView = hostWindow->platformPageClient();
-            if (scrollView) {
-                GtkWidget* scrollViewParent = gtk_widget_get_parent(scrollView);
-                if (scrollViewParent)
-                    return gtk_widget_get_accessible(scrollViewParent);
-            }
-        }
-#endif // PLATFORM(GTK)
     }
 
     if (!coreParent)

Modified: trunk/Source/WebCore/editing/atk/FrameSelectionAtk.cpp (174042 => 174043)


--- trunk/Source/WebCore/editing/atk/FrameSelectionAtk.cpp	2014-09-28 08:14:51 UTC (rev 174042)
+++ trunk/Source/WebCore/editing/atk/FrameSelectionAtk.cpp	2014-09-28 08:18:07 UTC (rev 174043)
@@ -26,13 +26,7 @@
 #include "Document.h"
 #include "Frame.h"
 #include "WebKitAccessibleWrapperAtk.h"
-
-#if PLATFORM(EFL)
 #include <glib.h>
-#else
-#include <gtk/gtk.h>
-#endif
-
 #include <wtf/NeverDestroyed.h>
 #include <wtf/RefPtr.h>
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to