diff options
| author | Steve Block <steveblock@google.com> | 2012-04-12 07:58:24 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-12 07:58:25 -0700 |
| commit | 9d5dcb4073f42efce6325ead421506902827febf (patch) | |
| tree | 54de209dd5b07b5c567e36e556f2ceb958f5fa69 /Source/WebKit/gtk/webkit | |
| parent | 2d59667e270387d6bf950a6cf680ab3fe0912808 (diff) | |
| parent | 6ed1fdfa7999878a811b09cdd647fbeace4353b8 (diff) | |
| download | external_webkit-9d5dcb4073f42efce6325ead421506902827febf.zip external_webkit-9d5dcb4073f42efce6325ead421506902827febf.tar.gz external_webkit-9d5dcb4073f42efce6325ead421506902827febf.tar.bz2 | |
Merge "Cherry-pick WebKit change r87623 to fix use of KURL::prettyURL()"
Diffstat (limited to 'Source/WebKit/gtk/webkit')
| -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(); } |