Commit 58e24c14 authored by dbates@webkit.org's avatar dbates@webkit.org

2011-09-08 Daniel Bates <dbates@webkit.org>

        Fix the GTK build after <http://trac.webkit.org/changeset/94810>
        (https://bugs.webkit.org/show_bug.cgi?id=67807).

        * webkit/webkitwebview.cpp:
        (webkit_web_view_get_encoding): Substitute DocumentWriter::deprecatedFrameEncoding() for
        DocumentWriter::encoding().


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@94826 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 2edec853
2011-09-08 Daniel Bates <dbates@webkit.org>
Fix the GTK build after <http://trac.webkit.org/changeset/94810>
(https://bugs.webkit.org/show_bug.cgi?id=67807).
* webkit/webkitwebview.cpp:
(webkit_web_view_get_encoding): Substitute DocumentWriter::deprecatedFrameEncoding() for
DocumentWriter::encoding().
2011-09-06 Ryosuke Niwa <rniwa@webkit.org>
Rename confirmCompositionWithoutDisturbingSelection to cancelComposition
......
......@@ -4531,7 +4531,7 @@ gdouble webkit_web_view_get_progress(WebKitWebView* webView)
const gchar* webkit_web_view_get_encoding(WebKitWebView* webView)
{
g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), NULL);
String encoding = core(webView)->mainFrame()->document()->loader()->writer()->encoding();
String encoding = core(webView)->mainFrame()->document()->loader()->writer()->deprecatedFrameEncoding();
if (encoding.isEmpty())
return 0;
webView->priv->encoding = encoding.utf8();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment