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

List:       kde-commits
Subject:    KDE/kdelibs/khtml/rendering
From:       Germain Garand <germain () ebooksfrance ! org>
Date:       2010-02-12 4:20:46
Message-ID: 1265948446.024114.11007.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1088981 by ggarand:

more float breaking subtleties:
use contentWidth here ; also add a disabled mozilla compatibility hack,
just to have it handy in case it proves necessary one day.

 M  +14 -1     render_block.cpp  


--- trunk/KDE/kdelibs/khtml/rendering/render_block.cpp #1088980:1088981
@@ -2705,7 +2705,20 @@
         bool needsRecalc = child->usesLineWidth();
         int cury = yPos;
         int childw = 0;
-        int aw = availableWidth();
+        int aw = contentWidth();
+#if 0
+        // this is a silly Gecko compatibility hack - enable only if it becomes
+        // necessary, and then check regularly with new Gecko versions
+        if (!style()->hasBorder()) {
+            RenderObject* ps = child;
+            while ((ps = ps->previousSibling())) {
+                if (!ps->isFloating() && !ps->isPositioned())
+                    break;
+            }
+            if (!ps)
+                return 0;
+        }
+#endif
         while (true) {
             int curw = lineWidth(cury, &canClear);
             if (!canClear || curw == aw)
[prev in list] [next in list] [prev in thread] [next in thread]