From 8d473cf9743f1d30a16a27114e93bd5af5648d23 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@nokia.com>
Date: Fri, 18 May 2012 14:03:11 +0200
Subject: Imported WebKit commit 1350e72f7345ced9da2bd9980deeeb5a8d62fab4
 (http://svn.webkit.org/repository/webkit/trunk@117578)

Weekly snapshot
---
 .../InjectedBundle/InjectedBundlePage.cpp               | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp')

diff --git a/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp b/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp
index 0605a8537..649f3c514 100644
--- a/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp
+++ b/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp
@@ -240,6 +240,7 @@ InjectedBundlePage::InjectedBundlePage(WKBundlePageRef page)
         0, // willDisconnectDOMWindowExtensionFromGlobalObject
         0, // didReconnectDOMWindowExtensionToGlobalObject
         0, // willDestroyGlobalObjectForDOMWindowExtension
+        didFinishProgress, // didFinishProgress
     };
     WKBundlePageSetPageLoaderClient(m_page, &loaderClient);
 
@@ -398,6 +399,11 @@ void InjectedBundlePage::didFinishLoadForFrame(WKBundlePageRef page, WKBundleFra
     static_cast<InjectedBundlePage*>(const_cast<void*>(clientInfo))->didFinishLoadForFrame(frame);
 }
 
+void InjectedBundlePage::didFinishProgress(WKBundlePageRef, const void *clientInfo)
+{
+    static_cast<InjectedBundlePage*>(const_cast<void*>(clientInfo))->didFinishProgress();
+}
+
 void InjectedBundlePage::didFinishDocumentLoadForFrame(WKBundlePageRef page, WKBundleFrameRef frame, WKTypeRef*, const void* clientInfo)
 {
     static_cast<InjectedBundlePage*>(const_cast<void*>(clientInfo))->didFinishDocumentLoadForFrame(frame);
@@ -529,6 +535,17 @@ void InjectedBundlePage::didCommitLoadForFrame(WKBundleFrameRef frame)
     InjectedBundle::shared().stringBuilder()->append(" - didCommitLoadForFrame\n");
 }
 
+void InjectedBundlePage::didFinishProgress()
+{
+    if (!InjectedBundle::shared().isTestRunning())
+        return;
+
+    if (!InjectedBundle::shared().layoutTestController()->shouldDumpProgressFinishedCallback())
+        return;
+
+    InjectedBundle::shared().stringBuilder()->append("postProgressFinishedNotification\n");
+}
+
 enum FrameNamePolicy { ShouldNotIncludeFrameName, ShouldIncludeFrameName };
 
 static void dumpFrameScrollPosition(WKBundleFrameRef frame, FrameNamePolicy shouldIncludeFrameName = ShouldNotIncludeFrameName)
-- 
cgit v1.2.1