Changeset 97624 in webkit

Timestamp:

Oct 17, 2011 9:23:51 AM (13 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK] Add methods to get/set a custom text enconding to WebKit2 GTK+ API
​https://bugs.webkit.org/show_bug.cgi?id=69524

Reviewed by Martin Robinson.

• UIProcess/API/gtk/WebKitWebView.cpp:

(webkit_web_view_get_custom_charset):
(webkit_web_view_set_custom_charset):

• UIProcess/API/gtk/WebKitWebView.h:
• UIProcess/API/gtk/tests/TestWebKitWebView.cpp:

(testWebViewCustomCharset):
(beforeAll):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/gtk/WebKitWebView.cpp (modified) (2 diffs)
• UIProcess/API/gtk/WebKitWebView.h (modified) (1 diff)
• UIProcess/API/gtk/tests/TestWebKitWebView.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-10-17  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Add methods to get/set a custom text enconding to WebKit2 GTK+ API
+        https://bugs.webkit.org/show_bug.cgi?id=69524
+
+        Reviewed by Martin Robinson.
+
+        * UIProcess/API/gtk/WebKitWebView.cpp:
+        (webkit_web_view_get_custom_charset):
+        (webkit_web_view_set_custom_charset):
+        * UIProcess/API/gtk/WebKitWebView.h:
+        * UIProcess/API/gtk/tests/TestWebKitWebView.cpp:
+        (testWebViewCustomCharset):
+        (beforeAll):
+
 2011-10-14  Jesus Sanchez-Palencia  <jesus.palencia@openbossa.org>
 

trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp

@@ -44 +44 @@
 struct _WebKitWebViewPrivate {
     WebKitWebContext* context;
+    CString customTextEncoding;
 
     GRefPtr<WebKitWebLoaderClient> loaderClient;
@@ -311 +312 @@
     WKPageGoForward(toAPI(page));
 }
+
+/**
+ * webkit_web_view_get_custom_charset:
+ * @web_view: a #WebKitWebView
+ *
+ * Returns the current custom character encoding name of @web_view.
+ *
+ * Returns: the current custom character encoding name or %NULL if no
+ *    custom character encoding has been set.
+ */
+const gchar* webkit_web_view_get_custom_charset(WebKitWebView* webView)
+{
+    g_return_val_if_fail(WEBKIT_IS_WEB_VIEW(webView), 0);
+
+    WebPageProxy* page = webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView));
+    WKRetainPtr<WKStringRef> wkCustomEncoding(AdoptWK, WKPageCopyCustomTextEncodingName(toAPI(page)));
+    if (WKStringIsEmpty(wkCustomEncoding.get()))
+        return 0;
+
+    webView->priv->customTextEncoding = toImpl(wkCustomEncoding.get())->string().utf8();
+    return webView->priv->customTextEncoding.data();
+}
+
+/**
+ * webkit_web_view_set_custom_charset:
+ * @web_view: a #WebKitWebView
+ * @charset: (allow-none): a character encoding name or %NULL
+ *
+ * Sets the current custom character encoding override of @web_view. The custom
+ * character encoding will override any text encoding detected via HTTP headers or
+ * META tags. Calling this method will stop any current load operation and reload the
+ * current page. Setting the custom character encoding to %NULL removes the character
+ * encoding override.
+ */
+void webkit_web_view_set_custom_charset(WebKitWebView* webView, const gchar* charset)
+{
+    g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
+
+    WebPageProxy* page = webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView));
+    WKRetainPtr<WKStringRef> wkEncodingName = charset ? adoptWK(WKStringCreateWithUTF8CString(charset)) : 0;
+    WKPageSetCustomTextEncodingName(toAPI(page), wkEncodingName.get());
+}

trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.h

@@ -108 +108 @@
 webkit_web_view_go_forward          (WebKitWebView         *web_view);
 
+WEBKIT_API const gchar *
+webkit_web_view_get_custom_charset  (WebKitWebView         *web_view);
+
+WEBKIT_API void
+webkit_web_view_set_custom_charset  (WebKitWebView         *web_view,
+                                     const gchar           *charset);
+
 G_END_DECLS
 

trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitWebView.cpp

@@ -27 +27 @@
 }
 
+static void testWebViewCustomCharset(WebViewTest* test, gconstpointer)
+{
+    g_assert(!webkit_web_view_get_custom_charset(test->m_webView));
+    webkit_web_view_set_custom_charset(test->m_webView, "utf8");
+    g_assert_cmpstr(webkit_web_view_get_custom_charset(test->m_webView), ==, "utf8");
+    // Go back to the default charset.
+    webkit_web_view_set_custom_charset(test->m_webView, 0);
+    g_assert(!webkit_web_view_get_custom_charset(test->m_webView));
+}
+
+
 void beforeAll()
 {
     WebViewTest::add("WebKitWebView", "default-context", testWebViewDefaultContext);
+    WebViewTest::add("WebKitWebView", "custom-charset", testWebViewCustomCharset);
 }