Changeset 243861 in webkit

Timestamp:

Apr 3, 2019 10:50:22 PM (5 years ago)

Author:

Carlos Garcia Campos

Message:

[ATK] Embed the AtkSocket as soon as we receive the plug ID
​https://bugs.webkit.org/show_bug.cgi?id=196534

Reviewed by Michael Catanzaro.

We are currently storing the ID and waiting for the next time get_accessible is called to embed the socket. We
can simply embed the socket when the plug ID is received.

• UIProcess/API/gtk/WebKitWebViewBase.cpp:

(webkitWebViewBaseGetAccessible):

• UIProcess/WebPageProxy.h:
• UIProcess/gtk/WebPageProxyGtk.cpp:

(WebKit::WebPageProxy::bindAccessibilityTree):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/gtk/WebKitWebViewBase.cpp (modified) (1 diff)
• UIProcess/WebPageProxy.h (modified) (2 diffs)
• UIProcess/gtk/WebPageProxyGtk.cpp (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-04-03  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [ATK] Embed the AtkSocket as soon as we receive the plug ID
+        https://bugs.webkit.org/show_bug.cgi?id=196534
+
+        Reviewed by Michael Catanzaro.
+
+        We are currently storing the ID and waiting for the next time get_accessible is called to embed the socket. We
+        can simply embed the socket when the plug ID is received.
+
+        * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+        (webkitWebViewBaseGetAccessible):
+        * UIProcess/WebPageProxy.h:
+        * UIProcess/gtk/WebPageProxyGtk.cpp:
+        (WebKit::WebPageProxy::bindAccessibilityTree):
+
 2019-04-03  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp

@@ -1229 +1229 @@
 static AtkObject* webkitWebViewBaseGetAccessible(GtkWidget* widget)
 {
-    // If the socket has already been created and embedded a plug ID, return it.
     WebKitWebViewBasePrivate* priv = WEBKIT_WEB_VIEW_BASE(widget)->priv;
-    if (priv->accessible && atk_socket_is_occupied(ATK_SOCKET(priv->accessible.get())))
-        return priv->accessible.get();
-
-    // Create the accessible object and associate it to the widget.
     if (!priv->accessible) {
+        // Create the accessible object and associate it to the widget.
         priv->accessible = adoptGRef(ATK_OBJECT(webkitWebViewBaseAccessibleNew(widget)));
 
-        // Set the parent not to break bottom-up navigation.
-        GtkWidget* parentWidget = gtk_widget_get_parent(widget);
-        AtkObject* axParent = parentWidget ? gtk_widget_get_accessible(parentWidget) : 0;
-        if (axParent)
-            atk_object_set_parent(priv->accessible.get(), axParent);
-    }
-
-    // Try to embed the plug in the socket, if posssible.
-    String plugID = priv->pageProxy->accessibilityPlugID();
-    if (plugID.isNull())
-        return priv->accessible.get();
-
-    atk_socket_embed(ATK_SOCKET(priv->accessible.get()), const_cast<gchar*>(plugID.utf8().data()));
+        // Set the parent to not break bottom-up navigation.
+        if (auto* parentWidget = gtk_widget_get_parent(widget)) {
+            if (auto* axParent = gtk_widget_get_accessible(parentWidget))
+                atk_object_set_parent(priv->accessible.get(), axParent);
+        }
+    }
 
     return priv->accessible.get();

trunk/Source/WebKit/UIProcess/WebPageProxy.h

@@ -1124 +1124 @@
 #endif
 
-#if PLATFORM(GTK)
-    String accessibilityPlugID() const { return m_accessibilityPlugID; }
-#endif
-
     void setCanRunModal(bool);
     bool canRunModal();
@@ -2305 +2301 @@
 #endif
 
-#if PLATFORM(GTK)
-    String m_accessibilityPlugID;
-#endif
-
     Optional<WebCore::Color> m_backgroundColor;
 

trunk/Source/WebKit/UIProcess/gtk/WebPageProxyGtk.cpp

@@ -58 +58 @@
 void WebPageProxy::bindAccessibilityTree(const String& plugID)
 {
-    m_accessibilityPlugID = plugID;
+    auto* accessible = gtk_widget_get_accessible(viewWidget());
+    atk_socket_embed(ATK_SOCKET(accessible), const_cast<char*>(plugID.utf8().data()));
 }