2010-03-04 Fridrich Strba <fridrich.strba@bluewin.ch>

        Reviewed by Holger Freyther.

        https://bugs.webkit.org/show_bug.cgi?id=35726
        Remove orphaned #ifdef WTF_USE_GLIB_ICU_UNICODE_HYBRID

        Removing orphaned #if USE.

        * GNUmakefile.am:
2010-03-04  Fridrich Strba  <fridrich.strba@bluewin.ch>

        Reviewed by Holger Freyther.

        https://bugs.webkit.org/show_bug.cgi?id=35726
        Remove orphaned #ifdef WTF_USE_GLIB_ICU_UNICODE_HYBRID

        Removing orphaned #if USE.

        * platform/ThreadGlobalData.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@55524 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index d816d14fd129eeccb1637ae56f769d1406ddb200..a2803926b092f6bd38688fd0f050365b15aa6b01 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-03-04  Fridrich Strba  <fridrich.strba@bluewin.ch>
+
+        Reviewed by Holger Freyther.
+
+        https://bugs.webkit.org/show_bug.cgi?id=35726
+        Remove orphaned #ifdef WTF_USE_GLIB_ICU_UNICODE_HYBRID
+
+        Removing orphaned #if USE.
+
+        * GNUmakefile.am:
+
 2010-03-04  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
 
         Reviewed by Tor Arne Vestbø.

diff --git a/GNUmakefile.am b/GNUmakefile.am
index dbcd52a2f57bb461781ab0aba68129f8fe9a2942..9f0fa20e0ca25523e8fc2aa1b061dd3f3b285347 100644 (file)
--- a/GNUmakefile.am
+++ b/GNUmakefile.am
@@ -272,16 +272,8 @@ global_cppflags += \
 endif
 
 if USE_GLIB_UNICODE
-# https://bugs.webkit.org/show_bug.cgi?id=15914
-# In patch 1/4 we are compiling a hybrid version of GLib WTF Unicode
-# functionality mixed with ICU-based text codecs and TextBreakIterator.
-# For the transition, introducing an interim HYBRID macro.
-# This macro is required for compiling WTF with GLib Unicode backend,
-# but at the same time keeping ICU dependency for codecs and break iterator.
-# It will be removed with patch 3/4 of the above bug.
 global_cppflags += \
-       -DWTF_USE_GLIB_UNICODE=1 \
-       -DWTF_USE_GLIB_ICU_UNICODE_HYBRID=1
+       -DWTF_USE_GLIB_UNICODE=1
 endif
 
 if !ENABLE_FAST_MALLOC

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d4e36176f96ae3d40c5fad1060d524b415973a7e..9042f4e3029fb88f6ed8964870b563c585445d95 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-03-04  Fridrich Strba  <fridrich.strba@bluewin.ch>
+
+        Reviewed by Holger Freyther.
+
+        https://bugs.webkit.org/show_bug.cgi?id=35726
+        Remove orphaned #ifdef WTF_USE_GLIB_ICU_UNICODE_HYBRID
+
+        Removing orphaned #if USE.
+
+        * platform/ThreadGlobalData.h:
+
 2010-03-03  Jeremy Orlow  <jorlow@chromium.org>
 
         Reviewed by Darin Fisher.

diff --git a/WebCore/platform/ThreadGlobalData.h b/WebCore/platform/ThreadGlobalData.h
index 9f7865d75a97587142504eaf323ef37005967b68..2f80d7b120443aee9b47593840e82910396cf32e 100644 (file)
--- a/WebCore/platform/ThreadGlobalData.h
+++ b/WebCore/platform/ThreadGlobalData.h
@@ -55,7 +55,7 @@ namespace WebCore {
         HashSet<StringImpl*>& atomicStringTable() { return *m_atomicStringTable; }
         ThreadTimers& threadTimers() { return *m_threadTimers; }
 
-#if USE(ICU_UNICODE) || USE(GLIB_ICU_UNICODE_HYBRID)
+#if USE(ICU_UNICODE)
         ICUConverterWrapper& cachedConverterICU() { return *m_cachedConverterICU; }
 #endif
 
@@ -73,7 +73,7 @@ namespace WebCore {
         bool m_isMainThread;
 #endif
 
-#if USE(ICU_UNICODE) || USE(GLIB_ICU_UNICODE_HYBRID)
+#if USE(ICU_UNICODE)
         ICUConverterWrapper* m_cachedConverterICU;
 #endif