Title: [94826] trunk/Source/WebKit/gtk
- Revision
- 94826
- Author
- [email protected]
- Date
- 2011-09-08 18:29:35 -0700 (Thu, 08 Sep 2011)
Log Message
2011-09-08 Daniel Bates <[email protected]>
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().
Modified Paths
Diff
Modified: trunk/Source/WebKit/gtk/ChangeLog (94825 => 94826)
--- trunk/Source/WebKit/gtk/ChangeLog 2011-09-09 01:25:42 UTC (rev 94825)
+++ trunk/Source/WebKit/gtk/ChangeLog 2011-09-09 01:29:35 UTC (rev 94826)
@@ -1,3 +1,12 @@
+2011-09-08 Daniel Bates <[email protected]>
+
+ 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 <[email protected]>
Rename confirmCompositionWithoutDisturbingSelection to cancelComposition
Modified: trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp (94825 => 94826)
--- trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp 2011-09-09 01:25:42 UTC (rev 94825)
+++ trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp 2011-09-09 01:29:35 UTC (rev 94826)
@@ -4531,7 +4531,7 @@
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();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
