Merge webkit.org at R49305 : Update KURL constructor call sites to new signature.

See http://trac.webkit.org/changeset/47907

Change-Id: I0d2f17fb161254e62e835d52fe7ab482b11b054d

3 files changed, 7 insertions, 7 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();
     }
diff --git a/WebKit/android/jni/WebCoreFrameBridge.cpp b/WebKit/android/jni/WebCoreFrameBridge.cpp
index 63c0641..ff5b9df 100644
--- a/WebKit/android/jni/WebCoreFrameBridge.cpp
+++ b/WebKit/android/jni/WebCoreFrameBridge.cpp
@@ -1036,7 +1036,7 @@ static void LoadData(JNIEnv *env, jobject obj, jstring baseUrl, jstring data,
 
     WebCore::SubstituteData substituteData(sharedBuffer,
             to_string(env, mimeType), to_string(env, encoding),
-            WebCore::KURL(to_string(env, failUrl)));
+            WebCore::KURL(ParsedURLString, to_string(env, failUrl)));
 
     // Perform the load
     pFrame->loader()->load(request, substituteData, false);
diff --git a/WebKit/android/jni/WebCoreResourceLoader.cpp b/WebKit/android/jni/WebCoreResourceLoader.cpp
index 5ccd09c..1b40eb6 100644
--- a/WebKit/android/jni/WebCoreResourceLoader.cpp
+++ b/WebKit/android/jni/WebCoreResourceLoader.cpp
@@ -140,7 +140,7 @@ jint WebCoreResourceLoader::CreateResponse(JNIEnv* env, jobject obj, jstring url
     TimeCounterAuto counter(TimeCounter::ResourceTimeCounter);
 #endif
     LOG_ASSERT(url, "Must have a url in the response!");
-    WebCore::KURL kurl(to_string(env, url));
+    WebCore::KURL kurl(WebCore::ParsedURLString, to_string(env, url));
     WebCore::String encodingStr;
     WebCore::String mimeTypeStr;
     if (mimeType) {
@@ -235,7 +235,7 @@ jstring WebCoreResourceLoader::RedirectedToUrl(JNIEnv* env, jobject obj,
 
     LOG_ASSERT(handle->client(), "Why do we not have a client?");
     WebCore::ResourceRequest r = handle->request();
-    WebCore::KURL url(WebCore::KURL(to_string(env, baseUrl)),
+    WebCore::KURL url(WebCore::KURL(WebCore::ParsedURLString, to_string(env, baseUrl)),
             to_string(env, redirectTo));
     r.setURL(url);
     if (r.httpMethod() == "POST") {