[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit d0e84b2f0add52acb083f961146db35e6e139dad
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jun 10 16:20:23 2002 +0000

    	* WebCoreSupport.subproj/IFTextRenderer.m:
    	(-[IFTextRenderer drawCharacters:length:atPoint:withColor:]):
    	Fix a typo where I left the S off of DRAW_WITHOUT_ADVANCES.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1321 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 530b5fb..22b34e4 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,9 @@
+2002-06-10  Darin Adler  <darin at apple.com>
+
+	* WebCoreSupport.subproj/IFTextRenderer.m:
+	(-[IFTextRenderer drawCharacters:length:atPoint:withColor:]):
+	Fix a typo where I left the S off of DRAW_WITHOUT_ADVANCES.
+
 2002-06-10  Richard Williamson  <rjw at apple.com>
 
     90% solution to round-off problem.  khtml breaks measures text on space
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 530b5fb..22b34e4 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,9 @@
+2002-06-10  Darin Adler  <darin at apple.com>
+
+	* WebCoreSupport.subproj/IFTextRenderer.m:
+	(-[IFTextRenderer drawCharacters:length:atPoint:withColor:]):
+	Fix a typo where I left the S off of DRAW_WITHOUT_ADVANCES.
+
 2002-06-10  Richard Williamson  <rjw at apple.com>
 
     90% solution to round-off problem.  khtml breaks measures text on space
diff --git a/WebKit/WebCoreSupport.subproj/IFTextRenderer.m b/WebKit/WebCoreSupport.subproj/IFTextRenderer.m
index 4d8a3a9..02d4853 100644
--- a/WebKit/WebCoreSupport.subproj/IFTextRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/IFTextRenderer.m
@@ -519,7 +519,6 @@ static bool hasMissingGlyphs(ATSGlyphVector *glyphs)
 
     // 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.
 #ifdef DRAW_WITHOUT_ADVANCES
     point.y -= [self lineSpacing] - [self descent];
 #else
@@ -540,9 +539,7 @@ static bool hasMissingGlyphs(ATSGlyphVector *glyphs)
     CGContextSetTextPosition (cgContext, point.x, point.y - [self descent] + 1);
     //CGContextShowGlyphsWithAdvances (cgContext, glyphs, advances, numGlyphs);
     CGContextShowGlyphsWithDeviceAdvances (cgContext, glyphs, advances, numGlyphs);
-#endif
-    
-#ifndef DRAW_WITHOUT_ADVANCE
+
     if (advances != localAdvanceBuffer) {
         free(advances);
     }
@@ -622,11 +619,11 @@ cleanup:
     ATSGlyphRef glyphID;
     
 
-    for (i = 0; i < length; i++){
+    for (i = 0; i < length; i++) {
         UniChar c = characters[i];
         
         if (c == NON_BREAKING_SPACE) {
-        	c = SPACE;
+            c = SPACE;
         }
         else if (IsNonBaseChar(c)){
             return [self slowFloatWidthForCharacters: characters length: length];
diff --git a/WebKit/WebCoreSupport.subproj/WebTextRenderer.m b/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
index 4d8a3a9..02d4853 100644
--- a/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
@@ -519,7 +519,6 @@ static bool hasMissingGlyphs(ATSGlyphVector *glyphs)
 
     // 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.
 #ifdef DRAW_WITHOUT_ADVANCES
     point.y -= [self lineSpacing] - [self descent];
 #else
@@ -540,9 +539,7 @@ static bool hasMissingGlyphs(ATSGlyphVector *glyphs)
     CGContextSetTextPosition (cgContext, point.x, point.y - [self descent] + 1);
     //CGContextShowGlyphsWithAdvances (cgContext, glyphs, advances, numGlyphs);
     CGContextShowGlyphsWithDeviceAdvances (cgContext, glyphs, advances, numGlyphs);
-#endif
-    
-#ifndef DRAW_WITHOUT_ADVANCE
+
     if (advances != localAdvanceBuffer) {
         free(advances);
     }
@@ -622,11 +619,11 @@ cleanup:
     ATSGlyphRef glyphID;
     
 
-    for (i = 0; i < length; i++){
+    for (i = 0; i < length; i++) {
         UniChar c = characters[i];
         
         if (c == NON_BREAKING_SPACE) {
-        	c = SPACE;
+            c = SPACE;
         }
         else if (IsNonBaseChar(c)){
             return [self slowFloatWidthForCharacters: characters length: length];

-- 
WebKit Debian packaging