fix word breaking problem. r=mjudge. treat all word breaking as the same.

layout/generic/nsTextTransformer.cpp

@@ -450,6 +450,11 @@ nsTextTransformer::GetNextWord(PRBool aInWord,
   PRBool isWhitespace = PR_FALSE;
   PRUnichar* result = nsnull;
 
+  // Fix word breaking problem w/ PREFORMAT and PREWRAP
+  // for word breaking, we should really go to the normal code
+  if((! aForLineBreak) && (eNormal != mMode))
+     mMode = eNormal;
+
   while (offset < fragLen) {
     PRUnichar firstChar = frag->CharAt(offset);
 
@@ -764,6 +769,11 @@ nsTextTransformer::GetPrevWord(PRBool aInWord,
   PRBool isWhitespace = PR_FALSE;
   PRUnichar* result = nsnull;
 
+  // Fix word breaking problem w/ PREFORMAT and PREWRAP
+  // for word breaking, we should really go to the normal code
+  if((! aForLineBreak) && (eNormal != mMode))
+     mMode = eNormal;
+
   while (--offset >= 0) {
     PRUnichar firstChar = frag->CharAt(offset);
 

layout/html/base/src/nsTextTransformer.cpp

@@ -450,6 +450,11 @@ nsTextTransformer::GetNextWord(PRBool aInWord,
   PRBool isWhitespace = PR_FALSE;
   PRUnichar* result = nsnull;
 
+  // Fix word breaking problem w/ PREFORMAT and PREWRAP
+  // for word breaking, we should really go to the normal code
+  if((! aForLineBreak) && (eNormal != mMode))
+     mMode = eNormal;
+
   while (offset < fragLen) {
     PRUnichar firstChar = frag->CharAt(offset);
 
@@ -764,6 +769,11 @@ nsTextTransformer::GetPrevWord(PRBool aInWord,
   PRBool isWhitespace = PR_FALSE;
   PRUnichar* result = nsnull;
 
+  // Fix word breaking problem w/ PREFORMAT and PREWRAP
+  // for word breaking, we should really go to the normal code
+  if((! aForLineBreak) && (eNormal != mMode))
+     mMode = eNormal;
+
   while (--offset >= 0) {
     PRUnichar firstChar = frag->CharAt(offset);