[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 d51ed13b99cee6d054e847293a526332bc7da07b
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 13 22:08:21 2001 +0000

    Removed extraneous code in _rectForString
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@447 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kwq/KWQFontMetrics.mm b/WebCore/kwq/KWQFontMetrics.mm
index 01d4c69..dea661f 100644
--- a/WebCore/kwq/KWQFontMetrics.mm
+++ b/WebCore/kwq/KWQFontMetrics.mm
@@ -166,31 +166,19 @@ NSRect QFontMetrics::_rectOfString(NSString *string) const
     if (data->textContainer == nil){
         data->textContainer = [[NSTextContainer alloc] initWithContainerSize:NSMakeSize(LargeNumberForText, LargeNumberForText)];
         data->layoutManager = [[NSLayoutManager alloc] init];
- //       data->textStorage = [[NSTextStorage alloc] initWithString:string attributes:[NSDictionary dictionaryWithObjectsAndKeys:data->font, NSFontAttributeName, nil]];
         [data->layoutManager addTextContainer: data->textContainer];
-//      [data->textStorage addLayoutManager: data->layoutManager];
         data->attributes = [[NSDictionary dictionaryWithObjectsAndKeys:data->font, NSFontAttributeName, nil] retain];
     }
-//    else {
-//        [data->textStorage beginEditing];
-//        [data->textStorage replaceCharactersInRange: NSMakeRange (0,[data->textStorage length]) withString: string];
-//        [data->textStorage endEditing];
-//    }
 
     textStorage = [[NSTextStorage alloc] initWithString:string attributes: data->attributes];
     [textStorage addLayoutManager: data->layoutManager];
     
-    //[data->layoutManager addTextContainer: data->textContainer];
-    //[data->textStorage addLayoutManager: data->layoutManager];
-
     unsigned numberOfGlyphs = [data->layoutManager numberOfGlyphs];
     NSRect glyphRect = [data->layoutManager boundingRectForGlyphRange: NSMakeRange (0, numberOfGlyphs) inTextContainer: data->textContainer];
 
     [textStorage removeLayoutManager: data->layoutManager];
     [textStorage release];
     
-    //[data->layoutManager removeTextContainerAtIndex: 0];
-
     [data->boundingRectCache setObject: [NSValue valueWithRect: glyphRect] forKey: string];
         
     return glyphRect;
diff --git a/WebCore/src/kwq/KWQFontMetrics.mm b/WebCore/src/kwq/KWQFontMetrics.mm
index 01d4c69..dea661f 100644
--- a/WebCore/src/kwq/KWQFontMetrics.mm
+++ b/WebCore/src/kwq/KWQFontMetrics.mm
@@ -166,31 +166,19 @@ NSRect QFontMetrics::_rectOfString(NSString *string) const
     if (data->textContainer == nil){
         data->textContainer = [[NSTextContainer alloc] initWithContainerSize:NSMakeSize(LargeNumberForText, LargeNumberForText)];
         data->layoutManager = [[NSLayoutManager alloc] init];
- //       data->textStorage = [[NSTextStorage alloc] initWithString:string attributes:[NSDictionary dictionaryWithObjectsAndKeys:data->font, NSFontAttributeName, nil]];
         [data->layoutManager addTextContainer: data->textContainer];
-//      [data->textStorage addLayoutManager: data->layoutManager];
         data->attributes = [[NSDictionary dictionaryWithObjectsAndKeys:data->font, NSFontAttributeName, nil] retain];
     }
-//    else {
-//        [data->textStorage beginEditing];
-//        [data->textStorage replaceCharactersInRange: NSMakeRange (0,[data->textStorage length]) withString: string];
-//        [data->textStorage endEditing];
-//    }
 
     textStorage = [[NSTextStorage alloc] initWithString:string attributes: data->attributes];
     [textStorage addLayoutManager: data->layoutManager];
     
-    //[data->layoutManager addTextContainer: data->textContainer];
-    //[data->textStorage addLayoutManager: data->layoutManager];
-
     unsigned numberOfGlyphs = [data->layoutManager numberOfGlyphs];
     NSRect glyphRect = [data->layoutManager boundingRectForGlyphRange: NSMakeRange (0, numberOfGlyphs) inTextContainer: data->textContainer];
 
     [textStorage removeLayoutManager: data->layoutManager];
     [textStorage release];
     
-    //[data->layoutManager removeTextContainerAtIndex: 0];
-
     [data->boundingRectCache setObject: [NSValue valueWithRect: glyphRect] forKey: string];
         
     return glyphRect;

-- 
WebKit Debian packaging