[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 d296ba5565998ce31fc006dafbcc3969e9f850eb
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Nov 9 23:41:24 2003 +0000

    	Fix for 3478317, letter/word-spacing don't inherit properly through italic/bold elements.
    
            Reviewed by darin
    
            * khtml/rendering/font.h:
            (khtml::Font::Font):
            * khtml/rendering/render_style.h:
            (khtml::RenderStyle::setFontDef):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5433 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 6e49f45..76bb382 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,16 @@
 2003-11-09  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3478317, letter/word-spacing don't inherit properly through italic/bold elements.
+	
+        Reviewed by darin
+
+        * khtml/rendering/font.h:
+        (khtml::Font::Font):
+        * khtml/rendering/render_style.h:
+        (khtml::RenderStyle::setFontDef):
+
+2003-11-09  David Hyatt  <hyatt at apple.com>
+
 	Fix for 3478309, make sure backgrounds paint in the border box and not just in the padding box.
 	
         Reviewed by darin
diff --git a/WebCore/khtml/rendering/font.h b/WebCore/khtml/rendering/font.h
index 0c13a74..f17ec9d 100644
--- a/WebCore/khtml/rendering/font.h
+++ b/WebCore/khtml/rendering/font.h
@@ -100,11 +100,11 @@ class Font
 public:
 #if APPLE_CHANGES
     Font() : letterSpacing(0), wordSpacing(0) {}
-    Font(const FontDef &fd) : fontDef(fd), letterSpacing(0), wordSpacing(0) {}
+    Font(const FontDef &fd, int l, int w) : fontDef(fd), letterSpacing(l), wordSpacing(w) {}
 #else
     Font() : fontDef(), f(), fm( f ), scFont( 0 ), letterSpacing( 0 ), wordSpacing( 0 ) {}
-    Font( const FontDef &fd )
-        :  fontDef( fd ), f(), fm( f ), scFont( 0 ), letterSpacing( 0 ), wordSpacing( 0 )
+    Font( const FontDef &fd, int l, int w )
+        :  fontDef( fd ), f(), fm( f ), scFont( 0 ), letterSpacing( l ), wordSpacing( w )
         {}
 #endif
 
diff --git a/WebCore/khtml/rendering/render_style.h b/WebCore/khtml/rendering/render_style.h
index fcbfc4e..88bc98a 100644
--- a/WebCore/khtml/rendering/render_style.h
+++ b/WebCore/khtml/rendering/render_style.h
@@ -1078,7 +1078,7 @@ public:
     bool setFontDef(const khtml::FontDef & v) {
         // bah, this doesn't compare pointers. broken! (Dirk)
         if (!(inherited->font.fontDef == v)) {
-            inherited.access()->font = Font( v );
+            inherited.access()->font = Font( v, inherited->font.letterSpacing, inherited->font.wordSpacing );
             return true;
         }
         return false;

-- 
WebKit Debian packaging