Title: [280137] releases/WebKitGTK/webkit-2.32/Source/WebKit
- Revision
- 280137
- Author
- [email protected]
- Date
- 2021-07-21 07:45:06 -0700 (Wed, 21 Jul 2021)
Log Message
Merge r280074 - [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: releases/WebKitGTK/webkit-2.32/Source/WebKit/ChangeLog (280136 => 280137)
--- releases/WebKitGTK/webkit-2.32/Source/WebKit/ChangeLog 2021-07-21 14:45:00 UTC (rev 280136)
+++ releases/WebKitGTK/webkit-2.32/Source/WebKit/ChangeLog 2021-07-21 14:45:06 UTC (rev 280137)
@@ -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-16 Carlos Garcia Campos <[email protected]>
[GTK][WPE] PSON: accessibility doesn't work after a cross site navigation
Modified: releases/WebKitGTK/webkit-2.32/Source/WebKit/UIProcess/WebPageProxy.h (280136 => 280137)
--- releases/WebKitGTK/webkit-2.32/Source/WebKit/UIProcess/WebPageProxy.h 2021-07-21 14:45:00 UTC (rev 280136)
+++ releases/WebKitGTK/webkit-2.32/Source/WebKit/UIProcess/WebPageProxy.h 2021-07-21 14:45:06 UTC (rev 280137)
@@ -2126,8 +2126,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: releases/WebKitGTK/webkit-2.32/Source/WebKit/UIProcess/WebPageProxy.messages.in (280136 => 280137)
--- releases/WebKitGTK/webkit-2.32/Source/WebKit/UIProcess/WebPageProxy.messages.in 2021-07-21 14:45:00 UTC (rev 280136)
+++ releases/WebKitGTK/webkit-2.32/Source/WebKit/UIProcess/WebPageProxy.messages.in 2021-07-21 14:45:06 UTC (rev 280137)
@@ -181,12 +181,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(Optional<WebKit::InputMethodState> state);
#endif
Modified: releases/WebKitGTK/webkit-2.32/Source/WebKit/UIProcess/wpe/WebPageProxyWPE.cpp (280136 => 280137)
--- releases/WebKitGTK/webkit-2.32/Source/WebKit/UIProcess/wpe/WebPageProxyWPE.cpp 2021-07-21 14:45:00 UTC (rev 280136)
+++ releases/WebKitGTK/webkit-2.32/Source/WebKit/UIProcess/wpe/WebPageProxyWPE.cpp 2021-07-21 14:45:06 UTC (rev 280137)
@@ -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::updateEditorState(const EditorState& editorState)
{
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
