[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 68dc04b6ecfa425c520beb6442c120222586b19f
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 14 11:48:18 2010 +0000

    2010-12-14  Zalan Bujtas  <zbujtas at gmail.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            Add loadFinished() for provisional load error
            This fixes the hanging UI state, when provisional load error occurs due to
            the async nature of policy check.
    
            https://bugs.webkit.org/show_bug.cgi?id=48724
    
            * UIProcess/API/qt/ClientImpl.cpp:
            (loadFinished):
            (qt_wk_didFailProvisionalLoadWithErrorForFrame):
            (qt_wk_didFinishLoadForFrame):
            (qt_wk_didFailLoadWithErrorForFrame):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74013 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 385ebbe..46ff247 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,19 @@
+2010-12-14  Zalan Bujtas  <zbujtas at gmail.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Add loadFinished() for provisional load error
+        This fixes the hanging UI state, when provisional load error occurs due to
+        the async nature of policy check.
+
+        https://bugs.webkit.org/show_bug.cgi?id=48724
+
+        * UIProcess/API/qt/ClientImpl.cpp:
+        (loadFinished):
+        (qt_wk_didFailProvisionalLoadWithErrorForFrame):
+        (qt_wk_didFinishLoadForFrame):
+        (qt_wk_didFailLoadWithErrorForFrame):
+
 2010-12-13  Sam Weinig  <sam at webkit.org>
 
         Reviewed by Anders Carlsson.
diff --git a/WebKit2/UIProcess/API/qt/ClientImpl.cpp b/WebKit2/UIProcess/API/qt/ClientImpl.cpp
index 644f612..642e529 100644
--- a/WebKit2/UIProcess/API/qt/ClientImpl.cpp
+++ b/WebKit2/UIProcess/API/qt/ClientImpl.cpp
@@ -37,6 +37,14 @@ static QWKPage* toQWKPage(const void* clientInfo)
     return 0;
 }
 
+static void loadFinished(WKFrameRef frame, const void* clientInfo, bool ok)
+{
+    if (!WKFrameIsMainFrame(frame))
+        return;
+    emit toQWKPage(clientInfo)->loadFinished(ok);
+    QWKPagePrivate::get(toQWKPage(clientInfo))->updateNavigationActions();
+}
+
 void qt_wk_didStartProvisionalLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
 {
     if (!WKFrameIsMainFrame(frame))
@@ -51,6 +59,7 @@ void qt_wk_didReceiveServerRedirectForProvisionalLoadForFrame(WKPageRef page, WK
 
 void qt_wk_didFailProvisionalLoadWithErrorForFrame(WKPageRef page, WKFrameRef frame, WKErrorRef error, WKTypeRef userData, const void* clientInfo)
 {
+    loadFinished(frame, clientInfo, false);
 }
 
 void qt_wk_didCommitLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
@@ -71,18 +80,12 @@ void qt_wk_didFinishDocumentLoadForFrame(WKPageRef page, WKFrameRef frame, WKTyp
 
 void qt_wk_didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
 {
-    if (!WKFrameIsMainFrame(frame))
-        return;
-    emit toQWKPage(clientInfo)->loadFinished(true);
-    QWKPagePrivate::get(toQWKPage(clientInfo))->updateNavigationActions();
+    loadFinished(frame, clientInfo, true);
 }
 
 void qt_wk_didFailLoadWithErrorForFrame(WKPageRef page, WKFrameRef frame, WKErrorRef error, WKTypeRef userData, const void* clientInfo)
 {
-    if (!WKFrameIsMainFrame(frame))
-        return;
-    emit toQWKPage(clientInfo)->loadFinished(false);
-    QWKPagePrivate::get(toQWKPage(clientInfo))->updateNavigationActions();
+    loadFinished(frame, clientInfo, false);
 }
 
 void qt_wk_didReceiveTitleForFrame(WKPageRef page, WKStringRef title, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)

-- 
WebKit Debian packaging