2011-09-08 Daniel Bates <dbates@webkit.org>
authordbates@webkit.org <dbates@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 9 Sep 2011 01:29:35 +0000 (01:29 +0000)
committerdbates@webkit.org <dbates@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 9 Sep 2011 01:29:35 +0000 (01:29 +0000)
        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: https://svn.webkit.org/repository/webkit/trunk@94826 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit/gtk/ChangeLog
Source/WebKit/gtk/webkit/webkitwebview.cpp

index 9d723b9dfc3f11929a85a857388b226ec0462292..a1efe9e0e504990e8f3815c22b20fdf12ff6b621 100644 (file)
@@ -1,3 +1,12 @@
+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
index 38be5a29788d986dda05dac1d8c971e3630856b8..f74be377e30802fb158f6caf5d4982f2d97e3929 100644 (file)
@@ -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();