[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 35236ae982428dd3e633995c7119dc10377a0163
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Mar 4 15:03:16 2010 +0000

    2010-03-04  Fridrich Strba  <fridrich.strba at 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 at 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: http://svn.webkit.org/repository/webkit/trunk@55524 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index d816d14..a280392 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-03-04  Fridrich Strba  <fridrich.strba at 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 at nokia.com>
 
         Reviewed by Tor Arne Vestbø.
diff --git a/GNUmakefile.am b/GNUmakefile.am
index dbcd52a..9f0fa20 100644
--- 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 d4e3617..9042f4e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-03-04  Fridrich Strba  <fridrich.strba at 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 at chromium.org>
 
         Reviewed by Darin Fisher.
diff --git a/WebCore/platform/ThreadGlobalData.h b/WebCore/platform/ThreadGlobalData.h
index 9f7865d..2f80d7b 100644
--- 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
 

-- 
WebKit Debian packaging