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

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit d6e471b6d3ac9f77323c3eacd233f876e19cbf53
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Nov 16 00:09:50 2002 +0000

    	Fix bustage with <nobr> tags.  Inline nowrap elements were
    	breaking on images when they shouldn't have.
    
            * khtml/rendering/render_flow.cpp:
            (RenderFlow::calcInlineMinMaxWidth):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2705 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 164e4cf..c5370cc 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,11 @@
+2002-11-15  David Hyatt  <hyatt at apple.com>
+
+	Fix bustage with <nobr> tags.  Inline nowrap elements were
+	breaking on images when they shouldn't have.
+	
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::calcInlineMinMaxWidth):
+
 2002-11-15  Ken Kocienda  <kocienda at apple.com>
 
 	Fix for this bug:
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 164e4cf..c5370cc 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,11 @@
+2002-11-15  David Hyatt  <hyatt at apple.com>
+
+	Fix bustage with <nobr> tags.  Inline nowrap elements were
+	breaking on images when they shouldn't have.
+	
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::calcInlineMinMaxWidth):
+
 2002-11-15  Ken Kocienda  <kocienda at apple.com>
 
 	Fix for this bug:
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 164e4cf..c5370cc 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,11 @@
+2002-11-15  David Hyatt  <hyatt at apple.com>
+
+	Fix bustage with <nobr> tags.  Inline nowrap elements were
+	breaking on images when they shouldn't have.
+	
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::calcInlineMinMaxWidth):
+
 2002-11-15  Ken Kocienda  <kocienda at apple.com>
 
 	Fix for this bug:
diff --git a/WebCore/khtml/rendering/render_flow.cpp b/WebCore/khtml/rendering/render_flow.cpp
index 8c14a0b..47f2939 100644
--- a/WebCore/khtml/rendering/render_flow.cpp
+++ b/WebCore/khtml/rendering/render_flow.cpp
@@ -1295,6 +1295,9 @@ void RenderFlow::calcInlineMinMaxWidth()
     bool stripFrontSpaces = true;
     RenderObject* trailingSpaceChild = 0;
     
+    bool nowrap, oldnowrap;
+    nowrap = oldnowrap = style()->whiteSpace() == NOWRAP;
+    
     while(child != 0)
     {
         // positioned children don't affect the minmaxwidth
@@ -1304,6 +1307,8 @@ void RenderFlow::calcInlineMinMaxWidth()
             continue;
         }
 
+        nowrap = child->style()->whiteSpace() == NOWRAP;
+            
         if( !child->isBR() )
         {
             // Step One: determine whether or not we need to go ahead and
@@ -1387,18 +1392,24 @@ void RenderFlow::calcInlineMinMaxWidth()
                 childMin += child->minWidth();
                 childMax += child->maxWidth();
                 
-                if(m_minWidth < inlineMin) m_minWidth = inlineMin;
-                inlineMin = 0;
+                if (nowrap && !oldnowrap) {
+                    if(m_minWidth < inlineMin) m_minWidth = inlineMin;
+                    inlineMin = 0;
+                }
                 
                 // Add our width to the max.
                 inlineMax += childMax;
                 
-                // Now check our line.
-                inlineMin = childMin;
-                if(m_minWidth < inlineMin) m_minWidth = inlineMin;
-                
-                // Now start a new line.
-                inlineMin = 0;
+                if (nowrap)
+                    inlineMin += childMin;
+                else {
+                    // Now check our line.
+                    inlineMin = childMin;
+                    if(m_minWidth < inlineMin) m_minWidth = inlineMin;
+                    
+                    // Now start a new line.
+                    inlineMin = 0;
+                }
                 
                 // We are no longer stripping whitespace at the start of
                 // a line.
@@ -1479,6 +1490,8 @@ void RenderFlow::calcInlineMinMaxWidth()
             trailingSpaceChild = 0;
         }
         
+        oldnowrap = nowrap;
+        
         child = next(this, child);
     }
     

-- 
WebKit Debian packaging