<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[280137] releases/WebKitGTK/webkit-2.32/Source/WebKit</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/280137">280137</a></dd>
<dt>Author</dt> <dd>aperez@igalia.com</dd>
<dt>Date</dt> <dd>2021-07-21 07:45:06 -0700 (Wed, 21 Jul 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/280074">r280074</a> - [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):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit232SourceWebKitChangeLog">releases/WebKitGTK/webkit-2.32/Source/WebKit/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit232SourceWebKitUIProcessWebPageProxyh">releases/WebKitGTK/webkit-2.32/Source/WebKit/UIProcess/WebPageProxy.h</a></li>
<li><a href="#releasesWebKitGTKwebkit232SourceWebKitUIProcessWebPageProxymessagesin">releases/WebKitGTK/webkit-2.32/Source/WebKit/UIProcess/WebPageProxy.messages.in</a></li>
<li><a href="#releasesWebKitGTKwebkit232SourceWebKitUIProcesswpeWebPageProxyWPEcpp">releases/WebKitGTK/webkit-2.32/Source/WebKit/UIProcess/wpe/WebPageProxyWPE.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit232SourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.32/Source/WebKit/ChangeLog (280136 => 280137)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2021-07-20  Víctor Manuel Jáquez Leal  <vjaquez@igalia.com>
+
+        [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):
+
</ins><span class="cx"> 2021-07-16  Carlos Garcia Campos  <cgarcia@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         [GTK][WPE] PSON: accessibility doesn't work after a cross site navigation
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit232SourceWebKitUIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.32/Source/WebKit/UIProcess/WebPageProxy.h (280136 => 280137)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -2126,8 +2126,11 @@
</span><span class="cx">     void getEditorCommandsForKeyEvent(const AtomString&, Vector<String>&);
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-#if USE(ATK)
</del><ins>+#if PLATFORM(GTK) || PLATFORM(WPE)
</ins><span class="cx">     void bindAccessibilityTree(const String&);
</span><ins>+#endif
+
+#if PLATFORM(GTK)
</ins><span class="cx">     void showEmojiPicker(const WebCore::IntRect&, CompletionHandler<void(String)>&&);
</span><span class="cx"> #endif
</span><span class="cx"> 
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit232SourceWebKitUIProcessWebPageProxymessagesin"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.32/Source/WebKit/UIProcess/WebPageProxy.messages.in (280136 => 280137)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -181,12 +181,10 @@
</span><span class="cx">     PluginScaleFactorDidChange(double zoomFactor)
</span><span class="cx">     PluginZoomFactorDidChange(double zoomFactor)
</span><span class="cx"> 
</span><del>-#if USE(ATK)
</del><ins>+#if PLATFORM(GTK) || PLATFORM(WPE)
</ins><span class="cx">     # Support for connecting the Accessibility worlds of the UI and the Web processes
</span><span class="cx">     BindAccessibilityTree(String plugID)
</span><del>-#endif
</del><span class="cx"> 
</span><del>-#if PLATFORM(GTK) || PLATFORM(WPE)
</del><span class="cx">     SetInputMethodState(Optional<WebKit::InputMethodState> state);
</span><span class="cx"> #endif
</span><span class="cx"> 
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit232SourceWebKitUIProcesswpeWebPageProxyWPEcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.32/Source/WebKit/UIProcess/wpe/WebPageProxyWPE.cpp (280136 => 280137)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -45,14 +45,14 @@
</span><span class="cx">     return static_cast<PageClientImpl&>(pageClient()).viewBackend();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#if USE(ATK)
</del><span class="cx"> void WebPageProxy::bindAccessibilityTree(const String& plugID)
</span><span class="cx"> {
</span><ins>+#if USE(ATK)
</ins><span class="cx">     auto* accessible = static_cast<PageClientImpl&>(pageClient()).accessible();
</span><span class="cx">     atk_socket_embed(ATK_SOCKET(accessible), const_cast<char*>(plugID.utf8().data()));
</span><span class="cx">     atk_object_notify_state_change(accessible, ATK_STATE_TRANSIENT, FALSE);
</span><ins>+#endif
</ins><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx"> void WebPageProxy::updateEditorState(const EditorState& editorState)
</span><span class="cx"> {
</span></span></pre>
</div>
</div>

</body>
</html>