[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 91f8bc61583efbdda483c628908077af1749694e
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Feb 14 19:44:00 2003 +0000

    	Patch to the drawLine function for the inline box model landing.
    
            Reviewed by kocienda
    
            * WebCoreSupport.subproj/WebTextRenderer.m:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3649 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index f33c797..99de669 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,11 @@
+2003-02-14  David Hyatt  <hyatt at apple.com>
+
+	Patch to the drawLine function for the inline box model landing.
+	
+        Reviewed by kocienda
+
+        * WebCoreSupport.subproj/WebTextRenderer.m:
+
 
 2003-02-13  Trey Matteson  <trey at apple.com>
 
diff --git a/WebKit/WebCoreSupport.subproj/WebTextRenderer.m b/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
index dac4d7f..cb78095 100644
--- a/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
@@ -750,50 +750,12 @@ static void _drawGlyphs(NSFont *font, NSColor *color, CGGlyph *glyphs, CGSize *a
 }
 
 
-- (void)drawLineForCharacters:(const UniChar *)characters stringLength:(unsigned)length fromCharacterPosition:(int)from toCharacterPosition:(int)to atPoint:(NSPoint)point yOffset:(float)yOffset withPadding: (int)padding withColor:(NSColor *)color rightToLeft: (BOOL)rtl letterSpacing: (int)letterSpacing wordSpacing: (int)wordSpacing fontFamilies: (NSString **)families;
+- (void)drawLineForCharacters:(NSPoint)point yOffset:(float)yOffset withWidth: (int)width withColor:(NSColor *)color
 {
     NSGraphicsContext *graphicsContext = [NSGraphicsContext currentContext];
-    int width;
     CGContextRef cgContext;
     float lineWidth;
 
-    if (from > 0) {
-        point.x += [self _floatWidthForCharacters:characters
-                                     stringLength:length
-                            fromCharacterPosition: 0
-                               numberOfCharacters: from
-                                      withPadding: padding
-                                    applyRounding: YES
-                          attemptFontSubstitution: YES
-                                           widths: 0
-                                            fonts: 0
-                                           glyphs: 0
-                                        numGlyphs: 0
-                                    letterSpacing: letterSpacing
-                                      wordSpacing: wordSpacing
-                                     fontFamilies: families];
-    } else if (from == -1) {
-        from = 0;
-    }
-    if (to == -1) {
-        to = length;
-    }
-    
-    width = ROUND_TO_INT([self _floatWidthForCharacters:characters
-                      stringLength:length
-             fromCharacterPosition: from
-                numberOfCharacters: to-from
-                       withPadding: padding
-                     applyRounding: YES
-           attemptFontSubstitution: YES
-                            widths: 0
-                             fonts: 0
-                            glyphs: 0
-                         numGlyphs: 0
-                     letterSpacing: letterSpacing
-                       wordSpacing: wordSpacing
-                      fontFamilies: families]);
-
     // This will draw the text from the top of the bounding box down.
     // Qt expects to draw from the baseline.
     // Remember that descender is negative.

-- 
WebKit Debian packaging