mirrors/JetBrainsRuntime
1
0
Fork 0
mirror of https://github.com/JetBrains/JetBrainsRuntime.git synced 2025-12-06 09:29:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

JBR-6225 Revert CGGI_GlyphInfoDescriptor refactoring

Browse Source 
(cherry picked from commit 3266172b86)
This commit is contained in:
Nikita Gubarkov
2025-04-28 10:59:06 +02:00
parent f853935b79
commit 113ce8b81f
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/java.desktop/macosx/native/libawt_lwawt/font/CGGlyphImages.m
View File

@@ -360,7 +360,7 @@ typedef struct CGGI_GlyphInfoDescriptor {
} CGGI_GlyphInfoDescriptor;
typedef struct CGGI_RenderingMode {
CGGI_GlyphInfoDescriptor *mainFontDescriptor;
CGGI_GlyphInfoDescriptor *glyphDescriptor;
JRSFontRenderingStyle cgFontMode;
bool lcdRendering;
bool subpixelResolution;
@@ -376,7 +376,7 @@ static CGGI_GlyphInfoDescriptor argb =
static inline CGGI_GlyphInfoDescriptor*
CGGI_GetGlyphInfoDescriptor(const CGGI_RenderingMode *mode, CTFontRef font)
{
return IsEmojiFont(font) ? &argb : mode->mainFontDescriptor;
return IsEmojiFont(font) ? &argb : mode->glyphDescriptor;
}
static inline CGGI_RenderingMode
@@ -398,14 +398,14 @@ CGGI_GetRenderingMode(const AWTStrike *strike)
case sun_awt_SunHints_INTVAL_TEXT_ANTIALIAS_OFF:
case sun_awt_SunHints_INTVAL_TEXT_ANTIALIAS_ON:
mode.lcdRendering = false;
mode.mainFontDescriptor = &grey;
mode.glyphDescriptor = &grey;
break;
case sun_awt_SunHints_INTVAL_TEXT_ANTIALIAS_LCD_HRGB:
case sun_awt_SunHints_INTVAL_TEXT_ANTIALIAS_LCD_HBGR:
case sun_awt_SunHints_INTVAL_TEXT_ANTIALIAS_LCD_VRGB:
case sun_awt_SunHints_INTVAL_TEXT_ANTIALIAS_LCD_VBGR:
mode.lcdRendering = true;
mode.mainFontDescriptor = &rgb;
mode.glyphDescriptor = &rgb;
break;
case sun_awt_SunHints_INTVAL_TEXT_ANTIALIAS_GASP:
case sun_awt_SunHints_INTVAL_TEXT_ANTIALIAS_DEFAULT:
@@ -419,10 +419,6 @@ CGGI_GetRenderingMode(const AWTStrike *strike)
userInfo:nil];
@throw e;
}
if (IsEmojiFont((CTFontRef)strike->fAWTFont->fFont)) {
mode.mainFontDescriptor = &argb;
mode.subpixelResolution = false;
}
return mode;
}
@@ -873,12 +869,15 @@ CGGI_FillImagesForGlyphsWithSizedCanvas(CGGI_GlyphCanvas *canvas,
CGContextSetFont(canvas->context, strike->fAWTFont->fNativeCGFont);
JRSFontSetRenderingStyleOnContext(canvas->context, strike->fStyle);
CTFontRef mainFont = (CTFontRef)strike->fAWTFont->fFont;
CGGI_GlyphInfoDescriptor* mainFontDescriptor = CGGI_GetGlyphInfoDescriptor(mode, mainFont);
const bool isMojaveOrAbove = IS_OSX_GT10_13;
CFIndex i;
for (i = 0; i < len; i++) {
GlyphInfo *info = (GlyphInfo *)jlong_to_ptr(glyphInfos[i]);
if (info != NULL) {
CGGI_CreateImageForGlyph(canvas, glyphs[i], info, mode->mainFontDescriptor,
CGGI_CreateImageForGlyph(canvas, glyphs[i], info, mainFontDescriptor,
strike, (CTFontRef)strike->fAWTFont->fFont, isMojaveOrAbove);
} else {
info = CGGI_CreateImageForUnicode(canvas, strike, mode, uniChars[i], isMojaveOrAbove);
@@ -973,6 +972,7 @@ CGGI_CreateGlyphInfos(jlong *glyphInfos, const AWTStrike *strike,
CTFontRef fontRef = (CTFontRef)font->fFont;
CGGlyphImages_GetGlyphMetrics(fontRef, &strike->fTx, strike->fSize, bboxCGMode, glyphs, len, bboxes, advances, IS_OSX_GT10_14);
CGGI_GlyphInfoDescriptor* mainFontDescriptor = CGGI_GetGlyphInfoDescriptor(mode, fontRef);
size_t maxWidth = 1;
size_t maxHeight = 1;
@@ -990,7 +990,7 @@ CGGI_CreateGlyphInfos(jlong *glyphInfos, const AWTStrike *strike,
CGRect bbox = bboxes[i];
GlyphInfo *glyphInfo = CGGI_CreateNewGlyphInfoFrom(advance, bbox, strike,
mode->mainFontDescriptor,
mainFontDescriptor,
mode->subpixelResolution);
int w = glyphInfo->width * glyphInfo->subpixelResolutionX;