[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 e1a2cd7df447568ebbf692585b25736832aea53c
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 7 18:45:15 2001 +0000

    Fixed compiler warning that actually turned out to be a bug!  Imagine that.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@478 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kwq/KWQFontMetrics.mm b/WebCore/kwq/KWQFontMetrics.mm
index a1dfa1d..3e08044 100644
--- a/WebCore/kwq/KWQFontMetrics.mm
+++ b/WebCore/kwq/KWQFontMetrics.mm
@@ -91,7 +91,7 @@ static NSMutableDictionary *metricsCache = nil;
         unsigned numberOfGlyphs = [layoutManager numberOfGlyphs];
         [metricsCache setColor: color];
         [metricsCache setFont: font];
-        [KWQTextStorage setString: string attributes: attributes];
+        [KWQTextStorage setString: string attributes: [metricsCache attributes]];
         [layoutManager drawGlyphsForGlyphRange:NSMakeRange (0, numberOfGlyphs) atPoint:p];
     }
 }
@@ -172,6 +172,11 @@ static NSMutableDictionary *metricsCache = nil;
     [attributes setObject: aFont forKey: NSFontAttributeName];
 }
 
+- (NSDictionary *)attributes
+{
+    return attributes;
+}
+
 - (void)dealloc
 {
     [attributes release];
diff --git a/WebCore/src/kwq/KWQFontMetrics.mm b/WebCore/src/kwq/KWQFontMetrics.mm
index a1dfa1d..3e08044 100644
--- a/WebCore/src/kwq/KWQFontMetrics.mm
+++ b/WebCore/src/kwq/KWQFontMetrics.mm
@@ -91,7 +91,7 @@ static NSMutableDictionary *metricsCache = nil;
         unsigned numberOfGlyphs = [layoutManager numberOfGlyphs];
         [metricsCache setColor: color];
         [metricsCache setFont: font];
-        [KWQTextStorage setString: string attributes: attributes];
+        [KWQTextStorage setString: string attributes: [metricsCache attributes]];
         [layoutManager drawGlyphsForGlyphRange:NSMakeRange (0, numberOfGlyphs) atPoint:p];
     }
 }
@@ -172,6 +172,11 @@ static NSMutableDictionary *metricsCache = nil;
     [attributes setObject: aFont forKey: NSFontAttributeName];
 }
 
+- (NSDictionary *)attributes
+{
+    return attributes;
+}
+
 - (void)dealloc
 {
     [attributes release];

-- 
WebKit Debian packaging