Diff
Modified: trunk/Source/WTF/ChangeLog (142760 => 142761)
--- trunk/Source/WTF/ChangeLog 2013-02-13 18:37:30 UTC (rev 142760)
+++ trunk/Source/WTF/ChangeLog 2013-02-13 18:49:15 UTC (rev 142761)
@@ -1,3 +1,12 @@
+2013-02-13 Martin Robinson <[email protected]>
+
+ [GTK] Remove remaining dead code from the GLib unicode backend
+ https://bugs.webkit.org/show_bug.cgi?id=109707
+
+ Reviewed by Philippe Normand.
+
+ * wtf/unicode/Unicode.h:
+
2013-02-13 Andrew Wilson <[email protected]>
Unreviewed Chromium gyp-file cleanup after glib backend removal.
Modified: trunk/Source/WTF/wtf/unicode/Unicode.h (142760 => 142761)
--- trunk/Source/WTF/wtf/unicode/Unicode.h 2013-02-13 18:37:30 UTC (rev 142760)
+++ trunk/Source/WTF/wtf/unicode/Unicode.h 2013-02-13 18:49:15 UTC (rev 142761)
@@ -30,8 +30,6 @@
#if USE(ICU_UNICODE)
#include <wtf/unicode/icu/UnicodeIcu.h>
-#elif USE(GLIB_UNICODE)
-#include <wtf/unicode/glib/UnicodeGLib.h>
#elif USE(WCHAR_UNICODE)
#include <wtf/unicode/wchar/UnicodeWchar.h>
#else
Modified: trunk/Source/WebCore/ChangeLog (142760 => 142761)
--- trunk/Source/WebCore/ChangeLog 2013-02-13 18:37:30 UTC (rev 142760)
+++ trunk/Source/WebCore/ChangeLog 2013-02-13 18:49:15 UTC (rev 142761)
@@ -1,3 +1,18 @@
+2013-02-13 Martin Robinson <[email protected]>
+
+ [GTK] Remove remaining dead code from the GLib unicode backend
+ https://bugs.webkit.org/show_bug.cgi?id=109707
+
+ Reviewed by Philippe Normand.
+
+ * platform/KURL.cpp:
+ (WebCore::appendEncodedHostname):
+ * platform/text/TextEncoding.cpp:
+ (WebCore::TextEncoding::encode):
+ * platform/text/TextEncodingRegistry.cpp:
+ (WebCore::buildBaseTextCodecMaps):
+ (WebCore::extendTextCodecMaps):
+
2013-02-13 Xianzhu Wang <[email protected]>
Heap-use-after-free in WebCore::ScrollingCoordinator::hasVisibleSlowRepaintViewportConstrainedObjects
Modified: trunk/Source/WebCore/platform/KURL.cpp (142760 => 142761)
--- trunk/Source/WebCore/platform/KURL.cpp 2013-02-13 18:37:30 UTC (rev 142760)
+++ trunk/Source/WebCore/platform/KURL.cpp 2013-02-13 18:49:15 UTC (rev 142761)
@@ -44,9 +44,6 @@
#if USE(ICU_UNICODE)
#include <unicode/uidna.h>
-#elif USE(GLIB_UNICODE)
-#include <glib.h>
-#include <wtf/gobject/GOwnPtr.h>
#endif
// FIXME: This file makes too much use of the + operator on String.
@@ -1480,19 +1477,6 @@
hostnameBufferLength, UIDNA_ALLOW_UNASSIGNED, 0, &error);
if (error == U_ZERO_ERROR)
buffer.append(hostnameBuffer, numCharactersConverted);
-#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
}
Modified: trunk/Source/WebCore/platform/text/TextEncoding.cpp (142760 => 142761)
--- trunk/Source/WebCore/platform/text/TextEncoding.cpp 2013-02-13 18:37:30 UTC (rev 142760)
+++ trunk/Source/WebCore/platform/text/TextEncoding.cpp 2013-02-13 18:49:15 UTC (rev 142761)
@@ -37,9 +37,6 @@
#if USE(ICU_UNICODE)
#include <unicode/unorm.h>
-#elif USE(GLIB_UNICODE)
-#include <glib.h>
-#include <wtf/gobject/GOwnPtr.h>
#endif
namespace WebCore {
@@ -104,22 +101,6 @@
sourceLength = normalizedLength;
}
return newTextCodec(*this)->encode(source, sourceLength, handling);
-#elif USE(GLIB_UNICODE)
- GOwnPtr<char> UTF8Source;
- UTF8Source.set(g_utf16_to_utf8(characters, length, 0, 0, 0));
- if (!UTF8Source) {
- // If conversion to UTF-8 failed, try with the string without normalization
- return newTextCodec(*this)->encode(characters, length, handling);
- }
-
- GOwnPtr<char> UTF8Normalized;
- UTF8Normalized.set(g_utf8_normalize(UTF8Source.get(), -1, G_NORMALIZE_NFC));
-
- long UTF16Length;
- GOwnPtr<UChar> UTF16Normalized;
- UTF16Normalized.set(g_utf8_to_utf16(UTF8Normalized.get(), -1, 0, &UTF16Length, 0));
-
- return newTextCodec(*this)->encode(UTF16Normalized.get(), UTF16Length, handling);
#elif OS(WINDOWS) && USE(WCHAR_UNICODE)
// normalization will be done by Windows CE API
OwnPtr<TextCodec> textCodec = newTextCodec(*this);
Modified: trunk/Source/WebCore/platform/text/TextEncodingRegistry.cpp (142760 => 142761)
--- trunk/Source/WebCore/platform/text/TextEncodingRegistry.cpp 2013-02-13 18:37:30 UTC (rev 142760)
+++ trunk/Source/WebCore/platform/text/TextEncodingRegistry.cpp 2013-02-13 18:49:15 UTC (rev 142761)
@@ -45,9 +45,6 @@
#if PLATFORM(MAC)
#include "TextCodecMac.h"
#endif
-#if USE(GLIB_UNICODE)
-#include "gtk/TextCodecGtk.h"
-#endif
#if OS(WINDOWS) && USE(WCHAR_UNICODE)
#include "win/TextCodecWin.h"
#endif
@@ -225,12 +222,6 @@
TextCodecUserDefined::registerEncodingNames(addToTextEncodingNameMap);
TextCodecUserDefined::registerCodecs(addToTextCodecMap);
-
-#if USE(GLIB_UNICODE)
- // FIXME: This is not needed. The code above covers all the base codecs.
- TextCodecGtk::registerBaseEncodingNames(addToTextEncodingNameMap);
- TextCodecGtk::registerBaseCodecs(addToTextCodecMap);
-#endif
}
static void addEncodingName(HashSet<const char*>* set, const char* name)
@@ -298,11 +289,6 @@
TextCodecMac::registerCodecs(addToTextCodecMap);
#endif
-#if USE(GLIB_UNICODE)
- TextCodecGtk::registerExtendedEncodingNames(addToTextEncodingNameMap);
- TextCodecGtk::registerExtendedCodecs(addToTextCodecMap);
-#endif
-
#if OS(WINDOWS) && USE(WCHAR_UNICODE)
TextCodecWin::registerExtendedEncodingNames(addToTextEncodingNameMap);
TextCodecWin::registerExtendedCodecs(addToTextCodecMap);
