Compare commits

...

2 Commits

Author SHA1 Message Date
Pascal Abresch 3a3bc69b8e Haiku: assign glyph index even if glyph is not found
This should make it a problem the app_server has to deal with instead of webkit.
Fixes the remaining part of #16221
2021-07-02 14:53:02 +02:00
Adrien Destugues 127d0aae57 Make glyph types 32-bit.
Haiku stores utf32 in the Glyph type, so we need a type large enough for
that.

Fixes #16221
2021-07-01 19:32:01 +02:00
3 changed files with 10 additions and 6 deletions

View File

@ -32,7 +32,11 @@
#include <wtf/Vector.h>
#include <wtf/text/WTFString.h>
#if USE(HAIKU)
typedef unsigned int CGGlyph;
#else
typedef unsigned short CGGlyph;
#endif
typedef const struct __CTRun * CTRunRef;
typedef const struct __CTLine * CTLineRef;

View File

@ -32,7 +32,11 @@
namespace WebCore {
#if USE(HAIKU)
typedef unsigned int Glyph;
#else
typedef unsigned short Glyph;
#endif
} // namespace WebCore

View File

@ -54,12 +54,8 @@ bool GlyphPage::fill(UChar* buffer, unsigned bufferLength)
if (character == iterator.end())
break;
if (!haveGlyphs[i])
setGlyphForIndex(i, 0);
else {
hasOneGlyph = true;
setGlyphForIndex(i, character);
}
hasOneGlyph = true;
setGlyphForIndex(i, character);
}
return hasOneGlyph;