Changeset 145565 in webkit

Timestamp:

Mar 12, 2013, 11:13:50 AM (12 years ago)

Author:

Carlos Garcia Campos

Message:

Clean up WebPageURITest

Patch by Manuel Rego Casasnovas <Manuel Rego Casasnovas> on 2013-03-12
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):

Location:

releases/WebKitGTK/webkit-2.0/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/gtk/tests/TestLoaderClient.cpp (modified) (2 diffs)
• UIProcess/API/gtk/tests/WebKitTestBus.cpp (modified) (2 diffs)
• UIProcess/API/gtk/tests/WebKitTestBus.h (modified) (1 diff)

releases/WebKitGTK/webkit-2.0/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-03-12  Manuel Rego Casasnovas  <rego@igalia.com>
+
+        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  <cgarcia@igalia.com>
 

releases/WebKitGTK/webkit-2.0/Source/WebKit2/UIProcess/API/gtk/tests/TestLoaderClient.cpp

@@ -304 +304 @@
         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,
@@ -315 +315 @@
             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;
-
 };
 

releases/WebKitGTK/webkit-2.0/Source/WebKit2/UIProcess/API/gtk/tests/WebKitTestBus.cpp

@@ -70 +70 @@
 }
 
-GDBusConnection* WebKitTestBus::connection()
+GDBusConnection* WebKitTestBus::getOrCreateConnection()
 {
     if (m_connection)
@@ -89 +89 @@
 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);

releases/WebKitGTK/webkit-2.0/Source/WebKit2/UIProcess/API/gtk/tests/WebKitTestBus.h

@@ -32 +32 @@
     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;