[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/3.5/kdelibs/khtml/xml
From:       Germain Garand <germain () ebooksfrance ! com>
Date:       2006-06-27 4:59:41
Message-ID: 1151384381.541617.18517.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 555349 by ggarand:

merge Apple fix for WC/#8065-r13689
inline blocks incorrectly loses spaces between them

merge also another case for <br>'s as it fixes at least one testcase



 M  +6 -4      dom_textimpl.cpp  


--- branches/KDE/3.5/kdelibs/khtml/xml/dom_textimpl.cpp #555348:555349
@@ -395,14 +395,16 @@
         return true;
     }
 
-    if (par->isInline()) {
+    RenderObject *prev = previousRenderer();
+    if (prev && prev->isBR()) // <span><br/> <br/></span>
+        return false;
+
+    if (par->isInlineFlow()) {
         // <span><div/> <div/></span>
-        RenderObject *prev = previousRenderer();
-        if (prev && prev->isRenderBlock()) {
+        if (prev && !prev->isInline()) {
             return false;
         }
     } else {
-        RenderObject *prev = previousRenderer();
         if (par->isRenderBlock() && !par->childrenInline() && (!prev || !prev->isInline())) {
             return false;
         }
[prev in list] [next in list] [prev in thread] [next in thread]