Changeset 53940 in webkit

Timestamp:

Jan 27, 2010 10:19:39 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-01-27 Dominik Röttsches <​dominik.roettsches@access-company.com>

Reviewed by Xan Lopez.

[Gtk] For removing ICU, implement IDN support by means of libidn
​https://bugs.webkit.org/show_bug.cgi?id=31470

In order to avoid a new dependency,
IDN support now based on GLib for the GLib unicode backend.

• platform/KURL.cpp: (WebCore::appendEncodedHostname):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/KURL.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-01-27  Dominik Röttsches  <dominik.roettsches@access-company.com>
+
+        Reviewed by Xan Lopez.
+
+        [Gtk] For removing ICU, implement IDN support by means of libidn
+        https://bugs.webkit.org/show_bug.cgi?id=31470
+
+        In order to avoid a new dependency, 
+        IDN support now based on GLib for the GLib unicode backend.
+
+        * platform/KURL.cpp:
+        (WebCore::appendEncodedHostname):
+
 2010-01-27  Simon Hausmann  <simon.hausmann@nokia.com>
 

trunk/WebCore/platform/KURL.cpp

@@ -39 +39 @@
 #elif USE(QT4_UNICODE)
 #include <QUrl>
+#elif USE(GLIB_UNICODE)
+#include <glib.h>
+#include <wtf/gtk/GOwnPtr.h>
 #endif
 
@@ -1411 +1414 @@
     QByteArray result = QUrl::toAce(String(str, strLen));
     buffer.append(result.constData(), result.length());
+#elif USE(GLIB_UNICODE)
+    GOwnPtr<gchar> utf8Hostname;
+    GOwnPtr<GError> utf8Err;
+    utf8Hostname.set(g_utf16_to_utf8(str, strLen, 0, 0, &utf8Err.outPtr()));
+    if (utf8Err)
+        return;
+
+    GOwnPtr<gchar> encodedHostname;
+    encodedHostname.set(g_hostname_to_ascii(utf8Hostname.get()));
+    if (!encodedHostname) 
+        return;
+
+    buffer.append(encodedHostname.get(), strlen(encodedHostname.get()));
 #endif
 }