Backing out due to bustage.

content/base/src/nsLineBreaker.cpp

@@ -57,12 +57,10 @@ IS_SPACE(PRUint8 u)
 static inline int
 IS_CJK_CHAR(PRUnichar u)
 {
-  // CJK plus other scripts that require special line breaking treatment
-  return (0x0e01 <= u && u <= 0x0e5f) || // Thai
-         (0x1100 <= u && u <= 0x11ff) || // Hangul Jamo
-         (0x2e80 <= u && u <= 0xd7ff) || // several CJK blocks
-         (0xf900 <= u && u <= 0xfaff) || // CJK Compatibility Idographs
-         (0xff00 <= u && u <= 0xffef);   // Halfwidth and Fullwidth Forms
+  return (0x1100 <= u && u <= 0x11ff) ||
+         (0x2e80 <= u && u <= 0xd7ff) ||
+         (0xf900 <= u && u <= 0xfaff) ||
+         (0xff00 <= u && u <= 0xffef);
 }
 
 nsLineBreaker::nsLineBreaker()

intl/build/Makefile.in

@@ -106,13 +106,3 @@ endif
 
 include $(topsrcdir)/config/rules.mk
 
-ifdef MOZ_ENABLE_PANGO
-CXXFLAGS += \
-	$(MOZ_PANGO_CFLAGS) \
-	$(NULL)
-
-EXTRA_DSO_LDOPTS += \
-	$(MOZ_PANGO_LIBS) \
-	$(NULL)
-endif
-

intl/build/nsI18nModule.cpp

@@ -59,13 +59,8 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsSemanticUnitScanner)
 static nsModuleComponentInfo components[] =
 {
  // lwbrk
-#ifdef MOZ_ENABLE_PANGO
-  { "Line Breaker", NS_LBRK_CID, 
-    NS_LBRK_CONTRACTID, nsPangoLineBreakerConstructor},
-#else
   { "Line Breaker", NS_LBRK_CID, 
     NS_LBRK_CONTRACTID, nsJISx4051LineBreakerConstructor},
-#endif
   { "Word Breaker", NS_WBRK_CID,
     NS_WBRK_CONTRACTID, nsSampleWordBreakerConstructor},
   { "Semantic Unit Scanner", NS_SEMANTICUNITSCANNER_CID,

intl/lwbrk/src/Makefile.in

@@ -55,29 +55,9 @@ REQUIRES	= xpcom \
 CSRCS		= rulebrk.c
 
 CPPSRCS		= \
+		nsJISx4501LineBreaker.cpp \
 		nsSampleWordBreaker.cpp \
 		nsSemanticUnitScanner.cpp \
 		$(NULL)
 
-ifdef MOZ_ENABLE_PANGO
-CPPSRCS		+= \
-		nsPangoLineBreaker.cpp \
-		$(NULL)
-else
-CPPSRCS		+= \
-		nsJISx4501LineBreaker.cpp \
-		$(NULL)
-endif
-
 include $(topsrcdir)/config/rules.mk
-
-ifdef MOZ_ENABLE_PANGO
-CXXFLAGS		+= \
-			$(MOZ_PANGO_CFLAGS) \
-			$(NULL)
-
-EXTRA_DSO_LDOPTS	+= \
-			$(MOZ_PANGO_LIBS) \
-			$(NULL)
-endif
-

intl/lwbrk/src/nsLWBrkConstructors.h

@@ -41,20 +41,11 @@
 #include "nsLWBrkCIID.h"
 #include "nsILineBreaker.h"
 #include "nsIWordBreaker.h"
-#ifdef MOZ_ENABLE_PANGO
-# include "nsPangoLineBreaker.h"
-#else
-# include "nsJISx4501LineBreaker.h"
-#endif
+#include "nsJISx4501LineBreaker.h"
 #include "nsSampleWordBreaker.h"
 #include "nsLWBRKDll.h"
 
-#ifdef MOZ_ENABLE_PANGO
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsPangoLineBreaker)
-#else
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsJISx4051LineBreaker)
-#endif
-
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsSampleWordBreaker)
 
 #endif

intl/lwbrk/src/nsLWIMP.h

@@ -37,16 +37,10 @@
 #ifndef nsLWIMP_h__
 #define nsLWIMP_h__
 
-#ifdef MOZ_ENABLE_PANGO
-# include "nsPangoLineBreaker.h"
-# define LINEBREAKER nsPangoLineBreaker
-#else
-# include "nsJISx4501LineBreaker.h"
-# define LINEBREAKER nsJISx4501LineBreaker
-#endif
-
+#include "nsJISx4501LineBreaker.h"
 #include "nsSampleWordBreaker.h"
 
+#define LINEBREAKER nsJISx4501LineBreaker
 #define WORDBREAKER nsSampleWordBreaker
 
 #endif  /* nsLWIMP_h__ */