From 6c2af9490927c3c5959b5cb07461b646f8b32f6c Mon Sep 17 00:00:00 2001 From: Kristian Monsen Date: Fri, 21 May 2010 16:53:46 +0100 Subject: Merge WebKit at r59636: Initial merge by git Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91 --- WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp') diff --git a/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp index 0f3ca38..273bcdf 100644 --- a/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp +++ b/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp @@ -843,6 +843,19 @@ static WebKitWebView* webInspectorInspectWebView(WebKitWebInspector*, gpointer d return WEBKIT_WEB_VIEW(webView); } +static void webViewLoadStatusNotified(WebKitWebView* view, gpointer user_data) +{ + WebKitLoadStatus loadStatus = webkit_web_view_get_load_status(view); + + if (gLayoutTestController->dumpFrameLoadCallbacks()) { + if (loadStatus == WEBKIT_LOAD_PROVISIONAL) { + char* frameName = getFrameNameSuitableForTestResult(view, mainFrame); + printf("%s - didStartProvisionalLoadForFrame\n", frameName); + g_free(frameName); + } + } +} + static WebKitWebView* createWebView() { WebKitWebView* view = WEBKIT_WEB_VIEW(webkit_web_view_new()); @@ -871,6 +884,10 @@ static WebKitWebView* createWebView() "signal::onload-event", webViewOnloadEvent, 0, NULL); + g_signal_connect(view, + "notify::load-status", G_CALLBACK(webViewLoadStatusNotified), + NULL); + WebKitWebInspector* inspector = webkit_web_view_get_inspector(view); g_object_connect(G_OBJECT(inspector), "signal::inspect-web-view", webInspectorInspectWebView, 0, -- cgit v1.1