[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 35652234851e3a5dd393d053e99cb5b5f1236659
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 20 03:07:40 2002 +0000

    	I screwed up the line breaking for inline replaced elements.
    
            * khtml/rendering/render_flow.cpp:
            (RenderFlow::calcInlineMinMaxWidth):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2774 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 1126d2e..08eb175 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-11-19  David Hyatt  <hyatt at apple.com>
+
+	I screwed up the line breaking for inline replaced elements.
+	
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::calcInlineMinMaxWidth):
+
 2002-11-19  Darin Adler  <darin at apple.com>
 
 	- another atomic identifier scrub pass; make the conversion to Identifier explicit
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 1126d2e..08eb175 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,10 @@
+2002-11-19  David Hyatt  <hyatt at apple.com>
+
+	I screwed up the line breaking for inline replaced elements.
+	
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::calcInlineMinMaxWidth):
+
 2002-11-19  Darin Adler  <darin at apple.com>
 
 	- another atomic identifier scrub pass; make the conversion to Identifier explicit
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 1126d2e..08eb175 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,10 @@
+2002-11-19  David Hyatt  <hyatt at apple.com>
+
+	I screwed up the line breaking for inline replaced elements.
+	
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::calcInlineMinMaxWidth):
+
 2002-11-19  Darin Adler  <darin at apple.com>
 
 	- another atomic identifier scrub pass; make the conversion to Identifier explicit
diff --git a/WebCore/khtml/rendering/render_flow.cpp b/WebCore/khtml/rendering/render_flow.cpp
index 2df3866..a7190ed 100644
--- a/WebCore/khtml/rendering/render_flow.cpp
+++ b/WebCore/khtml/rendering/render_flow.cpp
@@ -1438,7 +1438,7 @@ void RenderFlow::calcInlineMinMaxWidth()
                 childMin += child->minWidth();
                 childMax += child->maxWidth();
                 
-                if (nowrap && !oldnowrap) {
+                if (!nowrap || !oldnowrap) {
                     if(m_minWidth < inlineMin) m_minWidth = inlineMin;
                     inlineMin = 0;
                 }

-- 
WebKit Debian packaging