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

[darin]

The following commit has been merged in the debian/unstable branch:
commit 7ae9e261869a9d7ab435f500a7eaa33e6a075ad6
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Sep 13 19:44:25 2003 +0000

            Reviewed by Maciej.
    
            - fixed 3420547 -- REGRESSION: repro crash in khtml::RenderBlock::findNextLineBreak (wisdomtips.com)
    
            * khtml/rendering/render_block.cpp: (RenderBlock::addChildToFlow): Exclude BR elements when looking for
            an element to process first-letter style.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4986 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index f11344f..e68004f 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,14 @@
 2003-09-13  Darin Adler  <darin at apple.com>
 
+        Reviewed by Maciej.
+
+        - fixed 3420547 -- REGRESSION: repro crash in khtml::RenderBlock::findNextLineBreak (wisdomtips.com)
+
+        * khtml/rendering/render_block.cpp: (RenderBlock::addChildToFlow): Exclude BR elements when looking for
+        an element to process first-letter style.
+
+2003-09-13  Darin Adler  <darin at apple.com>
+
         * layout-tests/fast/frames/empty-frame-src-expected.txt: Updated test results that changed
         due to the change in our handling of frame borders.
 
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index f11344f..e68004f 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,14 @@
 2003-09-13  Darin Adler  <darin at apple.com>
 
+        Reviewed by Maciej.
+
+        - fixed 3420547 -- REGRESSION: repro crash in khtml::RenderBlock::findNextLineBreak (wisdomtips.com)
+
+        * khtml/rendering/render_block.cpp: (RenderBlock::addChildToFlow): Exclude BR elements when looking for
+        an element to process first-letter style.
+
+2003-09-13  Darin Adler  <darin at apple.com>
+
         * layout-tests/fast/frames/empty-frame-src-expected.txt: Updated test results that changed
         due to the change in our handling of frame borders.
 
diff --git a/WebCore/khtml/rendering/render_block.cpp b/WebCore/khtml/rendering/render_block.cpp
index 7ce84cb..3c5c328 100644
--- a/WebCore/khtml/rendering/render_block.cpp
+++ b/WebCore/khtml/rendering/render_block.cpp
@@ -111,7 +111,7 @@ void RenderBlock::addChildToFlow(RenderObject* newChild, RenderObject* beforeChi
     {
         // Drill into inlines looking for our first text child.
         RenderObject* textChild = newChild;
-        while (textChild && !textChild->isText())
+        while (textChild && !(textChild->isText() && !textChild->isBR()))
             textChild = textChild->firstChild();
         
         if (textChild) {

-- 
WebKit Debian packaging