diff options
Diffstat (limited to 'Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestInspector.cpp')
-rw-r--r-- | Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestInspector.cpp | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestInspector.cpp b/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestInspector.cpp index 3d993e24f..1f0430389 100644 --- a/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestInspector.cpp +++ b/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestInspector.cpp @@ -21,7 +21,7 @@ #include "WebViewTest.h" #include <wtf/Vector.h> -#include <wtf/glib/GRefPtr.h> +#include <wtf/gobject/GRefPtr.h> class InspectorTest: public WebViewTest { public: @@ -125,22 +125,10 @@ public: g_main_loop_run(m_mainLoop); } - static void canAttachChanged(InspectorTest* test) - { - g_main_loop_quit(test->m_mainLoop); - } - void resizeViewAndAttach() { // Resize the view to make room for the inspector. - if (!webkit_web_inspector_get_can_attach(m_inspector)) { - unsigned long handler = g_signal_connect_swapped(m_inspector, "notify::can-attach", G_CALLBACK(canAttachChanged), this); - resizeView(gMinimumAttachedInspectorWidth, (gMinimumAttachedInspectorHeight + 1) * 4 / 3); - g_main_loop_run(m_mainLoop); - g_signal_handler_disconnect(m_inspector, handler); - } - - g_assert(webkit_web_inspector_get_can_attach(m_inspector)); + resizeView(gMinimumAttachedInspectorWidth, (gMinimumAttachedInspectorHeight + 1) * 4 / 3); webkit_web_inspector_attach(m_inspector); } @@ -179,7 +167,6 @@ static void testInspectorDefault(InspectorTest* test, gconstpointer) test->assertObjectIsDeletedWhenTestFinishes(G_OBJECT(inspectorView.get())); g_assert(!webkit_web_inspector_is_attached(test->m_inspector)); g_assert_cmpuint(webkit_web_inspector_get_attached_height(test->m_inspector), ==, 0); - g_assert(!webkit_web_inspector_get_can_attach(test->m_inspector)); Vector<InspectorTest::InspectorEvents>& events = test->m_events; g_assert_cmpint(events.size(), ==, 1); g_assert_cmpint(events[0], ==, InspectorTest::OpenWindow); |