Title: [280074] trunk/Source/WebKit
Revision
280074
Author
[email protected]
Date
2021-07-20 03:25:10 -0700 (Tue, 20 Jul 2021)

Log Message

[GTK][WPE] Fix compilation when ATK is not used
https://bugs.webkit.org/show_bug.cgi?id=228077

Reviewed by Carlos Garcia Campos.

Guard ATK only inside implementations, so the code is more readable.

Also changed guard from ATK to GTK platform showEmojiPicker().

No new tests needed.

* UIProcess/WebPageProxy.h:
* UIProcess/WebPageProxy.messages.in:
* UIProcess/wpe/WebPageProxyWPE.cpp:
(WebKit::WebPageProxy::bindAccessibilityTree):

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (280073 => 280074)


--- trunk/Source/WebKit/ChangeLog	2021-07-20 02:19:55 UTC (rev 280073)
+++ trunk/Source/WebKit/ChangeLog	2021-07-20 10:25:10 UTC (rev 280074)
@@ -1,3 +1,21 @@
+2021-07-20  Víctor Manuel Jáquez Leal  <[email protected]>
+
+        [GTK][WPE] Fix compilation when ATK is not used
+        https://bugs.webkit.org/show_bug.cgi?id=228077
+
+        Reviewed by Carlos Garcia Campos.
+
+        Guard ATK only inside implementations, so the code is more readable.
+
+        Also changed guard from ATK to GTK platform showEmojiPicker().
+
+        No new tests needed.
+
+        * UIProcess/WebPageProxy.h:
+        * UIProcess/WebPageProxy.messages.in:
+        * UIProcess/wpe/WebPageProxyWPE.cpp:
+        (WebKit::WebPageProxy::bindAccessibilityTree):
+
 2021-07-19  Wenson Hsieh  <[email protected]>
 
         [iOS] Tapping images on twitter.com should not toggle tab bar visibility

Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.h (280073 => 280074)


--- trunk/Source/WebKit/UIProcess/WebPageProxy.h	2021-07-20 02:19:55 UTC (rev 280073)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.h	2021-07-20 10:25:10 UTC (rev 280074)
@@ -2216,8 +2216,11 @@
     void getEditorCommandsForKeyEvent(const AtomString&, Vector<String>&);
 #endif
 
-#if USE(ATK)
+#if PLATFORM(GTK) || PLATFORM(WPE)
     void bindAccessibilityTree(const String&);
+#endif
+
+#if PLATFORM(GTK)
     void showEmojiPicker(const WebCore::IntRect&, CompletionHandler<void(String)>&&);
 #endif
 

Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in (280073 => 280074)


--- trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in	2021-07-20 02:19:55 UTC (rev 280073)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.messages.in	2021-07-20 10:25:10 UTC (rev 280074)
@@ -184,12 +184,10 @@
     PluginScaleFactorDidChange(double zoomFactor)
     PluginZoomFactorDidChange(double zoomFactor)
 
-#if USE(ATK)
+#if PLATFORM(GTK) || PLATFORM(WPE)
     # Support for connecting the Accessibility worlds of the UI and the Web processes
     BindAccessibilityTree(String plugID)
-#endif
 
-#if PLATFORM(GTK) || PLATFORM(WPE)
     SetInputMethodState(std::optional<WebKit::InputMethodState> state);
 #endif
 

Modified: trunk/Source/WebKit/UIProcess/wpe/WebPageProxyWPE.cpp (280073 => 280074)


--- trunk/Source/WebKit/UIProcess/wpe/WebPageProxyWPE.cpp	2021-07-20 02:19:55 UTC (rev 280073)
+++ trunk/Source/WebKit/UIProcess/wpe/WebPageProxyWPE.cpp	2021-07-20 10:25:10 UTC (rev 280074)
@@ -45,14 +45,14 @@
     return static_cast<PageClientImpl&>(pageClient()).viewBackend();
 }
 
-#if USE(ATK)
 void WebPageProxy::bindAccessibilityTree(const String& plugID)
 {
+#if USE(ATK)
     auto* accessible = static_cast<PageClientImpl&>(pageClient()).accessible();
     atk_socket_embed(ATK_SOCKET(accessible), const_cast<char*>(plugID.utf8().data()));
     atk_object_notify_state_change(accessible, ATK_STATE_TRANSIENT, FALSE);
+#endif
 }
-#endif
 
 void WebPageProxy::didUpdateEditorState(const EditorState&, const EditorState& newEditorState)
 {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to