Changeset 75279 in webkit

Timestamp:

Jan 7, 2011 2:58:29 PM (13 years ago)

Author:

jberlin@webkit.org

Message:

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:

Location:

trunk/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp (modified) (1 diff)
• WebProcess/InjectedBundle/API/c/WKBundleFrame.h (modified) (1 diff)
• WebProcess/WebPage/WebFrame.cpp (modified) (1 diff)
• WebProcess/WebPage/WebFrame.h (modified) (1 diff)

trunk/WebKit2/ChangeLog

@@ +1 @@
+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>
 

trunk/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp

@@ -49 +49 @@
 {
     return toCopiedURLAPI(toImpl(frameRef)->url());
+}
+
+WKURLRef WKBundleFrameCopyProvisionalURL(WKBundleFrameRef frameRef)
+{
+    return toCopiedURLAPI(toImpl(frameRef)->provisionalURL());
 }
 

trunk/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.h

@@ -42 +42 @@
 WK_EXPORT WKStringRef WKBundleFrameCopyName(WKBundleFrameRef frame);
 WK_EXPORT WKURLRef WKBundleFrameCopyURL(WKBundleFrameRef frame);
+WK_EXPORT WKURLRef WKBundleFrameCopyProvisionalURL(WKBundleFrameRef frame);
 
 WK_EXPORT JSGlobalContextRef WKBundleFrameGetJavaScriptContext(WKBundleFrameRef frame);

trunk/WebKit2/WebProcess/WebPage/WebFrame.cpp

@@ -507 +507 @@
 }
 
+String WebFrame::provisionalURL() const
+{
+    if (!m_coreFrame)
+        return String();
+
+    return m_coreFrame->loader()->provisionalDocumentLoader()->url().string();
+}
+
 } // namespace WebKit

trunk/WebKit2/WebProcess/WebPage/WebFrame.h

@@ -107 +107 @@
     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 {