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

[kocienda]

The following commit has been merged in the debian/unstable branch:
commit 1c636c30b1cb2a12d29f77f91267078c358cc9ee
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jun 4 18:21:48 2004 +0000

            Reviewed by Hyatt
    
            * khtml/rendering/bidi.cpp:
            (khtml::RenderBlock::layoutInlineChildren): Only add additional line height
            in for root editable elements. This helps to keep layout from deviating too
            much from the intended page layout, but still gives an empty document a line
            in which it can blink the caret.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6766 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 12b8cd8..404ed9e 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -2,6 +2,16 @@
 
         Reviewed by Hyatt
 
+        * khtml/rendering/bidi.cpp:
+        (khtml::RenderBlock::layoutInlineChildren): Only add additional line height
+        in for root editable elements. This helps to keep layout from deviating too
+        much from the intended page layout, but still gives an empty document a line
+        in which it can blink the caret.
+
+2004-06-04  Ken Kocienda  <kocienda at apple.com>
+
+        Reviewed by Hyatt
+
         Made some progress on this set of related bugs:
         
         <rdar://problem/3675867>: "Make execCommand work as specified in the Javascript execCommand Compatibility Plan"
diff --git a/WebCore/khtml/rendering/bidi.cpp b/WebCore/khtml/rendering/bidi.cpp
index 88001fb..13e0534 100644
--- a/WebCore/khtml/rendering/bidi.cpp
+++ b/WebCore/khtml/rendering/bidi.cpp
@@ -1554,8 +1554,9 @@ QRect RenderBlock::layoutInlineChildren(bool relayoutChildren)
     
     setLinesAppended(false);
     
-    if (!firstLineBox() && element() && element()->isContentEditable())
+    if (!firstLineBox() && element() && element()->isContentEditable() && element()->rootEditableElement() == element()) {
         m_height += lineHeight(true);
+    }
     
     return repaintRect;
 

-- 
WebKit Debian packaging