diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-05-21 16:53:46 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-05-25 10:24:15 +0100 |
| commit | 6c2af9490927c3c5959b5cb07461b646f8b32f6c (patch) | |
| tree | f7111b9b22befab472616c1d50ec94eb50f1ec8c /WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp | |
| parent | a149172322a9067c14e8b474a53e63649aa17cad (diff) | |
| download | external_webkit-6c2af9490927c3c5959b5cb07461b646f8b32f6c.zip external_webkit-6c2af9490927c3c5959b5cb07461b646f8b32f6c.tar.gz external_webkit-6c2af9490927c3c5959b5cb07461b646f8b32f6c.tar.bz2 | |
Merge WebKit at r59636: Initial merge by git
Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91
Diffstat (limited to 'WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp')
| -rw-r--r-- | WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp | 17 |
1 files changed, 17 insertions, 0 deletions
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, |