Title: [123291] trunk/Source/WebCore
Revision
123291
Author
[email protected]
Date
2012-07-21 07:50:10 -0700 (Sat, 21 Jul 2012)

Log Message

Cleanup TextEncoding USE(XXX_UNICODE) macros
https://bugs.webkit.org/show_bug.cgi?id=91923

Reviewed by Andreas Kling.

Replace PLATFORM(QT) with USE(QT4_UNICODE) and OS(WINCE) with USE(WINCE_UNICODE).
This gives us more flexibility in choosing the unicode backend for a port.

* platform/text/TextEncoding.cpp:
(WebCore::TextEncoding::encode):
* platform/text/TextEncodingRegistry.cpp:
(WebCore::extendTextCodecMaps):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (123290 => 123291)


--- trunk/Source/WebCore/ChangeLog	2012-07-21 11:10:26 UTC (rev 123290)
+++ trunk/Source/WebCore/ChangeLog	2012-07-21 14:50:10 UTC (rev 123291)
@@ -1,5 +1,20 @@
 2012-07-21  Patrick Gansterer  <[email protected]>
 
+        Cleanup TextEncoding USE(XXX_UNICODE) macros
+        https://bugs.webkit.org/show_bug.cgi?id=91923
+
+        Reviewed by Andreas Kling.
+
+        Replace PLATFORM(QT) with USE(QT4_UNICODE) and OS(WINCE) with USE(WINCE_UNICODE).
+        This gives us more flexibility in choosing the unicode backend for a port.
+
+        * platform/text/TextEncoding.cpp:
+        (WebCore::TextEncoding::encode):
+        * platform/text/TextEncodingRegistry.cpp:
+        (WebCore::extendTextCodecMaps):
+
+2012-07-21  Patrick Gansterer  <[email protected]>
+
         Remove unnecessary ICU header includes from SimpleFontDataWin.cpp
         https://bugs.webkit.org/show_bug.cgi?id=91922
 

Modified: trunk/Source/WebCore/platform/text/TextEncoding.cpp (123290 => 123291)


--- trunk/Source/WebCore/platform/text/TextEncoding.cpp	2012-07-21 11:10:26 UTC (rev 123290)
+++ trunk/Source/WebCore/platform/text/TextEncoding.cpp	2012-07-21 14:50:10 UTC (rev 123291)
@@ -125,7 +125,7 @@
     UTF16Normalized.set(g_utf8_to_utf16(UTF8Normalized.get(), -1, 0, &UTF16Length, 0));
 
     return newTextCodec(*this)->encode(UTF16Normalized.get(), UTF16Length, handling);
-#elif OS(WINCE)
+#elif USE(WINCE_UNICODE)
     // normalization will be done by Windows CE API
     OwnPtr<TextCodec> textCodec = newTextCodec(*this);
     return textCodec.get() ? textCodec->encode(characters, length, handling) : CString();

Modified: trunk/Source/WebCore/platform/text/TextEncodingRegistry.cpp (123290 => 123291)


--- trunk/Source/WebCore/platform/text/TextEncodingRegistry.cpp	2012-07-21 11:10:26 UTC (rev 123290)
+++ trunk/Source/WebCore/platform/text/TextEncodingRegistry.cpp	2012-07-21 14:50:10 UTC (rev 123291)
@@ -45,13 +45,13 @@
 #if PLATFORM(MAC)
 #include "TextCodecMac.h"
 #endif
-#if PLATFORM(QT)
+#if USE(QT4_UNICODE)
 #include "qt/TextCodecQt.h"
 #endif
 #if USE(GLIB_UNICODE)
 #include "gtk/TextCodecGtk.h"
 #endif
-#if OS(WINCE) && !PLATFORM(QT)
+#if USE(WINCE_UNICODE)
 #include "TextCodecWinCE.h"
 #endif
 
@@ -311,7 +311,7 @@
     TextCodecGtk::registerExtendedCodecs(addToTextCodecMap);
 #endif
 
-#if OS(WINCE) && !PLATFORM(QT)
+#if USE(WINCE_UNICODE)
     TextCodecWinCE::registerExtendedEncodingNames(addToTextEncodingNameMap);
     TextCodecWinCE::registerExtendedCodecs(addToTextCodecMap);
 #endif
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to