Backing out to fix bustage :-(
authorroc+@cs.cmu.edu
Wed, 23 May 2007 22:16:52 -0700
changeset 1822 9b38e8d21d5f53effe9b8079aaf94ba6fb01e2d8
parent 1821 834c323bfe31d8bee2b329609f15a0f7f696c562
child 1823 56d35c24e22d8c284aa2bc79f3a63d7bd8e1921e
push idunknown
push userunknown
push dateunknown
milestone1.9a5pre
Backing out to fix bustage :-(
content/base/src/nsLineBreaker.cpp
intl/build/Makefile.in
intl/build/nsI18nModule.cpp
intl/lwbrk/src/Makefile.in
intl/lwbrk/src/nsLWBrkConstructors.h
intl/lwbrk/src/nsLWIMP.h
intl/lwbrk/src/nsPangoLineBreaker.cpp
--- a/content/base/src/nsLineBreaker.cpp
+++ b/content/base/src/nsLineBreaker.cpp
@@ -52,22 +52,20 @@ static inline int
 IS_SPACE(PRUint8 u)
 {
   return u == 0x0020;
 }
 
 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()
   : mCurrentWordContainsCJK(PR_FALSE),
     mBreakBeforeNonWhitespace(PR_FALSE)
 {
 }
 
--- a/intl/build/Makefile.in
+++ b/intl/build/Makefile.in
@@ -101,18 +101,8 @@ EXTRA_DSO_LDOPTS = \
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 EXTRA_DSO_LDOPTS += \
         $(TK_LIBS) \
         $(NULL)
 endif
 
 include $(topsrcdir)/config/rules.mk
 
-ifdef MOZ_ENABLE_PANGO
-CXXFLAGS += \
-	$(MOZ_PANGO_CFLAGS) \
-	$(NULL)
-
-EXTRA_DSO_LDOPTS += \
-	$(MOZ_PANGO_LIBS) \
-	$(NULL)
-endif
-
--- a/intl/build/nsI18nModule.cpp
+++ b/intl/build/nsI18nModule.cpp
@@ -54,23 +54,18 @@
 #include "nsLocaleConstructors.h"
 
 
 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,
     NS_SEMANTICUNITSCANNER_CONTRACTID, nsSemanticUnitScannerConstructor},
 
  // unicharutil
   { "Unichar Utility", NS_UNICHARUTIL_CID, 
       NS_UNICHARUTIL_CONTRACTID, nsCaseConversionImp2Constructor},
--- a/intl/lwbrk/src/Makefile.in
+++ b/intl/lwbrk/src/Makefile.in
@@ -50,34 +50,14 @@ LIBXUL_LIBRARY  = 1
 REQUIRES	= xpcom \
 		  string \
 		  unicharutil \
 		  $(NULL)
 
 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
-
--- a/intl/lwbrk/src/nsLWBrkConstructors.h
+++ b/intl/lwbrk/src/nsLWBrkConstructors.h
@@ -36,26 +36,17 @@
  * ***** END LICENSE BLOCK ***** */
 
 #ifndef nsLWBrkConstructors_h__
 #define nsLWBrkConstructors_h__
 
 #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
      
--- a/intl/lwbrk/src/nsLWIMP.h
+++ b/intl/lwbrk/src/nsLWIMP.h
@@ -32,21 +32,15 @@
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 #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__ */
--- a/intl/lwbrk/src/nsPangoLineBreaker.cpp
+++ b/intl/lwbrk/src/nsPangoLineBreaker.cpp
@@ -114,33 +114,33 @@ nsPangoLineBreaker::Prev(const PRUnichar
   return NS_LINEBREAKER_NEED_MORE_TEXT;
 }
 
 void
 nsPangoLineBreaker::GetJISx4051Breaks(const PRUnichar* aText, PRUint32 aLen,
                                       PRPackedBool* aBreakBefore)
 {
   NS_ASSERTION(aText, "aText shouldn't be null");
+  NS_ASSERTION(aLen > aPos, "Illegal value (length > position)");
 
   nsAutoTArray<PangoLogAttr, 2000> attrBuffer;
   if (!attrBuffer.AppendElements(aLen + 1))
     return;
 
   NS_ConvertUTF16toUTF8 aUTF8(aText, aLen);
 
   const gchar* p = aUTF8.Data();
   const gchar* end = p + aUTF8.Length();
   PRUint32     u16Offset = 0;
 
-  static PangoLanguage* language = pango_language_from_string("en");
-
   while (p < end)
   {
     PangoLogAttr* attr = attrBuffer.Elements();
-    pango_get_log_attrs(p, end - p, -1, language, attr, attrBuffer.Length());
+    pango_get_log_attrs(p, end - p, -1, pango_language_get_default(),
+                        attr, attrBuffer.Length());
 
     while (p < end)
     {
       aBreakBefore[u16Offset] = attr->is_line_break;
       if (NS_IS_LOW_SURROGATE(aText[u16Offset]))
         aBreakBefore[++u16Offset] = PR_FALSE; // Skip high surrogate
       ++u16Offset;