Diff
Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit2/ChangeLog (145564 => 145565)
--- releases/WebKitGTK/webkit-2.0/Source/WebKit2/ChangeLog 2013-03-12 18:02:05 UTC (rev 145564)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit2/ChangeLog 2013-03-12 18:13:50 UTC (rev 145565)
@@ -1,3 +1,17 @@
+2013-03-12 Manuel Rego Casasnovas <[email protected]>
+
+ Clean up WebPageURITest
+
+ Reviewed by Carlos Garcia Campos.
+
+ * UIProcess/API/gtk/tests/TestLoaderClient.cpp:
+ * UIProcess/API/gtk/tests/WebKitTestBus.cpp:
+ (WebKitTestBus::getOrCreateConnection):
+ (WebKitTestBus::createProxy):
+ * UIProcess/API/gtk/tests/WebKitTestBus.h:
+ (WebKitTestBus::connection):
+ (WebKitTestBus):
+
2013-03-12 Carlos Garcia Campos <[email protected]>
[GTK] Add webkit_web_context_set_disk_cache_directory to WebKit2 GTK+ API
Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit2/UIProcess/API/gtk/tests/TestLoaderClient.cpp (145564 => 145565)
--- releases/WebKitGTK/webkit-2.0/Source/WebKit2/UIProcess/API/gtk/tests/TestLoaderClient.cpp 2013-03-12 18:02:05 UTC (rev 145564)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit2/UIProcess/API/gtk/tests/TestLoaderClient.cpp 2013-03-12 18:13:50 UTC (rev 145565)
@@ -303,7 +303,7 @@
{
GRefPtr<GDBusProxy> proxy = adoptGRef(bus->createProxy("org.webkit.gtk.WebExtensionTest",
"/org/webkit/gtk/WebExtensionTest", "org.webkit.gtk.WebExtensionTest", m_mainLoop));
- guint id = g_dbus_connection_signal_subscribe(
+ m_uriChangedSignalID = g_dbus_connection_signal_subscribe(
g_dbus_proxy_get_connection(proxy.get()),
0,
"org.webkit.gtk.WebExtensionTest",
@@ -314,14 +314,20 @@
reinterpret_cast<GDBusSignalCallback>(webPageURIChangedCallback),
this,
0);
- g_assert(id);
+ g_assert(m_uriChangedSignalID);
g_signal_connect(m_webView, "notify::uri", G_CALLBACK(webViewURIChanged), this);
}
+ ~WebPageURITest()
+ {
+ g_signal_handlers_disconnect_matched(m_webView, G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, this);
+ g_dbus_connection_signal_unsubscribe(bus->connection(), m_uriChangedSignalID);
+ }
+
+ unsigned m_uriChangedSignalID;
Vector<CString> m_webPageURIs;
Vector<CString> m_webViewURIs;
-
};
static void testWebPageURI(WebPageURITest* test, gconstpointer)
Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit2/UIProcess/API/gtk/tests/WebKitTestBus.cpp (145564 => 145565)
--- releases/WebKitGTK/webkit-2.0/Source/WebKit2/UIProcess/API/gtk/tests/WebKitTestBus.cpp 2013-03-12 18:02:05 UTC (rev 145564)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit2/UIProcess/API/gtk/tests/WebKitTestBus.cpp 2013-03-12 18:13:50 UTC (rev 145565)
@@ -69,7 +69,7 @@
kill(m_pid, SIGTERM);
}
-GDBusConnection* WebKitTestBus::connection()
+GDBusConnection* WebKitTestBus::getOrCreateConnection()
{
if (m_connection)
return m_connection.get();
@@ -88,7 +88,7 @@
GDBusProxy* WebKitTestBus::createProxy(const char* serviceName, const char* objectPath, const char* interfaceName, GMainLoop* mainLoop)
{
- unsigned watcherID = g_bus_watch_name_on_connection(connection(), serviceName, G_BUS_NAME_WATCHER_FLAGS_NONE, onNameAppeared, 0, mainLoop, 0);
+ unsigned watcherID = g_bus_watch_name_on_connection(getOrCreateConnection(), serviceName, G_BUS_NAME_WATCHER_FLAGS_NONE, onNameAppeared, 0, mainLoop, 0);
g_main_loop_run(mainLoop);
g_bus_unwatch_name(watcherID);
Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit2/UIProcess/API/gtk/tests/WebKitTestBus.h (145564 => 145565)
--- releases/WebKitGTK/webkit-2.0/Source/WebKit2/UIProcess/API/gtk/tests/WebKitTestBus.h 2013-03-12 18:02:05 UTC (rev 145564)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit2/UIProcess/API/gtk/tests/WebKitTestBus.h 2013-03-12 18:13:50 UTC (rev 145565)
@@ -31,9 +31,10 @@
bool run();
GDBusProxy* createProxy(const char* serviceName, const char* objectPath, const char* interfaceName, GMainLoop*);
+ GDBusConnection* connection() const { return m_connection.get(); }
private:
- GDBusConnection* connection();
+ GDBusConnection* getOrCreateConnection();
pid_t m_pid;
CString m_address;
