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: svn://svn.chromium.org/blink/trunk@75279 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/WebKit2/ChangeLog

+2011-01-07  Jessie Berlin  <jberlin@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@chromium.org>
 
         Revert "Implement mozilla's animationTime property"

third_party/WebKit/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());    

third_party/WebKit/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);

third_party/WebKit/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

third_party/WebKit/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: