diff options
| author | Steve Block <steveblock@google.com> | 2012-03-27 18:37:04 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2012-03-28 16:47:03 +0100 |
| commit | 6ed1fdfa7999878a811b09cdd647fbeace4353b8 (patch) | |
| tree | ad88503212f21676929335576967232e5b63477d /Source/WebKit/gtk/webkit/webkitwebview.cpp | |
| parent | db951b2c4c8fce1304a13d97dec4ae14be629380 (diff) | |
| download | external_webkit-6ed1fdfa7999878a811b09cdd647fbeace4353b8.zip external_webkit-6ed1fdfa7999878a811b09cdd647fbeace4353b8.tar.gz external_webkit-6ed1fdfa7999878a811b09cdd647fbeace4353b8.tar.bz2 | |
Cherry-pick WebKit change r87623 to fix use of KURL::prettyURL()
This is a prerequisite for http://trac.webkit.org/changeset/96779 to fix
window.location.
Note that a conflict occurred in
Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp but the
change is not required.
See http://trac.webkit.org/changeset/87623
Bug: 2159848
Change-Id: I5614b3588f30508f81b562aa7fb2f9027c2bda72
Diffstat (limited to 'Source/WebKit/gtk/webkit/webkitwebview.cpp')
| -rw-r--r-- | Source/WebKit/gtk/webkit/webkitwebview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebKit/gtk/webkit/webkitwebview.cpp b/Source/WebKit/gtk/webkit/webkitwebview.cpp index 85ad904..3b9ebe3 100644 --- a/Source/WebKit/gtk/webkit/webkitwebview.cpp +++ b/Source/WebKit/gtk/webkit/webkitwebview.cpp @@ -5034,7 +5034,7 @@ WebKitHitTestResult* webkit_web_view_get_hit_test_result(WebKitWebView* webView, G_CONST_RETURN gchar* webkit_web_view_get_icon_uri(WebKitWebView* webView) { g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), 0); - String iconURL = iconDatabase().synchronousIconURLForPageURL(core(webView)->mainFrame()->document()->url().prettyURL()); + String iconURL = iconDatabase().synchronousIconURLForPageURL(core(webView)->mainFrame()->document()->url().string()); webView->priv->iconURI = iconURL.utf8(); return webView->priv->iconURI.data(); } |