Commit 15b689c7 authored by jberlin@webkit.org's avatar jberlin@webkit.org

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
parent c51b669d
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"
......@@ -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());
......
......@@ -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);
......
......@@ -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
......@@ -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:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment