[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 0723e2ce6cb13293ff550c23223729c43c42a18a
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Feb 28 22:06:07 2003 +0000

    	Fix for text-dec regression, 3185121.
    
            Reviewed by john
    
            * khtml/rendering/render_line.cpp:
            (shouldDrawDecoration):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3716 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index c042d7d..fb2953b 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>
+
+	Fix for text-dec regression, 3185121.
+	
+        Reviewed by john
+
+        * khtml/rendering/render_line.cpp:
+        (shouldDrawDecoration):
+
 === Safari-64 ===
 
 === Safari-63 ===
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index c042d7d..fb2953b 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>
+
+	Fix for text-dec regression, 3185121.
+	
+        Reviewed by john
+
+        * khtml/rendering/render_line.cpp:
+        (shouldDrawDecoration):
+
 === Safari-64 ===
 
 === Safari-63 ===
diff --git a/WebCore/khtml/rendering/render_line.cpp b/WebCore/khtml/rendering/render_line.cpp
index 94e1068..dfabfb9 100644
--- a/WebCore/khtml/rendering/render_line.cpp
+++ b/WebCore/khtml/rendering/render_line.cpp
@@ -510,10 +510,15 @@ static bool shouldDrawDecoration(RenderObject* obj)
     bool shouldDraw = false;
     for (RenderObject* curr = obj->firstChild();
          curr; curr = curr->nextSibling()) {
-        if (curr->isInlineFlow() || curr->isText()) {
+        if (curr->isInlineFlow()) {
             shouldDraw = true;
             break;
         }
+        else if (curr->isText() && (curr->style()->whiteSpace() == PRE ||
+                 !curr->element() || !curr->element()->containsOnlyWhitespace())) {
+            shouldDraw = true;
+            break;
+        }	
     }
     return shouldDraw;
 }

-- 
WebKit Debian packaging