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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit dd721cfba4891b743ec96fc0176a8d295444fd7b
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 14 00:44:29 2003 +0000

    	Added support for small-caps.
    
            Reviewed by John.
    
            * khtml/rendering/font.h:
            (khtml::Font::isSmallCaps):
            * khtml/rendering/render_text.cpp:
            (RenderText::shouldUseMonospaceCache):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5176 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 40639a9..9e6c0a3 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,14 @@
+2003-10-13  Richard Williamson <rjw at apple.com>
+
+	Added support for small-caps.
+
+        Reviewed by John.
+
+        * khtml/rendering/font.h:
+        (khtml::Font::isSmallCaps):
+        * khtml/rendering/render_text.cpp:
+        (RenderText::shouldUseMonospaceCache):
+
 2003-10-12  Darin Adler  <darin at apple.com>
 
         * layout-tests/fast/js/date-parse-test.html: Fixed a couple of silly mistakes.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 40639a9..9e6c0a3 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2003-10-13  Richard Williamson <rjw at apple.com>
+
+	Added support for small-caps.
+
+        Reviewed by John.
+
+        * khtml/rendering/font.h:
+        (khtml::Font::isSmallCaps):
+        * khtml/rendering/render_text.cpp:
+        (RenderText::shouldUseMonospaceCache):
+
 2003-10-12  Darin Adler  <darin at apple.com>
 
         * layout-tests/fast/js/date-parse-test.html: Fixed a couple of silly mistakes.
diff --git a/WebCore/khtml/rendering/font.h b/WebCore/khtml/rendering/font.h
index 1c4f7c8..0c13a74 100644
--- a/WebCore/khtml/rendering/font.h
+++ b/WebCore/khtml/rendering/font.h
@@ -133,6 +133,8 @@ public:
     int width( QChar *str, int slen, int pos, int len ) const;
     int width( QChar *str, int slen, int pos ) const;
 
+    bool isSmallCaps() const { return fontDef.smallCaps; }
+    
 private:
     FontDef fontDef;
     mutable QFont f;
diff --git a/WebCore/khtml/rendering/render_text.cpp b/WebCore/khtml/rendering/render_text.cpp
index e4e9f8b..f5b3f99 100644
--- a/WebCore/khtml/rendering/render_text.cpp
+++ b/WebCore/khtml/rendering/render_text.cpp
@@ -869,7 +869,7 @@ bool RenderText::allAscii() const
 
 bool RenderText::shouldUseMonospaceCache(const Font *f) const
 {
-    return (f && f->isFixedPitch() && allAscii());
+    return (f && f->isFixedPitch() && allAscii() && !style()->htmlFont().isSmallCaps());
 }
 
 // We cache the width of the ' ' character for <pre> text.  We could go futher

-- 
WebKit Debian packaging