[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 a79cc90836d4d5782a540c6420c015e1934372ad
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 14 01:56:53 2003 +0000

    	Fix for a small-caps rendering error when used in conjunction with ::first-line.  Always update
    	the Font variable even when QFonts are the same, since small-caps is not stored in QFonts.
    
            Reviewed by rjw
    
            * khtml/rendering/render_text.cpp:
            (RenderText::paintObject):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5178 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 7a939f8..0897a13 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,13 @@
+2003-10-13  David Hyatt  <hyatt at apple.com>
+
+	Fix for a small-caps rendering error when used in conjunction with ::first-line.  Always update
+	the Font variable even when QFonts are the same, since small-caps is not stored in QFonts.
+	
+        Reviewed by rjw
+
+        * khtml/rendering/render_text.cpp:
+        (RenderText::paintObject):
+
 2003-10-13  Richard Williamson (Home0  <rjw at apple.com>
 
 	Updated layout tests actuals to reflect implementation of small-caps style.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 7a939f8..0897a13 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2003-10-13  David Hyatt  <hyatt at apple.com>
+
+	Fix for a small-caps rendering error when used in conjunction with ::first-line.  Always update
+	the Font variable even when QFonts are the same, since small-caps is not stored in QFonts.
+	
+        Reviewed by rjw
+
+        * khtml/rendering/render_text.cpp:
+        (RenderText::paintObject):
+
 2003-10-13  Richard Williamson (Home0  <rjw at apple.com>
 
 	Updated layout tests actuals to reflect implementation of small-caps style.
diff --git a/WebCore/khtml/rendering/render_text.cpp b/WebCore/khtml/rendering/render_text.cpp
index f5b3f99..7ec99c1 100644
--- a/WebCore/khtml/rendering/render_text.cpp
+++ b/WebCore/khtml/rendering/render_text.cpp
@@ -654,10 +654,10 @@ void RenderText::paintObject(QPainter *p, int /*x*/, int y, int /*w*/, int h,
 
             RenderStyle* _style = pseudoStyle && s->m_firstLine ? pseudoStyle : style();
 
-            if(_style->font() != p->font()) {
+            if (_style->font() != p->font())
                 p->setFont(_style->font());
-		font = &_style->htmlFont();
-	    }
+
+            font = &_style->htmlFont(); // Always update, since smallCaps is not stored in the QFont.
 
 #if APPLE_CHANGES
             if (drawText) {

-- 
WebKit Debian packaging