<!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>[191447] trunk/Source/WebKit2</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/191447">191447</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-10-22 01:08:23 -0700 (Thu, 22 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Try to fix the build after <a href="http://trac.webkit.org/projects/webkit/changeset/191402">r191402</a>.
https://bugs.webkit.org/show_bug.cgi?id=150435
Patch by Hunseop Jeong <hs85.jeong@samsung.com> on 2015-10-22
Reviewed by Carlos Garcia Campos.
* UIProcess/API/gtk/PageClientImpl.cpp:
(WebKit::PageClientImpl::createPopupMenuProxy):
(WebKit::PageClientImpl::createContextMenuProxy):
(WebKit::PageClientImpl::createColorPicker):
* UIProcess/API/gtk/PageClientImpl.h:
* UIProcess/gtk/WebContextMenuProxyGtk.cpp:
(WebKit::WebContextMenuProxyGtk::populate):
(WebKit::WebContextMenuProxyGtk::show):
(WebKit::WebContextMenuProxyGtk::WebContextMenuProxyGtk):
(WebKit::WebContextMenuProxyGtk::~WebContextMenuProxyGtk):
(WebKit::WebContextMenuProxyGtk::menuPositionFunction):
(WebKit::WebContextMenuProxyGtk::showContextMenu): Deleted.
(WebKit::WebContextMenuProxyGtk::hideContextMenu): Deleted.
(WebKit::WebContextMenuProxyGtk::cancelTracking): Deleted.
* UIProcess/gtk/WebContextMenuProxyGtk.h:
(WebKit::WebContextMenuProxyGtk::gtkMenu):
(WebKit::WebContextMenuProxyGtk::create): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkPageClientImplcpp">trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkPageClientImplh">trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessgtkWebContextMenuProxyGtkcpp">trunk/Source/WebKit2/UIProcess/gtk/WebContextMenuProxyGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessgtkWebContextMenuProxyGtkh">trunk/Source/WebKit2/UIProcess/gtk/WebContextMenuProxyGtk.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (191446 => 191447)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-10-22 07:51:08 UTC (rev 191446)
+++ trunk/Source/WebKit2/ChangeLog 2015-10-22 08:08:23 UTC (rev 191447)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2015-10-22 Hunseop Jeong <hs85.jeong@samsung.com>
+
+ [GTK] Try to fix the build after r191402.
+ https://bugs.webkit.org/show_bug.cgi?id=150435
+
+ Reviewed by Carlos Garcia Campos.
+
+ * UIProcess/API/gtk/PageClientImpl.cpp:
+ (WebKit::PageClientImpl::createPopupMenuProxy):
+ (WebKit::PageClientImpl::createContextMenuProxy):
+ (WebKit::PageClientImpl::createColorPicker):
+ * UIProcess/API/gtk/PageClientImpl.h:
+ * UIProcess/gtk/WebContextMenuProxyGtk.cpp:
+ (WebKit::WebContextMenuProxyGtk::populate):
+ (WebKit::WebContextMenuProxyGtk::show):
+ (WebKit::WebContextMenuProxyGtk::WebContextMenuProxyGtk):
+ (WebKit::WebContextMenuProxyGtk::~WebContextMenuProxyGtk):
+ (WebKit::WebContextMenuProxyGtk::menuPositionFunction):
+ (WebKit::WebContextMenuProxyGtk::showContextMenu): Deleted.
+ (WebKit::WebContextMenuProxyGtk::hideContextMenu): Deleted.
+ (WebKit::WebContextMenuProxyGtk::cancelTracking): Deleted.
+ * UIProcess/gtk/WebContextMenuProxyGtk.h:
+ (WebKit::WebContextMenuProxyGtk::gtkMenu):
+ (WebKit::WebContextMenuProxyGtk::create): Deleted.
+
</ins><span class="cx"> 2015-10-21 Gyuyoung Kim <gyuyoung.kim@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed EFL build fix. Remove customizeMenu implementation.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkPageClientImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp (191446 => 191447)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp 2015-10-22 07:51:08 UTC (rev 191446)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp 2015-10-22 08:08:23 UTC (rev 191447)
</span><span class="lines">@@ -211,9 +211,9 @@
</span><span class="cx"> return WebPopupMenuProxyGtk::create(m_viewWidget, page);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<WebContextMenuProxy> PageClientImpl::createContextMenuProxy(WebPageProxy& page, const ContextMenuContextData& context, const UserData& userData)
</del><ins>+std::unique_ptr<WebContextMenuProxy> PageClientImpl::createContextMenuProxy(WebPageProxy& page, const ContextMenuContextData& context, const UserData& userData)
</ins><span class="cx"> {
</span><del>- return WebContextMenuProxyGtk::create(m_viewWidget, page, context, userData);
</del><ins>+ return std::make_unique<WebContextMenuProxyGtk>(m_viewWidget, page, context, userData);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<WebColorPicker> PageClientImpl::createColorPicker(WebPageProxy* page, const WebCore::Color& color, const WebCore::IntRect& rect)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkPageClientImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h (191446 => 191447)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h 2015-10-22 07:51:08 UTC (rev 191446)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h 2015-10-22 08:08:23 UTC (rev 191447)
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> virtual WebCore::IntRect rootViewToScreen(const WebCore::IntRect&) override;
</span><span class="cx"> virtual void doneWithKeyEvent(const NativeWebKeyboardEvent&, bool wasEventHandled) override;
</span><span class="cx"> virtual RefPtr<WebPopupMenuProxy> createPopupMenuProxy(WebPageProxy&) override;
</span><del>- virtual RefPtr<WebContextMenuProxy> createContextMenuProxy(WebPageProxy&, const ContextMenuContextData&, const UserData&) override;
</del><ins>+ virtual std::unique_ptr<WebContextMenuProxy> createContextMenuProxy(WebPageProxy&, const ContextMenuContextData&, const UserData&) override;
</ins><span class="cx"> #if ENABLE(INPUT_TYPE_COLOR)
</span><span class="cx"> virtual RefPtr<WebColorPicker> createColorPicker(WebPageProxy*, const WebCore::Color& intialColor, const WebCore::IntRect&) override;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessgtkWebContextMenuProxyGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/gtk/WebContextMenuProxyGtk.cpp (191446 => 191447)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/gtk/WebContextMenuProxyGtk.cpp 2015-10-22 07:51:08 UTC (rev 191446)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebContextMenuProxyGtk.cpp 2015-10-22 08:08:23 UTC (rev 191447)
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebContextMenuProxyGtk::showContextMenu()
</del><ins>+void WebContextMenuProxyGtk::show()
</ins><span class="cx"> {
</span><span class="cx"> Vector<RefPtr<WebContextMenuItem>> proposedAPIItems;
</span><span class="cx"> for (auto& item : m_context.menuItems()) {
</span><span class="lines">@@ -173,11 +173,6 @@
</span><span class="cx"> event ? event->button.button : 3, event ? event->button.time : GDK_CURRENT_TIME);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebContextMenuProxyGtk::hideContextMenu()
-{
- gtk_menu_popdown(m_menu.platformDescription());
-}
-
</del><span class="cx"> WebContextMenuProxyGtk::WebContextMenuProxyGtk(GtkWidget* webView, WebPageProxy& page, const ContextMenuContextData& context, const UserData& userData)
</span><span class="cx"> : WebContextMenuProxy(context, userData)
</span><span class="cx"> , m_webView(webView)
</span><span class="lines">@@ -188,7 +183,14 @@
</span><span class="cx">
</span><span class="cx"> WebContextMenuProxyGtk::~WebContextMenuProxyGtk()
</span><span class="cx"> {
</span><del>- cancelTracking();
</del><ins>+ gtk_menu_popdown(m_menu.platformDescription());
+
+ for (auto& handler : m_signalHandlers)
+ g_signal_handler_disconnect(handler.value, handler.key);
+ m_signalHandlers.clear();
+
+ webkitWebViewBaseSetActiveContextMenuProxy(WEBKIT_WEB_VIEW_BASE(m_webView), nullptr);
+ m_menu.setPlatformDescription(nullptr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebContextMenuProxyGtk::menuPositionFunction(GtkMenu* menu, gint* x, gint* y, gboolean* pushIn, WebContextMenuProxyGtk* popupMenu)
</span><span class="lines">@@ -208,15 +210,5 @@
</span><span class="cx"> *pushIn = FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebContextMenuProxyGtk::cancelTracking()
-{
- for (auto iter = m_signalHandlers.begin(); iter != m_signalHandlers.end(); ++iter)
- g_signal_handler_disconnect(iter->value, iter->key);
- m_signalHandlers.clear();
-
- webkitWebViewBaseSetActiveContextMenuProxy(WEBKIT_WEB_VIEW_BASE(m_webView), nullptr);
- m_menu.setPlatformDescription(nullptr);
-}
-
</del><span class="cx"> } // namespace WebKit
</span><span class="cx"> #endif // ENABLE(CONTEXT_MENUS)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessgtkWebContextMenuProxyGtkh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/gtk/WebContextMenuProxyGtk.h (191446 => 191447)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/gtk/WebContextMenuProxyGtk.h 2015-10-22 07:51:08 UTC (rev 191446)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebContextMenuProxyGtk.h 2015-10-22 08:08:23 UTC (rev 191447)
</span><span class="lines">@@ -41,22 +41,14 @@
</span><span class="cx">
</span><span class="cx"> class WebContextMenuProxyGtk : public WebContextMenuProxy {
</span><span class="cx"> public:
</span><del>- static Ref<WebContextMenuProxyGtk> create(GtkWidget* webView, WebPageProxy& page, const ContextMenuContextData& context, const UserData& userData)
- {
- return adoptRef(*new WebContextMenuProxyGtk(webView, page, context, userData));
- }
</del><ins>+ WebContextMenuProxyGtk(GtkWidget*, WebPageProxy&, const ContextMenuContextData&, const UserData&);
</ins><span class="cx"> ~WebContextMenuProxyGtk();
</span><span class="cx">
</span><del>- virtual void showContextMenu() override;
- virtual void hideContextMenu() override;
- virtual void cancelTracking() override;
-
</del><span class="cx"> void populate(Vector<WebCore::ContextMenuItem>&);
</span><span class="cx"> GtkMenu* gtkMenu() const { return m_menu.platformDescription(); }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- WebContextMenuProxyGtk(GtkWidget*, WebPageProxy&, const ContextMenuContextData&, const UserData&);
-
</del><ins>+ virtual void show() override;
</ins><span class="cx"> void append(WebCore::ContextMenuItem&);
</span><span class="cx"> void populate(const Vector<RefPtr<WebContextMenuItem>>&);
</span><span class="cx"> static void menuPositionFunction(GtkMenu*, gint*, gint*, gboolean*, WebContextMenuProxyGtk*);
</span></span></pre>
</div>
</div>
</body>
</html>