[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[jberlin at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 15b689c714680430de2b1b7ebeaf10f66dc1d76b
Author: jberlin at webkit.org <jberlin at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 7 22:58:29 2011 +0000

    WebKit2: Need WKBundleFrameCopyProvisionalURL
    https://bugs.webkit.org/show_bug.cgi?id=52083
    
    Reviewed by Dan Bernstein.
    
    * WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp:
    (WKBundleFrameCopyProvisionalURL):
    * WebProcess/InjectedBundle/API/c/WKBundleFrame.h:
    * WebProcess/WebPage/WebFrame.cpp:
    (WebKit::WebFrame::provisionalURL):
    Grab the URL from the provisional document loader.
    * WebProcess/WebPage/WebFrame.h:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75279 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index a44aa9e..9a070e0 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,18 @@
+2011-01-07  Jessie Berlin  <jberlin at apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        WebKit2: Need WKBundleFrameCopyProvisionalURL
+        https://bugs.webkit.org/show_bug.cgi?id=52083
+
+        * WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp:
+        (WKBundleFrameCopyProvisionalURL):
+        * WebProcess/InjectedBundle/API/c/WKBundleFrame.h:
+        * WebProcess/WebPage/WebFrame.cpp:
+        (WebKit::WebFrame::provisionalURL):
+        Grab the URL from the provisional document loader.
+        * WebProcess/WebPage/WebFrame.h:
+
 2011-01-07  James Robinson  <jamesr at chromium.org>
 
         Revert "Implement mozilla's animationTime property"
diff --git a/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp b/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp
index c93e800..2f53425 100644
--- a/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp
+++ b/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp
@@ -50,6 +50,11 @@ WKURLRef WKBundleFrameCopyURL(WKBundleFrameRef frameRef)
     return toCopiedURLAPI(toImpl(frameRef)->url());
 }
 
+WKURLRef WKBundleFrameCopyProvisionalURL(WKBundleFrameRef frameRef)
+{
+    return toCopiedURLAPI(toImpl(frameRef)->provisionalURL());
+}
+
 WKArrayRef WKBundleFrameCopyChildFrames(WKBundleFrameRef frameRef)
 {
     return toAPI(toImpl(frameRef)->childFrames().releaseRef());    
diff --git a/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.h b/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.h
index e3997f6..55af2be 100644
--- a/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.h
+++ b/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.h
@@ -41,6 +41,7 @@ WK_EXPORT WKArrayRef WKBundleFrameCopyChildFrames(WKBundleFrameRef frame);
 
 WK_EXPORT WKStringRef WKBundleFrameCopyName(WKBundleFrameRef frame);
 WK_EXPORT WKURLRef WKBundleFrameCopyURL(WKBundleFrameRef frame);
+WK_EXPORT WKURLRef WKBundleFrameCopyProvisionalURL(WKBundleFrameRef frame);
 
 WK_EXPORT JSGlobalContextRef WKBundleFrameGetJavaScriptContext(WKBundleFrameRef frame);
 WK_EXPORT JSGlobalContextRef WKBundleFrameGetJavaScriptContextForWorld(WKBundleFrameRef frame, WKBundleScriptWorldRef world);
diff --git a/WebKit2/WebProcess/WebPage/WebFrame.cpp b/WebKit2/WebProcess/WebPage/WebFrame.cpp
index 099d9b4..c5f117e 100644
--- a/WebKit2/WebProcess/WebPage/WebFrame.cpp
+++ b/WebKit2/WebProcess/WebPage/WebFrame.cpp
@@ -506,4 +506,12 @@ String WebFrame::markerText(JSObjectRef element)
     return markerTextForListItem(static_cast<JSElement*>(toJS(element))->impl());
 }
 
+String WebFrame::provisionalURL() const
+{
+    if (!m_coreFrame)
+        return String();
+
+    return m_coreFrame->loader()->provisionalDocumentLoader()->url().string();
+}
+
 } // namespace WebKit
diff --git a/WebKit2/WebProcess/WebPage/WebFrame.h b/WebKit2/WebProcess/WebPage/WebFrame.h
index 9d64637..3ded6f6 100644
--- a/WebKit2/WebProcess/WebPage/WebFrame.h
+++ b/WebKit2/WebProcess/WebPage/WebFrame.h
@@ -106,6 +106,8 @@ public:
     
     bool allowsFollowingLink(const WebCore::KURL&) const;
 
+    String provisionalURL() const;
+
     // Simple listener class used by plug-ins to know when frames finish or fail loading.
     class LoadListener {
     public:

-- 
WebKit Debian packaging