<!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>[162322] releases/WebKitGTK/webkit-2.2/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/162322">162322</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-20 02:35:13 -0800 (Mon, 20 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/160904">r160904</a> - [GTK] Some unit tests using web extensions fail when run alone
https://bugs.webkit.org/show_bug.cgi?id=126002
Reviewed by Gustavo Noronha Silva.
The problem is that the page is created before the dbus connection
has been established, and we are connecting to web-page-created
signal once we have a valid dbus connection. We should connect to
the signal before connecting to dbus and queue any request to emit
a dbus signal until the connection is set. This also fixes the
WebExtensions tests when using the network process because a new
web process is launched for every test case.
* UIProcess/API/gtk/tests/WebExtensionTest.cpp:
(DelayedSignal::DelayedSignal): Helper struct to queue signal
emissions requested before the dbus connection has been
established.
(emitDocumentLoaded): Emit the dbus DocumentLoaded signal.
(documentLoadedCallback): Queue the signal emission if we still
don't have a connection or call emitDocumentLoaded otherwise.
(emitURIChanged): Emit the dbus URIChanged signal.
(uriChangedCallback): Queue the signal emission if we still don't
have a connection or call emitURIChanged otherwise.
(pageCreatedCallback): Pass the web extension as user data to
document-loaded and uri-changed callbacks.
(busAcquiredCallback): Set the connection as user data of the web
extension and process any delayed signal emission pending.
(webkit_web_extension_initialize): Connect to web-page-create
signal before connecting to dbus.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit22SourceWebKit2ChangeLog">releases/WebKitGTK/webkit-2.2/Source/WebKit2/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit22SourceWebKit2UIProcessAPIgtktestsWebExtensionTestcpp">releases/WebKitGTK/webkit-2.2/Source/WebKit2/UIProcess/API/gtk/tests/WebExtensionTest.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit22SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.2/Source/WebKit2/ChangeLog (162321 => 162322)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.2/Source/WebKit2/ChangeLog 2014-01-20 10:32:43 UTC (rev 162321)
+++ releases/WebKitGTK/webkit-2.2/Source/WebKit2/ChangeLog 2014-01-20 10:35:13 UTC (rev 162322)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2013-12-20 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Some unit tests using web extensions fail when run alone
+ https://bugs.webkit.org/show_bug.cgi?id=126002
+
+ Reviewed by Gustavo Noronha Silva.
+
+ The problem is that the page is created before the dbus connection
+ has been established, and we are connecting to web-page-created
+ signal once we have a valid dbus connection. We should connect to
+ the signal before connecting to dbus and queue any request to emit
+ a dbus signal until the connection is set. This also fixes the
+ WebExtensions tests when using the network process because a new
+ web process is launched for every test case.
+
+ * UIProcess/API/gtk/tests/WebExtensionTest.cpp:
+ (DelayedSignal::DelayedSignal): Helper struct to queue signal
+ emissions requested before the dbus connection has been
+ established.
+ (emitDocumentLoaded): Emit the dbus DocumentLoaded signal.
+ (documentLoadedCallback): Queue the signal emission if we still
+ don't have a connection or call emitDocumentLoaded otherwise.
+ (emitURIChanged): Emit the dbus URIChanged signal.
+ (uriChangedCallback): Queue the signal emission if we still don't
+ have a connection or call emitURIChanged otherwise.
+ (pageCreatedCallback): Pass the web extension as user data to
+ document-loaded and uri-changed callbacks.
+ (busAcquiredCallback): Set the connection as user data of the web
+ extension and process any delayed signal emission pending.
+ (webkit_web_extension_initialize): Connect to web-page-create
+ signal before connecting to dbus.
+
</ins><span class="cx"> 2013-12-13 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Add a unit tests to WebKit2 to test node names
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit22SourceWebKit2UIProcessAPIgtktestsWebExtensionTestcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.2/Source/WebKit2/UIProcess/API/gtk/tests/WebExtensionTest.cpp (162321 => 162322)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.2/Source/WebKit2/UIProcess/API/gtk/tests/WebExtensionTest.cpp 2014-01-20 10:32:43 UTC (rev 162321)
+++ releases/WebKitGTK/webkit-2.2/Source/WebKit2/UIProcess/API/gtk/tests/WebExtensionTest.cpp 2014-01-20 10:35:13 UTC (rev 162322)
</span><span class="lines">@@ -25,8 +25,12 @@
</span><span class="cx"> #include <stdlib.h>
</span><span class="cx"> #include <string.h>
</span><span class="cx"> #include <webkit2/webkit-web-extension.h>
</span><ins>+#include <wtf/Deque.h>
+#include <wtf/OwnPtr.h>
+#include <wtf/PassOwnPtr.h>
</ins><span class="cx"> #include <wtf/gobject/GOwnPtr.h>
</span><span class="cx"> #include <wtf/gobject/GRefPtr.h>
</span><ins>+#include <wtf/text/CString.h>
</ins><span class="cx">
</span><span class="cx"> static const char introspectionXML[] =
</span><span class="cx"> "<node>"
</span><span class="lines">@@ -48,9 +52,33 @@
</span><span class="cx"> " </interface>"
</span><span class="cx"> "</node>";
</span><span class="cx">
</span><del>-static void documentLoadedCallback(WebKitWebPage*, gpointer userData)
</del><ins>+typedef enum {
+ DocumentLoadedSignal,
+ URIChangedSignal,
+} DelayedSignalType;
+
+struct DelayedSignal {
+ DelayedSignal(DelayedSignalType type)
+ : type(type)
+ {
+ }
+
+ DelayedSignal(DelayedSignalType type, const char* uri)
+ : type(type)
+ , uri(uri)
+ {
+ }
+
+ DelayedSignalType type;
+ CString uri;
+};
+
+Deque<OwnPtr<DelayedSignal>> delayedSignalsQueue;
+
+static void emitDocumentLoaded(GDBusConnection* connection)
</ins><span class="cx"> {
</span><del>- bool ok = g_dbus_connection_emit_signal(G_DBUS_CONNECTION(userData),
</del><ins>+ bool ok = g_dbus_connection_emit_signal(
+ connection,
</ins><span class="cx"> 0,
</span><span class="cx"> "/org/webkit/gtk/WebExtensionTest",
</span><span class="cx"> "org.webkit.gtk.WebExtensionTest",
</span><span class="lines">@@ -60,19 +88,37 @@
</span><span class="cx"> g_assert(ok);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void uriChangedCallback(WebKitWebPage* webPage, GParamSpec* pspec, gpointer userData)
</del><ins>+static void documentLoadedCallback(WebKitWebPage*, WebKitWebExtension* extension)
</ins><span class="cx"> {
</span><ins>+ gpointer data = g_object_get_data(G_OBJECT(extension), "dbus-connection");
+ if (data)
+ emitDocumentLoaded(G_DBUS_CONNECTION(data));
+ else
+ delayedSignalsQueue.append(adoptPtr(new DelayedSignal(DocumentLoadedSignal)));
+}
+
+static void emitURIChanged(GDBusConnection* connection, const char* uri)
+{
</ins><span class="cx"> bool ok = g_dbus_connection_emit_signal(
</span><del>- G_DBUS_CONNECTION(userData),
</del><ins>+ connection,
</ins><span class="cx"> 0,
</span><span class="cx"> "/org/webkit/gtk/WebExtensionTest",
</span><span class="cx"> "org.webkit.gtk.WebExtensionTest",
</span><span class="cx"> "URIChanged",
</span><del>- g_variant_new("(s)", webkit_web_page_get_uri(webPage)),
</del><ins>+ g_variant_new("(s)", uri),
</ins><span class="cx"> 0);
</span><span class="cx"> g_assert(ok);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static void uriChangedCallback(WebKitWebPage* webPage, GParamSpec* pspec, WebKitWebExtension* extension)
+{
+ gpointer data = g_object_get_data(G_OBJECT(extension), "dbus-connection");
+ if (data)
+ emitURIChanged(G_DBUS_CONNECTION(data), webkit_web_page_get_uri(webPage));
+ else
+ delayedSignalsQueue.append(adoptPtr(new DelayedSignal(URIChangedSignal, webkit_web_page_get_uri(webPage))));
+}
+
</ins><span class="cx"> static gboolean sendRequestCallback(WebKitWebPage*, WebKitURIRequest* request, WebKitURIResponse*, gpointer)
</span><span class="cx"> {
</span><span class="cx"> const char* requestURI = webkit_uri_request_get_uri(request);
</span><span class="lines">@@ -92,10 +138,10 @@
</span><span class="cx"> return FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void pageCreatedCallback(WebKitWebExtension*, WebKitWebPage* webPage, gpointer userData)
</del><ins>+static void pageCreatedCallback(WebKitWebExtension* extension, WebKitWebPage* webPage, gpointer)
</ins><span class="cx"> {
</span><del>- g_signal_connect(webPage, "document-loaded", G_CALLBACK(documentLoadedCallback), userData);
- g_signal_connect(webPage, "notify::uri", G_CALLBACK(uriChangedCallback), userData);
</del><ins>+ g_signal_connect(webPage, "document-loaded", G_CALLBACK(documentLoadedCallback), extension);
+ g_signal_connect(webPage, "notify::uri", G_CALLBACK(uriChangedCallback), extension);
</ins><span class="cx"> g_signal_connect(webPage, "send-request", G_CALLBACK(sendRequestCallback), 0);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -191,12 +237,25 @@
</span><span class="cx"> if (!registrationID)
</span><span class="cx"> g_warning("Failed to register object: %s\n", error->message);
</span><span class="cx">
</span><del>- g_signal_connect(WEBKIT_WEB_EXTENSION(userData), "page-created", G_CALLBACK(pageCreatedCallback), connection);
- g_signal_connect(webkit_script_world_get_default(), "window-object-cleared", G_CALLBACK(windowObjectCleared), 0);
</del><ins>+ g_object_set_data(G_OBJECT(userData), "dbus-connection", connection);
+ while (delayedSignalsQueue.size()) {
+ OwnPtr<DelayedSignal> delayedSignal = delayedSignalsQueue.takeFirst();
+ switch (delayedSignal->type) {
+ case DocumentLoadedSignal:
+ emitDocumentLoaded(connection);
+ break;
+ case URIChangedSignal:
+ emitURIChanged(connection, delayedSignal->uri.data());
+ break;
+ }
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> extern "C" void webkit_web_extension_initialize(WebKitWebExtension* extension)
</span><span class="cx"> {
</span><ins>+ g_signal_connect(extension, "page-created", G_CALLBACK(pageCreatedCallback), extension);
+ g_signal_connect(webkit_script_world_get_default(), "window-object-cleared", G_CALLBACK(windowObjectCleared), 0);
+
</ins><span class="cx"> g_bus_own_name(
</span><span class="cx"> G_BUS_TYPE_SESSION,
</span><span class="cx"> "org.webkit.gtk.WebExtensionTest",
</span></span></pre>
</div>
</div>
</body>
</html>