[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 8cb740d05d5204088ba223bdf26f2d724729617f
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed May 22 01:51:55 2002 +0000

        Fixed baseline regression.  Obvious of sites that have tables w/ backgrounds,
        i.e. www.slashdot.org.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1191 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 569a35e..31a539b 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,14 @@
 2002-05-21  Richard J. Williamson  <rjw at apple.com>
 
+    Fixed baseline regression.  Obvious of sites that have tables w/ backgrounds,
+    i.e. www.slashdot.org.
+    
+	* WebCoreSupport.subproj/IFTextRenderer.m:
+	(-[IFTextRenderer drawCharacters:length:atPoint:withColor:]):
+	(-[IFTextRenderer drawUnderlineForString:atPoint:withColor:]):
+
+2002-05-21  Richard J. Williamson  <rjw at apple.com>
+
     Changes to support additional DHTML events.
     
 	* WebView.subproj/IFWebView.mm:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 569a35e..31a539b 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,14 @@
 2002-05-21  Richard J. Williamson  <rjw at apple.com>
 
+    Fixed baseline regression.  Obvious of sites that have tables w/ backgrounds,
+    i.e. www.slashdot.org.
+    
+	* WebCoreSupport.subproj/IFTextRenderer.m:
+	(-[IFTextRenderer drawCharacters:length:atPoint:withColor:]):
+	(-[IFTextRenderer drawUnderlineForString:atPoint:withColor:]):
+
+2002-05-21  Richard J. Williamson  <rjw at apple.com>
+
     Changes to support additional DHTML events.
     
 	* WebView.subproj/IFWebView.mm:
diff --git a/WebKit/WebCoreSupport.subproj/IFTextRenderer.m b/WebKit/WebCoreSupport.subproj/IFTextRenderer.m
index a7ab60a..3a8147d 100644
--- a/WebKit/WebCoreSupport.subproj/IFTextRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/IFTextRenderer.m
@@ -527,9 +527,9 @@ static bool hasMissingGlyphs(ATSGlyphVector *glyphs)
 
 #ifdef DRAW_WITHOUT_ADVANCES
     CGContextSetCharacterSpacing(cgContext, 0.0);
-    CGContextShowGlyphsAtPoint (cgContext, point.x, point.y + [font defaultLineHeightForFont] - 1, (CGGlyph *)usedGlyphBuffer, numGlyphs);
+    CGContextShowGlyphsAtPoint (cgContext, point.x, point.y + [font defaultLineHeightForFont] - [self descent] + 1, (CGGlyph *)usedGlyphBuffer, numGlyphs);
 #else      
-    CGContextSetTextPosition (cgContext, point.x, point.y);
+    CGContextSetTextPosition (cgContext, point.x, point.y - [self descent] + 1);
     //CGContextShowGlyphsWithAdvances (cgContext, (CGGlyph *)usedGlyphBuffer, advances, numGlyphs);
     CGContextShowGlyphsWithDeviceAdvances (cgContext, (CGGlyph *)usedGlyphBuffer, advances, numGlyphs);
 #endif
@@ -567,8 +567,8 @@ cleanup:
         lineWidth = size.width;
     }
     CGContextSetLineWidth(cgContext, lineWidth);
-    CGContextMoveToPoint(cgContext, point.x, point.y + [font defaultLineHeightForFont] + 0.5);
-    CGContextAddLineToPoint(cgContext, point.x + width, point.y + [font defaultLineHeightForFont] + 0.5);
+    CGContextMoveToPoint(cgContext, point.x, point.y + [font defaultLineHeightForFont] + 1.5 - [self descent]);
+    CGContextAddLineToPoint(cgContext, point.x + width, point.y + [font defaultLineHeightForFont] + 1.5 - [self descent]);
     CGContextStrokePath(cgContext);
 
     [graphicsContext setShouldAntialias: flag];
diff --git a/WebKit/WebCoreSupport.subproj/WebTextRenderer.m b/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
index a7ab60a..3a8147d 100644
--- a/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
@@ -527,9 +527,9 @@ static bool hasMissingGlyphs(ATSGlyphVector *glyphs)
 
 #ifdef DRAW_WITHOUT_ADVANCES
     CGContextSetCharacterSpacing(cgContext, 0.0);
-    CGContextShowGlyphsAtPoint (cgContext, point.x, point.y + [font defaultLineHeightForFont] - 1, (CGGlyph *)usedGlyphBuffer, numGlyphs);
+    CGContextShowGlyphsAtPoint (cgContext, point.x, point.y + [font defaultLineHeightForFont] - [self descent] + 1, (CGGlyph *)usedGlyphBuffer, numGlyphs);
 #else      
-    CGContextSetTextPosition (cgContext, point.x, point.y);
+    CGContextSetTextPosition (cgContext, point.x, point.y - [self descent] + 1);
     //CGContextShowGlyphsWithAdvances (cgContext, (CGGlyph *)usedGlyphBuffer, advances, numGlyphs);
     CGContextShowGlyphsWithDeviceAdvances (cgContext, (CGGlyph *)usedGlyphBuffer, advances, numGlyphs);
 #endif
@@ -567,8 +567,8 @@ cleanup:
         lineWidth = size.width;
     }
     CGContextSetLineWidth(cgContext, lineWidth);
-    CGContextMoveToPoint(cgContext, point.x, point.y + [font defaultLineHeightForFont] + 0.5);
-    CGContextAddLineToPoint(cgContext, point.x + width, point.y + [font defaultLineHeightForFont] + 0.5);
+    CGContextMoveToPoint(cgContext, point.x, point.y + [font defaultLineHeightForFont] + 1.5 - [self descent]);
+    CGContextAddLineToPoint(cgContext, point.x + width, point.y + [font defaultLineHeightForFont] + 1.5 - [self descent]);
     CGContextStrokePath(cgContext);
 
     [graphicsContext setShouldAntialias: flag];

-- 
WebKit Debian packaging