summaryrefslogtreecommitdiffstats
path: root/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2009-10-09 15:48:35 +0100
committerSteve Block <steveblock@google.com>2009-10-20 00:45:05 +0100
commite372b0aa0721bf108058f04c43ad1365058369b2 (patch)
treeab03cee30c5838bd2a9a2d85c5491977687ba43b /WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
parentd9f79b2db2f5875a4c7d02da14a36205b205b4a7 (diff)
downloadexternal_webkit-e372b0aa0721bf108058f04c43ad1365058369b2.zip
external_webkit-e372b0aa0721bf108058f04c43ad1365058369b2.tar.gz
external_webkit-e372b0aa0721bf108058f04c43ad1365058369b2.tar.bz2
Merge webkit.org at R49305 : Update KURL constructor call sites to new signature.
See http://trac.webkit.org/changeset/47907 Change-Id: I0d2f17fb161254e62e835d52fe7ab482b11b054d
Diffstat (limited to 'WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp')
-rw-r--r--WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
index c567c66..ff104d6 100644
--- a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
+++ b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
@@ -343,7 +343,7 @@ void FrameLoaderClientAndroid::dispatchDidFailProvisionalLoad(const ResourceErro
// load with the replacement data.
// use KURL(const char*) as KURL(const String& url) can trigger ASSERT for
// invalidate URL string.
- loadDataIntoFrame(m_frame, KURL(data), error.failingURL(), s);
+ loadDataIntoFrame(m_frame, KURL(ParsedURLString, data), error.failingURL(), s);
// Delete the asset.
delete a;
@@ -619,7 +619,7 @@ void FrameLoaderClientAndroid::updateGlobalHistory() {
&& docLoader->response().httpStatusCode() < 400) {
m_webFrame->updateVisitedHistory(docLoader->urlForHistory(), false);
if (!docLoader->serverRedirectSourceForHistory().isNull())
- m_webFrame->updateVisitedHistory(KURL(docLoader->serverRedirectDestinationForHistory()), false);
+ m_webFrame->updateVisitedHistory(KURL(ParsedURLString, docLoader->serverRedirectDestinationForHistory()), false);
}
}
@@ -970,7 +970,7 @@ WTF::PassRefPtr<Widget> FrameLoaderClientAndroid::createPlugin(
s = s.replace("VIDEO_ID", videoId);
delete a;
loadDataIntoFrame(frame.get(),
- KURL("file:///android_asset/webkit/"), String(), s);
+ KURL(ParsedURLString, "file:///android_asset/webkit/"), String(), s);
// Transfer ownership to a local refptr.
WTF::RefPtr<Widget> widget(frame->view());
return widget.release();
@@ -1088,7 +1088,7 @@ void FrameLoaderClientAndroid::didAddIconForPageUrl(const String& pageUrl) {
// may register for icon notifications again since the icon data may have
// to be read from disk.
registerForIconNotification(false);
- KURL u(pageUrl);
+ KURL u(ParsedURLString, pageUrl);
if (equalIgnoringFragmentIdentifier(u, m_frame->loader()->url())) {
dispatchDidReceiveIcon();
}