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

[mjs]

The following commit has been merged in the debian/unstable branch:
commit 157cdb0f726d544c1d15f5802d7d580bfbe318fa
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 5 20:16:25 2003 +0000

            Reviewed by Darin and Dave.
    
    	- fixed 3363557 - REGRESSION (90-91): float:left element inside position:absolute element positioned wrong
    
            * khtml/rendering/render_block.cpp:
            (RenderBlock::calcInlineMinMaxWidth): Remove attempt to break line
    	after flaot that follows a non-float. Removing this code fixes the
    	regression and leaves pepboys and the meyerweb matrix theme
    	working properly. Also, I could not find any evidence in the CSS2
    	spec that what this code is trying to do is right.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4769 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index a9d24f7..de97d42 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,16 @@
+2003-08-05  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Darin and Dave.
+
+	- fixed 3363557 - REGRESSION (90-91): float:left element inside position:absolute element positioned wrong
+
+        * khtml/rendering/render_block.cpp:
+        (RenderBlock::calcInlineMinMaxWidth): Remove attempt to break line
+	after flaot that follows a non-float. Removing this code fixes the
+	regression and leaves pepboys and the meyerweb matrix theme
+	working properly. Also, I could not find any evidence in the CSS2
+	spec that what this code is trying to do is right.
+
 2003-08-05  Ken Kocienda  <kocienda at apple.com>
 
         Reviewed by John
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index a9d24f7..de97d42 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,16 @@
+2003-08-05  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Darin and Dave.
+
+	- fixed 3363557 - REGRESSION (90-91): float:left element inside position:absolute element positioned wrong
+
+        * khtml/rendering/render_block.cpp:
+        (RenderBlock::calcInlineMinMaxWidth): Remove attempt to break line
+	after flaot that follows a non-float. Removing this code fixes the
+	regression and leaves pepboys and the meyerweb matrix theme
+	working properly. Also, I could not find any evidence in the CSS2
+	spec that what this code is trying to do is right.
+
 2003-08-05  Ken Kocienda  <kocienda at apple.com>
 
         Reviewed by John
diff --git a/WebCore/khtml/rendering/render_block.cpp b/WebCore/khtml/rendering/render_block.cpp
index 032e6d8..1c6582d 100644
--- a/WebCore/khtml/rendering/render_block.cpp
+++ b/WebCore/khtml/rendering/render_block.cpp
@@ -1988,19 +1988,6 @@ void RenderBlock::calcInlineMinMaxWidth()
             // the new min-width, if it is the widest chunk seen so far, and
             // it can also become the max-width.
 
-            // For floats, unless the previous element was floating,
-            // we terminate the current line as far as maxwidth
-            // is concerned.
-            // FIXME: This is insanely hard to get right.  Floats can have 'clear' set
-            // on them, which would force them to dodge one another.  Floats can have left
-            // or right alignment as well, and technically a right-aligned float could
-            // sit on the same line even if the previous element is text.
-            // At some point think about clear and float alignment here.
-            if (child->isFloating() && (!prev || !prev->isFloating())) {
-                if (m_maxWidth < inlineMax) m_maxWidth = inlineMax;
-                inlineMax = 0;
-            }
-            
             // Children fall into three categories:
             // (1) An inline flow object.  These objects always have a min/max of 0,
             // and are included in the iteration solely so that their margins can
diff --git a/WebCore/kwq/KWQPainter.mm b/WebCore/kwq/KWQPainter.mm
index f350cd9..a0874b1 100644
--- a/WebCore/kwq/KWQPainter.mm
+++ b/WebCore/kwq/KWQPainter.mm
@@ -296,8 +296,8 @@ void QPainter::drawLine(int x1, int y1, int x2, int y2)
             }
         }
         
-        const float dottedLine[2] = { patWidth, patWidth };
-        [path setLineDash:dottedLine count:2 phase:patternOffset];
+        //const float dottedLine[2] = { patWidth, patWidth };
+        //[path setLineDash:dottedLine count:2 phase:patternOffset];
     }
     
     [path moveToPoint:p1];

-- 
WebKit Debian packaging