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

hyatt hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 08:12:52 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 2335d1597069bf7a59c66ad54f0ac03b237a8033
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 17 22:08:09 2003 +0000

    	Fix for 2931829, lines with hyphens should break on the hyphens.  Match WinIE's behavior of
    	breaking on - and ?.
    
            Reviewed by john
    
            * khtml/rendering/break_lines.cpp:
            (khtml::isBreakable):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5539 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 0092418..4eea4f5 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,15 @@
 2003-11-17  David Hyatt  <hyatt at apple.com>
 
+	Fix for 2931829, lines with hyphens should break on the hyphens.  Match WinIE's behavior of
+	breaking on - and ?.
+	
+        Reviewed by john
+
+        * khtml/rendering/break_lines.cpp:
+        (khtml::isBreakable):
+
+2003-11-17  David Hyatt  <hyatt at apple.com>
+
 	Fix for 3415771, Safari should use mini form controls when necessary.  This patch adds heuristics for
 	swapping in mini form controls and also drops intrinsic margins when mini form controls are used.
 
diff --git a/WebCore/khtml/rendering/break_lines.cpp b/WebCore/khtml/rendering/break_lines.cpp
index 739a740..1a2a49a 100644
--- a/WebCore/khtml/rendering/break_lines.cpp
+++ b/WebCore/khtml/rendering/break_lines.cpp
@@ -103,7 +103,11 @@ bool isBreakable( const QChar *s, int pos, int len)
         if (findStatus == 0)
             return ((int)end == pos) ? true : false;
     }
-    // What about hypenation?
+    
+    // Match WinIE's breaking strategy, which is to always allow breaks after hyphens and question marks.
+    if (lastCh == '-' || lastCh == '?')
+        return true;
+
     return c->direction() == QChar::DirWS;
 #endif    
 }

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list