summaryrefslogtreecommitdiffstats
path: root/WebKit/android
diff options
context:
space:
mode:
Diffstat (limited to 'WebKit/android')
-rw-r--r--WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
index 95a9cf6..a99fedd 100644
--- a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
+++ b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
@@ -330,11 +330,12 @@ void FrameLoaderClientAndroid::dispatchDidFailProvisionalLoad(const ResourceErro
// Replace all occurances of %e with the error text
s = s.replace("%e", error.localizedDescription());
-
+
// Create the request and the substitute data and tell the FrameLoader to
// load with the replacement data.
- loadDataIntoFrame(m_frame, m_frame->loader()->baseURL(),
- error.failingURL(), s);
+ // use KURL(const char*) as KURL(const String& url) can trigger ASSERT for
+ // invalidate URL string.
+ loadDataIntoFrame(m_frame, KURL(data), error.failingURL(), s);
// Delete the asset.
delete a;