[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 faf7e3114f616884a156eb2273426ca36765da69
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Feb 28 23:19:21 2003 +0000

    	Exclude <BR>s from the text-dec check.  Really fixes 3185121.
    
            Reviewed by john
    
            * khtml/rendering/render_line.cpp:
            (shouldDrawDecoration):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3719 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index f104452..1208688 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,12 @@
+2003-02-28  David Hyatt  <hyatt at apple.com>
+
+	Exclude <BR>s from the text-dec check.  Really fixes 3185121.
+	
+        Reviewed by john
+
+        * khtml/rendering/render_line.cpp:
+        (shouldDrawDecoration):
+
 2003-02-28  Darin Adler  <darin at apple.com>
 
         Reviewed by Dave.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index f104452..1208688 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2003-02-28  David Hyatt  <hyatt at apple.com>
+
+	Exclude <BR>s from the text-dec check.  Really fixes 3185121.
+	
+        Reviewed by john
+
+        * khtml/rendering/render_line.cpp:
+        (shouldDrawDecoration):
+
 2003-02-28  Darin Adler  <darin at apple.com>
 
         Reviewed by Dave.
diff --git a/WebCore/khtml/rendering/render_line.cpp b/WebCore/khtml/rendering/render_line.cpp
index dfabfb9..a5a0337 100644
--- a/WebCore/khtml/rendering/render_line.cpp
+++ b/WebCore/khtml/rendering/render_line.cpp
@@ -514,7 +514,7 @@ static bool shouldDrawDecoration(RenderObject* obj)
             shouldDraw = true;
             break;
         }
-        else if (curr->isText() && (curr->style()->whiteSpace() == PRE ||
+        else if (curr->isText() && !curr->isBR() && (curr->style()->whiteSpace() == PRE ||
                  !curr->element() || !curr->element()->containsOnlyWhitespace())) {
             shouldDraw = true;
             break;

-- 
WebKit Debian packaging