[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 45a9d7bcd4fd1afa50434794cf35c167804b1471
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 22 21:45:00 2002 +0000

    	Optimize my inline margin discarding to be smart about the
    	case when the inline has a block and its beginning or
    	end.  Fixes aintitcool.com.
    
            * khtml/rendering/render_flow.cpp:
            (RenderFlow::layoutBlockChildren):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2415 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 7462e29..30ee1a3 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,14 @@
 2002-10-22  David Hyatt  <hyatt at apple.com>
 
+	Optimize my inline margin discarding to be smart about the
+	case when the inline has a block and its beginning or
+	end.  Fixes aintitcool.com.
+	
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::layoutBlockChildren):
+
+2002-10-22  David Hyatt  <hyatt at apple.com>
+
 	Removing konq's flow-around-floats hack for <blockquote> and
 	<dl>.  These objects are allowed to flow under floats.  Fixes
 	www.webreference.com's front page.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 7462e29..30ee1a3 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,14 @@
 2002-10-22  David Hyatt  <hyatt at apple.com>
 
+	Optimize my inline margin discarding to be smart about the
+	case when the inline has a block and its beginning or
+	end.  Fixes aintitcool.com.
+	
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::layoutBlockChildren):
+
+2002-10-22  David Hyatt  <hyatt at apple.com>
+
 	Removing konq's flow-around-floats hack for <blockquote> and
 	<dl>.  These objects are allowed to flow under floats.  Fixes
 	www.webreference.com's front page.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 7462e29..30ee1a3 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,14 @@
 2002-10-22  David Hyatt  <hyatt at apple.com>
 
+	Optimize my inline margin discarding to be smart about the
+	case when the inline has a block and its beginning or
+	end.  Fixes aintitcool.com.
+	
+        * khtml/rendering/render_flow.cpp:
+        (RenderFlow::layoutBlockChildren):
+
+2002-10-22  David Hyatt  <hyatt at apple.com>
+
 	Removing konq's flow-around-floats hack for <blockquote> and
 	<dl>.  These objects are allowed to flow under floats.  Fixes
 	www.webreference.com's front page.
diff --git a/WebCore/khtml/rendering/render_flow.cpp b/WebCore/khtml/rendering/render_flow.cpp
index 15c6707..5cb8f16 100644
--- a/WebCore/khtml/rendering/render_flow.cpp
+++ b/WebCore/khtml/rendering/render_flow.cpp
@@ -453,7 +453,7 @@ void RenderFlow::layoutBlockChildren( bool relayoutChildren )
             // XXX A hack we have to put in to deal with the fact
             // that KHTML incorrectly morphs inlines with blocks
             // inside them into blocks themselves.
-            if (child->style()->display() == INLINE)
+            if (child->style()->display() == INLINE && child->marginTop())
                 posTop = negTop = 0;
                 
             // See if the top margin is quirky. We only care if this child has
@@ -516,7 +516,7 @@ void RenderFlow::layoutBlockChildren( bool relayoutChildren )
                 // XXX A hack we have to put in to deal with the fact
                 // that KHTML incorrectly morphs inlines with blocks
                 // inside them into blocks themselves.
-                if (child->style()->display() == INLINE)
+                if (child->style()->display() == INLINE && child->marginBottom())
                     prevPosMargin = prevNegMargin = 0;
                 
                 if (prevPosMargin-prevNegMargin)

-- 
WebKit Debian packaging