[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[rjw]

The following commit has been merged in the debian/unstable branch:
commit 7402dcc52cba2f6b1cacd8275bd142058697459a
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 23 02:08:47 2003 +0000

            Fix the fix to 3119777 to scan for break over entire string
            instead of trying to optimize.
    
            Reviewed by hyatt.
    
            * khtml/rendering/break_lines.cpp:
            Pass offset into entire string, rather than try to optimize
            by passing a shorter string.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3412 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 6175dc3..96c2e09 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,14 @@
+2003-01-22  Richard Williamson   <rjw at apple.com>
+
+        Fix the fix to 3119777 to scan for break over entire string
+        instead of trying to optimize.
+        
+        Reviewed by hyatt.
+
+        * khtml/rendering/break_lines.cpp:
+        Pass offset into entire string, rather than try to optimize
+        by passing a shorter string.
+
 2003-01-22  David Hyatt  <hyatt at apple.com>
 
 	Fix the CSS parser so that it disallows class names beginning
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 6175dc3..96c2e09 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2003-01-22  Richard Williamson   <rjw at apple.com>
+
+        Fix the fix to 3119777 to scan for break over entire string
+        instead of trying to optimize.
+        
+        Reviewed by hyatt.
+
+        * khtml/rendering/break_lines.cpp:
+        Pass offset into entire string, rather than try to optimize
+        by passing a shorter string.
+
 2003-01-22  David Hyatt  <hyatt at apple.com>
 
 	Fix the CSS parser so that it disallows class names beginning
diff --git a/WebCore/khtml/rendering/break_lines.cpp b/WebCore/khtml/rendering/break_lines.cpp
index 1014016..46f56fb 100644
--- a/WebCore/khtml/rendering/break_lines.cpp
+++ b/WebCore/khtml/rendering/break_lines.cpp
@@ -91,11 +91,11 @@ bool isBreakable( const QChar *s, int pos, int len)
     if (ch > 0x7f){
         status = UCCreateTextBreakLocator (NULL, 0, kUCTextBreakWordMask, &breakLocator);
         if (status == 0){
-            findStatus = UCFindTextBreak (breakLocator,  kUCTextBreakWordMask, NULL, (const UniChar *)c, (UniCharCount)len-pos, (UniCharArrayOffset)0, (UniCharArrayOffset *)&end);
+            findStatus = UCFindTextBreak (breakLocator,  kUCTextBreakWordMask, NULL, (const UniChar *)s, (UniCharCount)len, (UniCharArrayOffset)pos, (UniCharArrayOffset *)&end);
         }
         // If carbon fails, fail back on simple white space detection.
         if (findStatus == 0)
-            return end == 0 ? true : false;
+            return ((int)end == pos) ? true : false;
     }
     // What about hypenation?  We will correctly handle japanese hyphenation above, but
     // not here.

-- 
WebKit Debian packaging