<!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>[190717] trunk</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/190717">190717</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-10-08 03:06:41 -0700 (Thu, 08 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Stop using a nested main loop for popup menus
https://bugs.webkit.org/show_bug.cgi?id=149920
Reviewed by Sergio Villar Senin.
Source/WebKit2:
WebPageProxy used to expect the popup menus to run in a nested
main loop and invalidated the menu right after showing it. But
this is no longer the case, so there's no reason to keep using
the nested main loop.
* UIProcess/gtk/WebPopupMenuProxyGtk.cpp:
(WebKit::WebPopupMenuProxyGtk::~WebPopupMenuProxyGtk):
(WebKit::WebPopupMenuProxyGtk::cancelTracking):
(WebKit::WebPopupMenuProxyGtk::menuItemActivated):
(WebKit::WebPopupMenuProxyGtk::WebPopupMenuProxyGtk): Deleted.
(WebKit::WebPopupMenuProxyGtk::showPopupMenu): Deleted.
(WebKit::WebPopupMenuProxyGtk::shutdownRunLoop): Deleted.
(WebKit::WebPopupMenuProxyGtk::menuUnmapped): Deleted.
* UIProcess/gtk/WebPopupMenuProxyGtk.h:
(WebKit::WebPopupMenuProxyGtk::setActiveItem): Deleted.
LayoutTests:
Unskip platform/gtk/fast/forms/menulist-typeahead-find.html that
was timing out because of the nested main loop.
* platform/gtk/TestExpectations:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformgtkTestExpectations">trunk/LayoutTests/platform/gtk/TestExpectations</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessgtkWebPopupMenuProxyGtkcpp">trunk/Source/WebKit2/UIProcess/gtk/WebPopupMenuProxyGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessgtkWebPopupMenuProxyGtkh">trunk/Source/WebKit2/UIProcess/gtk/WebPopupMenuProxyGtk.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (190716 => 190717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-10-08 09:55:30 UTC (rev 190716)
+++ trunk/LayoutTests/ChangeLog 2015-10-08 10:06:41 UTC (rev 190717)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2015-10-08 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><ins>+ [GTK] Stop using a nested main loop for popup menus
+ https://bugs.webkit.org/show_bug.cgi?id=149920
+
+ Reviewed by Sergio Villar Senin.
+
+ Unskip platform/gtk/fast/forms/menulist-typeahead-find.html that
+ was timing out because of the nested main loop.
+
+ * platform/gtk/TestExpectations:
+
+2015-10-08 Carlos Garcia Campos <cgarcia@igalia.com>
+
</ins><span class="cx"> Unreviewed GTK+ gardening. Mark several inspector tests as slow.
</span><span class="cx">
</span><span class="cx"> * platform/gtk/TestExpectations:
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/TestExpectations (190716 => 190717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/TestExpectations 2015-10-08 09:55:30 UTC (rev 190716)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2015-10-08 10:06:41 UTC (rev 190717)
</span><span class="lines">@@ -1586,7 +1586,6 @@
</span><span class="cx"> Bug(GTK) http/tests/security/storage-blocking-strengthened-plugin.html [ Failure ]
</span><span class="cx"> Bug(GTK) http/tests/security/storage-blocking-strengthened-private-browsing-plugin.html [ Failure ]
</span><span class="cx"> Bug(GTK) platform/gtk/fast/events/event-sender-metakey.html [ Failure ]
</span><del>-Bug(GTK) platform/gtk/fast/forms/menulist-typeahead-find.html [ Failure ]
</del><span class="cx"> Bug(GTK) plugins/keyboard-events.html [ Failure ]
</span><span class="cx"> Bug(GTK) plugins/netscape-plugin-setwindow-size-2.html [ Failure ]
</span><span class="cx"> Bug(GTK) plugins/npp-set-window-called-during-destruction.html [ Failure ]
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (190716 => 190717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-10-08 09:55:30 UTC (rev 190716)
+++ trunk/Source/WebKit2/ChangeLog 2015-10-08 10:06:41 UTC (rev 190717)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2015-10-08 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Stop using a nested main loop for popup menus
+ https://bugs.webkit.org/show_bug.cgi?id=149920
+
+ Reviewed by Sergio Villar Senin.
+
+ WebPageProxy used to expect the popup menus to run in a nested
+ main loop and invalidated the menu right after showing it. But
+ this is no longer the case, so there's no reason to keep using
+ the nested main loop.
+
+ * UIProcess/gtk/WebPopupMenuProxyGtk.cpp:
+ (WebKit::WebPopupMenuProxyGtk::~WebPopupMenuProxyGtk):
+ (WebKit::WebPopupMenuProxyGtk::cancelTracking):
+ (WebKit::WebPopupMenuProxyGtk::menuItemActivated):
+ (WebKit::WebPopupMenuProxyGtk::WebPopupMenuProxyGtk): Deleted.
+ (WebKit::WebPopupMenuProxyGtk::showPopupMenu): Deleted.
+ (WebKit::WebPopupMenuProxyGtk::shutdownRunLoop): Deleted.
+ (WebKit::WebPopupMenuProxyGtk::menuUnmapped): Deleted.
+ * UIProcess/gtk/WebPopupMenuProxyGtk.h:
+ (WebKit::WebPopupMenuProxyGtk::setActiveItem): Deleted.
+
</ins><span class="cx"> 2015-10-07 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Add API for getting a group identifier from a bundle page
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessgtkWebPopupMenuProxyGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/gtk/WebPopupMenuProxyGtk.cpp (190716 => 190717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/gtk/WebPopupMenuProxyGtk.cpp 2015-10-08 09:55:30 UTC (rev 190716)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebPopupMenuProxyGtk.cpp 2015-10-08 10:06:41 UTC (rev 190717)
</span><span class="lines">@@ -42,7 +42,6 @@
</span><span class="cx"> : WebPopupMenuProxy(client)
</span><span class="cx"> , m_webView(webView)
</span><span class="cx"> , m_popup(gtk_menu_new())
</span><del>- , m_activeItem(-1)
</del><span class="cx"> , m_previousKeyEventCharacter(0)
</span><span class="cx"> , m_previousKeyEventTimestamp(0)
</span><span class="cx"> , m_currentlySelectedMenuItem(nullptr)
</span><span class="lines">@@ -52,11 +51,7 @@
</span><span class="cx">
</span><span class="cx"> WebPopupMenuProxyGtk::~WebPopupMenuProxyGtk()
</span><span class="cx"> {
</span><del>- if (m_popup) {
- g_signal_handlers_disconnect_matched(m_popup, G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, this);
- hidePopupMenu();
- gtk_widget_destroy(m_popup);
- }
</del><ins>+ cancelTracking();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> GtkAction* WebPopupMenuProxyGtk::createGtkActionForMenuItem(const WebPopupItem& item, int itemIndex)
</span><span class="lines">@@ -127,8 +122,6 @@
</span><span class="cx"> menuPosition.setY(menuPosition.y() - rect.height() / 2);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- gulong unmapHandler = g_signal_connect(m_popup, "unmap", G_CALLBACK(menuUnmapped), this);
-
</del><span class="cx"> const GdkEvent* event = m_client->currentlyProcessedMouseDownEvent() ? m_client->currentlyProcessedMouseDownEvent()->nativeEvent() : nullptr;
</span><span class="cx"> gtk_menu_popup_for_device(GTK_MENU(m_popup), event ? gdk_event_get_device(event) : nullptr, nullptr, nullptr,
</span><span class="cx"> [](GtkMenu*, gint* x, gint* y, gboolean* pushIn, gpointer userData) {
</span><span class="lines">@@ -149,27 +142,6 @@
</span><span class="cx"> m_client->failedToShowPopupMenu();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>-
- // WebPageProxy expects the menu to run in a nested run loop, since it invalidates the
- // menu right after calling WebPopupMenuProxy::showPopupMenu().
- m_runLoop = adoptGRef(g_main_loop_new(nullptr, FALSE));
-
-// This is to suppress warnings about gdk_threads_leave and gdk_threads_enter.
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
- gdk_threads_leave();
- g_main_loop_run(m_runLoop.get());
- gdk_threads_enter();
-#pragma GCC diagnostic pop
-
- m_runLoop.clear();
-
- g_signal_handler_disconnect(m_popup, unmapHandler);
-
- if (!m_client)
- return;
-
- m_client->valueChangedForPopupMenu(this, m_activeItem);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPopupMenuProxyGtk::hidePopupMenu()
</span><span class="lines">@@ -178,6 +150,17 @@
</span><span class="cx"> resetTypeAheadFindState();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebPopupMenuProxyGtk::cancelTracking()
+{
+ if (!m_popup)
+ return;
+
+ g_signal_handlers_disconnect_matched(m_popup, G_SIGNAL_MATCH_DATA, 0, 0, nullptr, nullptr, this);
+ hidePopupMenu();
+ gtk_widget_destroy(m_popup);
+ m_popup = nullptr;
+}
+
</ins><span class="cx"> bool WebPopupMenuProxyGtk::typeAheadFind(GdkEventKey* event)
</span><span class="cx"> {
</span><span class="cx"> // If we were given a non-printable character just skip it.
</span><span class="lines">@@ -256,23 +239,12 @@
</span><span class="cx"> m_currentSearchString = emptyString();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPopupMenuProxyGtk::shutdownRunLoop()
-{
- if (g_main_loop_is_running(m_runLoop.get()))
- g_main_loop_quit(m_runLoop.get());
-}
-
</del><span class="cx"> void WebPopupMenuProxyGtk::menuItemActivated(GtkAction* action, WebPopupMenuProxyGtk* popupMenu)
</span><span class="cx"> {
</span><del>- popupMenu->setActiveItem(GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action), "popup-menu-action-index")));
- popupMenu->shutdownRunLoop();
</del><ins>+ if (popupMenu->m_client)
+ popupMenu->m_client->valueChangedForPopupMenu(popupMenu, GPOINTER_TO_INT(g_object_get_data(G_OBJECT(action), "popup-menu-action-index")));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPopupMenuProxyGtk::menuUnmapped(GtkWidget*, WebPopupMenuProxyGtk* popupMenu)
-{
- popupMenu->shutdownRunLoop();
-}
-
</del><span class="cx"> void WebPopupMenuProxyGtk::selectItemCallback(GtkWidget* item, WebPopupMenuProxyGtk* popupMenu)
</span><span class="cx"> {
</span><span class="cx"> popupMenu->setCurrentlySelectedMenuItem(item);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessgtkWebPopupMenuProxyGtkh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/gtk/WebPopupMenuProxyGtk.h (190716 => 190717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/gtk/WebPopupMenuProxyGtk.h 2015-10-08 09:55:30 UTC (rev 190716)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebPopupMenuProxyGtk.h 2015-10-08 10:06:41 UTC (rev 190717)
</span><span class="lines">@@ -43,13 +43,13 @@
</span><span class="cx"> }
</span><span class="cx"> ~WebPopupMenuProxyGtk();
</span><span class="cx">
</span><del>- virtual void showPopupMenu(const WebCore::IntRect&, WebCore::TextDirection, double pageScaleFactor, const Vector<WebPopupItem>&, const PlatformPopupMenuData&, int32_t selectedIndex);
- virtual void hidePopupMenu();
</del><ins>+ virtual void showPopupMenu(const WebCore::IntRect&, WebCore::TextDirection, double pageScaleFactor, const Vector<WebPopupItem>&, const PlatformPopupMenuData&, int32_t selectedIndex) override;
+ virtual void hidePopupMenu() override;
+ virtual void cancelTracking() override;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> WebPopupMenuProxyGtk(GtkWidget*, WebPopupMenuProxy::Client*);
</span><del>- void shutdownRunLoop();
- void setActiveItem(int activeItem) { m_activeItem = activeItem; }
</del><ins>+
</ins><span class="cx"> void setCurrentlySelectedMenuItem(GtkWidget* item) { m_currentlySelectedMenuItem = item; }
</span><span class="cx"> GtkAction* createGtkActionForMenuItem(const WebPopupItem&, int itemIndex);
</span><span class="cx"> void populatePopupMenu(const Vector<WebPopupItem>&);
</span><span class="lines">@@ -58,14 +58,11 @@
</span><span class="cx"> void resetTypeAheadFindState();
</span><span class="cx">
</span><span class="cx"> static void menuItemActivated(GtkAction*, WebPopupMenuProxyGtk*);
</span><del>- static void menuUnmapped(GtkWidget*, WebPopupMenuProxyGtk*);
</del><span class="cx"> static void selectItemCallback(GtkWidget*, WebPopupMenuProxyGtk*);
</span><span class="cx"> static gboolean keyPressEventCallback(GtkWidget*, GdkEventKey*, WebPopupMenuProxyGtk*);
</span><span class="cx">
</span><span class="cx"> GtkWidget* m_webView;
</span><span class="cx"> GtkWidget* m_popup;
</span><del>- int m_activeItem;
- GRefPtr<GMainLoop> m_runLoop;
</del><span class="cx">
</span><span class="cx"> // Typeahead find.
</span><span class="cx"> unsigned m_previousKeyEventCharacter;
</span></span></pre>
</div>
</div>
</body>
</html>