[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
rjw
rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:11:27 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit b657d3eed21ca3a82e2ae84d3a0faea92b2ea265
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue May 7 23:51:24 2002 +0000
First pass at font substitution. Find a substitute font to
use when the specified font doesn't have glyphs for the characters that
need to be drawn.
Works correctly but hasn't been optimized yet, VERY slow.
Will optimize this evening and tomorrow. Try www.yahoo.co.jp,
it will take a long time to render be eventually will draw correctly.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1108 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index f3a14cd..36af74f 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,23 @@
+2002-05-07 Richard J. Williamson <rjw at apple.com>
+
+ First pass at font substitution. Find a substitute font to
+ use when the specified font doesn't have glyphs for the characters that
+ need to be drawn.
+
+ Works correctly but hasn't been optimized yet, VERY slow.
+ Will optimize this evening and tomorrow. Try www.yahoo.co.jp,
+ it will take a long time to render be eventually will draw correctly.
+
+ * WebCoreSupport.subproj/IFTextRenderer.h:
+ * WebCoreSupport.subproj/IFTextRenderer.m:
+ (hasMissingGlyphs):
+ (+[IFTextRenderer initialize]):
+ (-[IFTextRenderer convertCharacters:length:glyphs:]):
+ (-[IFTextRenderer initializeCaches]):
+ (-[IFTextRenderer drawString:atPoint:withColor:]):
+ (-[IFTextRenderer drawUnderlineForString:atPoint:withColor:]):
+ (-[IFTextRenderer widthForCharacters:length:]):
+
2002-05-07 Darin Adler <darin at apple.com>
Oops. These files don't belong at the top level.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index f3a14cd..36af74f 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,23 @@
+2002-05-07 Richard J. Williamson <rjw at apple.com>
+
+ First pass at font substitution. Find a substitute font to
+ use when the specified font doesn't have glyphs for the characters that
+ need to be drawn.
+
+ Works correctly but hasn't been optimized yet, VERY slow.
+ Will optimize this evening and tomorrow. Try www.yahoo.co.jp,
+ it will take a long time to render be eventually will draw correctly.
+
+ * WebCoreSupport.subproj/IFTextRenderer.h:
+ * WebCoreSupport.subproj/IFTextRenderer.m:
+ (hasMissingGlyphs):
+ (+[IFTextRenderer initialize]):
+ (-[IFTextRenderer convertCharacters:length:glyphs:]):
+ (-[IFTextRenderer initializeCaches]):
+ (-[IFTextRenderer drawString:atPoint:withColor:]):
+ (-[IFTextRenderer drawUnderlineForString:atPoint:withColor:]):
+ (-[IFTextRenderer widthForCharacters:length:]):
+
2002-05-07 Darin Adler <darin at apple.com>
Oops. These files don't belong at the top level.
diff --git a/WebKit/WebCoreSupport.subproj/IFTextRenderer.h b/WebKit/WebCoreSupport.subproj/IFTextRenderer.h
index 374c169..4914a28 100644
--- a/WebKit/WebCoreSupport.subproj/IFTextRenderer.h
+++ b/WebKit/WebCoreSupport.subproj/IFTextRenderer.h
@@ -23,8 +23,12 @@ typedef float IFGlyphWidth;
unsigned int widthCacheSize;
IFGlyphWidth *widthCache;
ATSGlyphRef *characterToGlyph;
+
+ NSArray *substituteFontRenderers;
}
- initWithFont:(NSFont *)font;
+- (NSFont *)convertCharacters: (const unichar *)characters length: (int)numCharacters glyphs: (ATSGlyphVector *)glyphs;
+
@end
diff --git a/WebKit/WebCoreSupport.subproj/IFTextRenderer.m b/WebKit/WebCoreSupport.subproj/IFTextRenderer.m
index 9d30a23..47e46de 100644
--- a/WebKit/WebCoreSupport.subproj/IFTextRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/IFTextRenderer.m
@@ -12,25 +12,15 @@
#import <ApplicationServices/ApplicationServices.h>
#import <CoreGraphics/CoreGraphicsPrivate.h>
+
+#import <WebKit/IFTextRendererFactory.h>
#import <WebKit/WebKitDebug.h>
#define NON_BREAKING_SPACE 0xA0
#define SPACE 0x20
-//#define ROUND_TO_INT(x) (int)(((x) > (floor(x) + .5)) ? ceil(x) : floor(x))
#define ROUND_TO_INT(x) (unsigned int)((x)+.5)
-#ifdef FOOOOFOOO
-static inline int ROUND_TO_INT (float x)
-{
- int floored = (int)(x);
-
- if (((float)x) > ((float)(floored) + .5))
- return (int)ceil(x);
- return floored;
-}
-#endif
-
#define LOCAL_GLYPH_BUFFER_SIZE 1024
#define INITIAL_GLYPH_CACHE_MAX 512
@@ -38,6 +28,15 @@ static inline int ROUND_TO_INT (float x)
#define UNINITIALIZED_GLYPH_WIDTH 65535
+static CFCharacterSetRef nonBaseChars = NULL;
+
+// combining char, hangul jamo, or Apple corporate variant tag
+#define JunseongStart 0x1160
+#define JonseongEnd 0x11F9
+#define IsHangulConjoiningJamo(X) (X >= JunseongStart && X <= JonseongEnd)
+#define IsNonBaseChar(X) ((CFCharacterSetIsCharacterMember(nonBaseChars, X) || IsHangulConjoiningJamo(X) || (X & 0x1FFFF0) == 0xF870))
+
+
// These definitions are used to bound the character-to-glyph mapping cache. The
// range is limited to LATIN1. When accessing the cache a check must be made to
// determine that a character range does not include a composable charcter.
@@ -48,9 +47,19 @@ static inline int ROUND_TO_INT (float x)
// The last character in latin1 extended A. (LATIN SMALL LETTER LONG S)
#define LAST_CACHE_CHARACTER (0x17F)
+ at interface NSLanguage : NSObject
+{
+}
++ (NSLanguage *)defaultLanguage;
+ at end
+
+
@interface NSFont (IFPrivate)
- (ATSUFontID)_atsFontID;
- (CGFontRef)_backingCGSFont;
+// Private method to find a font for a character.
++ (NSFont *) findFontLike:(NSFont *)aFont forCharacter:(UInt32)c inLanguage:(NSLanguage *) language;
++ (NSFont *) findFontLike:(NSFont *)aFont forString:(NSString *)string withRange:(NSRange)range inLanguage:(NSLanguage *) language;
@end
static void InitATSGlyphVector(ATSGlyphVector *glyphVector, UInt32 numGlyphs)
@@ -109,12 +118,36 @@ static void FillStyleWithAttributes(ATSUStyle style, NSFont *theFont)
}
}
+
+static bool hasMissingGlyphs(ATSGlyphVector *glyphs)
+{
+ unsigned int i, numGlyphs = glyphs->numGlyphs;
+ ATSLayoutRecord *glyphRecords;
+
+ glyphRecords = (ATSLayoutRecord *)glyphs->firstRecord;
+ for (i = 0; i < numGlyphs; i++){
+ if (glyphRecords[i].glyphID == 0){
+ return YES;
+ }
+ }
+ return NO;
+}
+
+
+ at implementation IFTextRenderer
+
++ (void)initialize
+{
+ nonBaseChars = CFCharacterSetGetPredefined(kCFCharacterSetNonBase);
+}
+
/* Convert non-breaking spaces into spaces. */
-static void ConvertCharactersToGlyphs(ATSStyleGroupPtr styleGroup, const UniChar *characters, int numCharacters, ATSGlyphVector *glyphs)
+- (NSFont *)convertCharacters: (const unichar *)characters length: (int)numCharacters glyphs: (ATSGlyphVector *)glyphs
{
int i;
UniChar localBuffer[LOCAL_GLYPH_BUFFER_SIZE];
UniChar *buffer = localBuffer;
+ NSFont *fontToBeUsed = nil;
for (i = 0; i < numCharacters; i++) {
if (characters[i] == NON_BREAKING_SPACE) {
@@ -138,14 +171,21 @@ static void ConvertCharactersToGlyphs(ATSStyleGroupPtr styleGroup, const UniChar
characters = buffer;
}
- ATSUConvertCharToGlyphs(styleGroup, characters, 0, numCharacters, 0, glyphs);
-
if (buffer != localBuffer) {
free(buffer);
}
-}
+
+ (void)ATSUConvertCharToGlyphs(styleGroup, characters, 0, numCharacters, 0, glyphs);
+
+ if (hasMissingGlyphs(glyphs) == YES){
+ NSString *string = [[NSString alloc] initWithCharactersNoCopy:(unichar *)characters length: numCharacters freeWhenDone: NO];
- at implementation IFTextRenderer
+ fontToBeUsed = [NSFont findFontLike:font forString:string withRange:NSMakeRange (0,numCharacters) inLanguage:[NSLanguage defaultLanguage]];
+ [string release];
+ }
+
+ return fontToBeUsed;
+}
- (void)initializeCaches
{
@@ -154,6 +194,7 @@ static void ConvertCharactersToGlyphs(ATSStyleGroupPtr styleGroup, const UniChar
size_t numGlyphsInFont = CGFontGetNumberOfGlyphs([font _backingCGSFont]);
short unsigned int sequentialGlyphs[INITIAL_GLYPH_CACHE_MAX];
ATSLayoutRecord *glyphRecords;
+ NSFont *fontToUse;
WEBKITDEBUGLEVEL (WEBKIT_LOG_FONTCACHE, "Caching %s %.0f (%ld glyphs) ascent = %f, descent = %f, defaultLineHeightForFont = %f\n", [[font displayName] cString], [font pointSize], numGlyphsInFont, [font ascender], [font descender], [font defaultLineHeightForFont]);
@@ -192,7 +233,7 @@ static void ConvertCharactersToGlyphs(ATSStyleGroupPtr styleGroup, const UniChar
ATSGlyphVector latinGlyphVector;
ATSInitializeGlyphVector(latinCount, 0, &latinGlyphVector);
- ConvertCharactersToGlyphs(styleGroup, &latinBuffer[FIRST_CACHE_CHARACTER], latinCount, &latinGlyphVector);
+ fontToUse = [self convertCharacters: &latinBuffer[FIRST_CACHE_CHARACTER] length: latinCount glyphs: &latinGlyphVector];
if (latinGlyphVector.numGlyphs != latinCount)
[NSException raise:NSInternalInconsistencyException format:@"Optimization assumption violation: ascii and glyphID count not equal - for %@ %f", self, [font displayName], [font pointSize]];
@@ -296,11 +337,7 @@ static void ConvertCharactersToGlyphs(ATSStyleGroupPtr styleGroup, const UniChar
- (void)drawString:(NSString *)string atPoint:(NSPoint)point withColor:(NSColor *)color
{
- // 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.
- point.y -= [self lineSpacing] - [self descent];
-
+ NSFont *substituteFont;
UniChar localBuffer[LOCAL_GLYPH_BUFFER_SIZE];
const UniChar *_internalBuffer = CFStringGetCharactersPtr ((CFStringRef)string);
const UniChar *internalBuffer;
@@ -317,7 +354,17 @@ static void ConvertCharactersToGlyphs(ATSStyleGroupPtr styleGroup, const UniChar
InitATSGlyphVector(&glyphVector, [string length]);
- ConvertCharactersToGlyphs(styleGroup, internalBuffer, [string length], &glyphVector);
+ substituteFont = [self convertCharacters: internalBuffer length: [string length] glyphs: &glyphVector];
+ if (substituteFont){
+ ResetATSGlyphVector(&glyphVector);
+ [[(IFTextRendererFactory *)[IFTextRendererFactory sharedFactory] rendererWithFont: substituteFont] drawString: string atPoint: point withColor: color];
+ return;
+ }
+
+ // 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.
+ point.y -= [self lineSpacing] - [self descent];
[color set];
[font set];
@@ -356,6 +403,27 @@ static void ConvertCharactersToGlyphs(ATSStyleGroupPtr styleGroup, const UniChar
- (void)drawUnderlineForString:(NSString *)string atPoint:(NSPoint)point withColor:(NSColor *)color
{
+ NSFont *substituteFont;
+ UniChar localBuffer[LOCAL_GLYPH_BUFFER_SIZE];
+ const UniChar *_internalBuffer = CFStringGetCharactersPtr ((CFStringRef)string);
+ const UniChar *internalBuffer;
+
+ if (!_internalBuffer){
+ // FIXME: Handle case where length > LOCAL_GLYPH_BUFFER_SIZE
+ CFStringGetCharacters((CFStringRef)string, CFRangeMake(0, CFStringGetLength((CFStringRef)string)), &localBuffer[0]);
+ internalBuffer = &localBuffer[0];
+ }
+ else
+ internalBuffer = _internalBuffer;
+
+ InitATSGlyphVector(&glyphVector, [string length]);
+ substituteFont = [self convertCharacters: internalBuffer length: [string length] glyphs: &glyphVector];
+ ResetATSGlyphVector(&glyphVector);
+ if (substituteFont){
+ [[(IFTextRendererFactory *)[IFTextRendererFactory sharedFactory] rendererWithFont: substituteFont] drawUnderlineForString: string atPoint: point withColor: color];
+ return;
+ }
+
// 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.
@@ -395,6 +463,7 @@ static void ConvertCharactersToGlyphs(ATSStyleGroupPtr styleGroup, const UniChar
int glyphID;
ATSLayoutRecord *glyphRecords;
unsigned int numGlyphs;
+ NSFont *substituteFont;
ATSGlyphRef localCharacterToGlyph[LOCAL_GLYPH_BUFFER_SIZE];
ATSGlyphRef *usedCharacterToGlyph, *allocateCharacterToGlyph = 0;
@@ -434,12 +503,22 @@ static void ConvertCharactersToGlyphs(ATSStyleGroupPtr styleGroup, const UniChar
}
}
+ // 1. Check if the string contains only base characters.
+ // If it does check to see that our cache contains that character.
+
// If we can't use the cached map, then calculate a map for this string. Expensive.
if (needCharToGlyphLookup){
WEBKITDEBUGLEVEL(WEBKIT_LOG_FONTCACHECHARMISS, "character-to-glyph cache miss for character 0x%04x in %s, %.0f\n", characters[i], [[font displayName] lossyCString], [font pointSize]);
InitATSGlyphVector(&glyphVector, length);
- ConvertCharactersToGlyphs(styleGroup, characters, length, &glyphVector);
+
+ // Do the character to glyph conversion.
+ substituteFont = [self convertCharacters: characters length: length glyphs: &glyphVector];
+ if (substituteFont){
+ ResetATSGlyphVector(&glyphVector);
+ return [[(IFTextRendererFactory *)[IFTextRendererFactory sharedFactory] rendererWithFont: substituteFont] widthForCharacters: characters length: length];
+ }
+
glyphRecords = (ATSLayoutRecord *)glyphVector.firstRecord;
numGlyphs = glyphVector.numGlyphs;
diff --git a/WebKit/WebCoreSupport.subproj/IFTextRendererFactory.h b/WebKit/WebCoreSupport.subproj/IFTextRendererFactory.h
index c10736a..12c50e7 100644
--- a/WebKit/WebCoreSupport.subproj/IFTextRendererFactory.h
+++ b/WebKit/WebCoreSupport.subproj/IFTextRendererFactory.h
@@ -15,5 +15,6 @@
+ (void)createSharedFactory;
- init;
+- (id <WebCoreTextRenderer>)rendererWithFont:(NSFont *)font;
@end
diff --git a/WebKit/WebCoreSupport.subproj/WebTextRenderer.h b/WebKit/WebCoreSupport.subproj/WebTextRenderer.h
index 374c169..4914a28 100644
--- a/WebKit/WebCoreSupport.subproj/WebTextRenderer.h
+++ b/WebKit/WebCoreSupport.subproj/WebTextRenderer.h
@@ -23,8 +23,12 @@ typedef float IFGlyphWidth;
unsigned int widthCacheSize;
IFGlyphWidth *widthCache;
ATSGlyphRef *characterToGlyph;
+
+ NSArray *substituteFontRenderers;
}
- initWithFont:(NSFont *)font;
+- (NSFont *)convertCharacters: (const unichar *)characters length: (int)numCharacters glyphs: (ATSGlyphVector *)glyphs;
+
@end
diff --git a/WebKit/WebCoreSupport.subproj/WebTextRenderer.m b/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
index 9d30a23..47e46de 100644
--- a/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
@@ -12,25 +12,15 @@
#import <ApplicationServices/ApplicationServices.h>
#import <CoreGraphics/CoreGraphicsPrivate.h>
+
+#import <WebKit/IFTextRendererFactory.h>
#import <WebKit/WebKitDebug.h>
#define NON_BREAKING_SPACE 0xA0
#define SPACE 0x20
-//#define ROUND_TO_INT(x) (int)(((x) > (floor(x) + .5)) ? ceil(x) : floor(x))
#define ROUND_TO_INT(x) (unsigned int)((x)+.5)
-#ifdef FOOOOFOOO
-static inline int ROUND_TO_INT (float x)
-{
- int floored = (int)(x);
-
- if (((float)x) > ((float)(floored) + .5))
- return (int)ceil(x);
- return floored;
-}
-#endif
-
#define LOCAL_GLYPH_BUFFER_SIZE 1024
#define INITIAL_GLYPH_CACHE_MAX 512
@@ -38,6 +28,15 @@ static inline int ROUND_TO_INT (float x)
#define UNINITIALIZED_GLYPH_WIDTH 65535
+static CFCharacterSetRef nonBaseChars = NULL;
+
+// combining char, hangul jamo, or Apple corporate variant tag
+#define JunseongStart 0x1160
+#define JonseongEnd 0x11F9
+#define IsHangulConjoiningJamo(X) (X >= JunseongStart && X <= JonseongEnd)
+#define IsNonBaseChar(X) ((CFCharacterSetIsCharacterMember(nonBaseChars, X) || IsHangulConjoiningJamo(X) || (X & 0x1FFFF0) == 0xF870))
+
+
// These definitions are used to bound the character-to-glyph mapping cache. The
// range is limited to LATIN1. When accessing the cache a check must be made to
// determine that a character range does not include a composable charcter.
@@ -48,9 +47,19 @@ static inline int ROUND_TO_INT (float x)
// The last character in latin1 extended A. (LATIN SMALL LETTER LONG S)
#define LAST_CACHE_CHARACTER (0x17F)
+ at interface NSLanguage : NSObject
+{
+}
++ (NSLanguage *)defaultLanguage;
+ at end
+
+
@interface NSFont (IFPrivate)
- (ATSUFontID)_atsFontID;
- (CGFontRef)_backingCGSFont;
+// Private method to find a font for a character.
++ (NSFont *) findFontLike:(NSFont *)aFont forCharacter:(UInt32)c inLanguage:(NSLanguage *) language;
++ (NSFont *) findFontLike:(NSFont *)aFont forString:(NSString *)string withRange:(NSRange)range inLanguage:(NSLanguage *) language;
@end
static void InitATSGlyphVector(ATSGlyphVector *glyphVector, UInt32 numGlyphs)
@@ -109,12 +118,36 @@ static void FillStyleWithAttributes(ATSUStyle style, NSFont *theFont)
}
}
+
+static bool hasMissingGlyphs(ATSGlyphVector *glyphs)
+{
+ unsigned int i, numGlyphs = glyphs->numGlyphs;
+ ATSLayoutRecord *glyphRecords;
+
+ glyphRecords = (ATSLayoutRecord *)glyphs->firstRecord;
+ for (i = 0; i < numGlyphs; i++){
+ if (glyphRecords[i].glyphID == 0){
+ return YES;
+ }
+ }
+ return NO;
+}
+
+
+ at implementation IFTextRenderer
+
++ (void)initialize
+{
+ nonBaseChars = CFCharacterSetGetPredefined(kCFCharacterSetNonBase);
+}
+
/* Convert non-breaking spaces into spaces. */
-static void ConvertCharactersToGlyphs(ATSStyleGroupPtr styleGroup, const UniChar *characters, int numCharacters, ATSGlyphVector *glyphs)
+- (NSFont *)convertCharacters: (const unichar *)characters length: (int)numCharacters glyphs: (ATSGlyphVector *)glyphs
{
int i;
UniChar localBuffer[LOCAL_GLYPH_BUFFER_SIZE];
UniChar *buffer = localBuffer;
+ NSFont *fontToBeUsed = nil;
for (i = 0; i < numCharacters; i++) {
if (characters[i] == NON_BREAKING_SPACE) {
@@ -138,14 +171,21 @@ static void ConvertCharactersToGlyphs(ATSStyleGroupPtr styleGroup, const UniChar
characters = buffer;
}
- ATSUConvertCharToGlyphs(styleGroup, characters, 0, numCharacters, 0, glyphs);
-
if (buffer != localBuffer) {
free(buffer);
}
-}
+
+ (void)ATSUConvertCharToGlyphs(styleGroup, characters, 0, numCharacters, 0, glyphs);
+
+ if (hasMissingGlyphs(glyphs) == YES){
+ NSString *string = [[NSString alloc] initWithCharactersNoCopy:(unichar *)characters length: numCharacters freeWhenDone: NO];
- at implementation IFTextRenderer
+ fontToBeUsed = [NSFont findFontLike:font forString:string withRange:NSMakeRange (0,numCharacters) inLanguage:[NSLanguage defaultLanguage]];
+ [string release];
+ }
+
+ return fontToBeUsed;
+}
- (void)initializeCaches
{
@@ -154,6 +194,7 @@ static void ConvertCharactersToGlyphs(ATSStyleGroupPtr styleGroup, const UniChar
size_t numGlyphsInFont = CGFontGetNumberOfGlyphs([font _backingCGSFont]);
short unsigned int sequentialGlyphs[INITIAL_GLYPH_CACHE_MAX];
ATSLayoutRecord *glyphRecords;
+ NSFont *fontToUse;
WEBKITDEBUGLEVEL (WEBKIT_LOG_FONTCACHE, "Caching %s %.0f (%ld glyphs) ascent = %f, descent = %f, defaultLineHeightForFont = %f\n", [[font displayName] cString], [font pointSize], numGlyphsInFont, [font ascender], [font descender], [font defaultLineHeightForFont]);
@@ -192,7 +233,7 @@ static void ConvertCharactersToGlyphs(ATSStyleGroupPtr styleGroup, const UniChar
ATSGlyphVector latinGlyphVector;
ATSInitializeGlyphVector(latinCount, 0, &latinGlyphVector);
- ConvertCharactersToGlyphs(styleGroup, &latinBuffer[FIRST_CACHE_CHARACTER], latinCount, &latinGlyphVector);
+ fontToUse = [self convertCharacters: &latinBuffer[FIRST_CACHE_CHARACTER] length: latinCount glyphs: &latinGlyphVector];
if (latinGlyphVector.numGlyphs != latinCount)
[NSException raise:NSInternalInconsistencyException format:@"Optimization assumption violation: ascii and glyphID count not equal - for %@ %f", self, [font displayName], [font pointSize]];
@@ -296,11 +337,7 @@ static void ConvertCharactersToGlyphs(ATSStyleGroupPtr styleGroup, const UniChar
- (void)drawString:(NSString *)string atPoint:(NSPoint)point withColor:(NSColor *)color
{
- // 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.
- point.y -= [self lineSpacing] - [self descent];
-
+ NSFont *substituteFont;
UniChar localBuffer[LOCAL_GLYPH_BUFFER_SIZE];
const UniChar *_internalBuffer = CFStringGetCharactersPtr ((CFStringRef)string);
const UniChar *internalBuffer;
@@ -317,7 +354,17 @@ static void ConvertCharactersToGlyphs(ATSStyleGroupPtr styleGroup, const UniChar
InitATSGlyphVector(&glyphVector, [string length]);
- ConvertCharactersToGlyphs(styleGroup, internalBuffer, [string length], &glyphVector);
+ substituteFont = [self convertCharacters: internalBuffer length: [string length] glyphs: &glyphVector];
+ if (substituteFont){
+ ResetATSGlyphVector(&glyphVector);
+ [[(IFTextRendererFactory *)[IFTextRendererFactory sharedFactory] rendererWithFont: substituteFont] drawString: string atPoint: point withColor: color];
+ return;
+ }
+
+ // 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.
+ point.y -= [self lineSpacing] - [self descent];
[color set];
[font set];
@@ -356,6 +403,27 @@ static void ConvertCharactersToGlyphs(ATSStyleGroupPtr styleGroup, const UniChar
- (void)drawUnderlineForString:(NSString *)string atPoint:(NSPoint)point withColor:(NSColor *)color
{
+ NSFont *substituteFont;
+ UniChar localBuffer[LOCAL_GLYPH_BUFFER_SIZE];
+ const UniChar *_internalBuffer = CFStringGetCharactersPtr ((CFStringRef)string);
+ const UniChar *internalBuffer;
+
+ if (!_internalBuffer){
+ // FIXME: Handle case where length > LOCAL_GLYPH_BUFFER_SIZE
+ CFStringGetCharacters((CFStringRef)string, CFRangeMake(0, CFStringGetLength((CFStringRef)string)), &localBuffer[0]);
+ internalBuffer = &localBuffer[0];
+ }
+ else
+ internalBuffer = _internalBuffer;
+
+ InitATSGlyphVector(&glyphVector, [string length]);
+ substituteFont = [self convertCharacters: internalBuffer length: [string length] glyphs: &glyphVector];
+ ResetATSGlyphVector(&glyphVector);
+ if (substituteFont){
+ [[(IFTextRendererFactory *)[IFTextRendererFactory sharedFactory] rendererWithFont: substituteFont] drawUnderlineForString: string atPoint: point withColor: color];
+ return;
+ }
+
// 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.
@@ -395,6 +463,7 @@ static void ConvertCharactersToGlyphs(ATSStyleGroupPtr styleGroup, const UniChar
int glyphID;
ATSLayoutRecord *glyphRecords;
unsigned int numGlyphs;
+ NSFont *substituteFont;
ATSGlyphRef localCharacterToGlyph[LOCAL_GLYPH_BUFFER_SIZE];
ATSGlyphRef *usedCharacterToGlyph, *allocateCharacterToGlyph = 0;
@@ -434,12 +503,22 @@ static void ConvertCharactersToGlyphs(ATSStyleGroupPtr styleGroup, const UniChar
}
}
+ // 1. Check if the string contains only base characters.
+ // If it does check to see that our cache contains that character.
+
// If we can't use the cached map, then calculate a map for this string. Expensive.
if (needCharToGlyphLookup){
WEBKITDEBUGLEVEL(WEBKIT_LOG_FONTCACHECHARMISS, "character-to-glyph cache miss for character 0x%04x in %s, %.0f\n", characters[i], [[font displayName] lossyCString], [font pointSize]);
InitATSGlyphVector(&glyphVector, length);
- ConvertCharactersToGlyphs(styleGroup, characters, length, &glyphVector);
+
+ // Do the character to glyph conversion.
+ substituteFont = [self convertCharacters: characters length: length glyphs: &glyphVector];
+ if (substituteFont){
+ ResetATSGlyphVector(&glyphVector);
+ return [[(IFTextRendererFactory *)[IFTextRendererFactory sharedFactory] rendererWithFont: substituteFont] widthForCharacters: characters length: length];
+ }
+
glyphRecords = (ATSLayoutRecord *)glyphVector.firstRecord;
numGlyphs = glyphVector.numGlyphs;
diff --git a/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.h b/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.h
index c10736a..12c50e7 100644
--- a/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.h
+++ b/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.h
@@ -15,5 +15,6 @@
+ (void)createSharedFactory;
- init;
+- (id <WebCoreTextRenderer>)rendererWithFont:(NSFont *)font;
@end
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list