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

[weinig at apple.com]

The following commit has been merged in the debian/experimental branch:
commit c3c954b204077da588ea3d526e72284c86d76dfd
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 13 00:25:07 2010 +0000

    When a provisional load fails, the provisional URL returned
    from WKFrameCopyProvisionalURL should be empty
    <rdar://problem/8540878>
    https://bugs.webkit.org/show_bug.cgi?id=47546
    
    Reviewed by Dan Bernstein.
    
    WebKit2:
    
    API Tests: FailedLoad (updated).
    
    * UIProcess/WebFrameProxy.cpp:
    (WebKit::WebFrameProxy::didFailProvisionalLoad): Empty out the provisional URL.
    
    WebKitTools:
    
    Add test.
    
    * TestWebKitAPI/Tests/WebKit2/FailedLoad.cpp:
    (TestWebKitAPI::didFailProvisionalLoadWithErrorForFrame):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69621 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index bf9b57e..178d33c 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,17 @@
+2010-10-12  Sam Weinig  <sam at webkit.org>
+
+        Reviewed by Dan Bernstein.
+
+        When a provisional load fails, the provisional URL returned
+        from WKFrameCopyProvisionalURL should be empty
+        <rdar://problem/8540878>
+        https://bugs.webkit.org/show_bug.cgi?id=47546
+
+        API Tests: FailedLoad (updated).
+
+        * UIProcess/WebFrameProxy.cpp:
+        (WebKit::WebFrameProxy::didFailProvisionalLoad): Empty out the provisional URL.
+
 2010-10-12  Anders Carlsson  <andersca at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebKit2/UIProcess/WebFrameProxy.cpp b/WebKit2/UIProcess/WebFrameProxy.cpp
index 00dc258..0ba95fc 100644
--- a/WebKit2/UIProcess/WebFrameProxy.cpp
+++ b/WebKit2/UIProcess/WebFrameProxy.cpp
@@ -83,6 +83,7 @@ void WebFrameProxy::didReceiveServerRedirectForProvisionalLoad(const String& url
 void WebFrameProxy::didFailProvisionalLoad()
 {
     m_loadState = LoadStateFinished;
+    m_provisionalURL = String();
 }
 
 void WebFrameProxy::didCommitLoad()
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index ff249fb..48ba9ab 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,17 @@
+2010-10-12  Sam Weinig  <sam at webkit.org>
+
+        Reviewed by Dan Bernstein.
+
+        When a provisional load fails, the provisional URL returned
+        from WKFrameCopyProvisionalURL should be empty
+        <rdar://problem/8540878>
+        https://bugs.webkit.org/show_bug.cgi?id=47546
+
+        Add test.
+
+        * TestWebKitAPI/Tests/WebKit2/FailedLoad.cpp:
+        (TestWebKitAPI::didFailProvisionalLoadWithErrorForFrame):
+
 2010-10-12  Anders Carlsson  <andersca at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebKitTools/TestWebKitAPI/Tests/WebKit2/FailedLoad.cpp b/WebKitTools/TestWebKitAPI/Tests/WebKit2/FailedLoad.cpp
index 6685d59..a7b8c7d 100644
--- a/WebKitTools/TestWebKitAPI/Tests/WebKit2/FailedLoad.cpp
+++ b/WebKitTools/TestWebKitAPI/Tests/WebKit2/FailedLoad.cpp
@@ -39,6 +39,13 @@ static bool testDone;
 static void didFailProvisionalLoadWithErrorForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo)
 {
     TEST_ASSERT(WKFrameGetFrameLoadState(frame) == kWKFrameLoadStateFinished);
+
+    WKURLRef url = WKFrameCopyProvisionalURL(frame);
+    WKURLRef emptyURL = WKURLCreateWithUTF8CString("");
+    TEST_ASSERT(WKURLIsEqual(url, emptyURL));
+    WKRelease(url);
+    WKRelease(emptyURL);
+
     testDone = true;
 }
 

-- 
WebKit Debian packaging