AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Correct cluster index

Browse Source 
Change-Id: Ic657b3fff318e1e76efa4ab7533bc2a833d17802
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/253957
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Julia Lavrova <jlavrova@google.com>
This commit is contained in:
Julia Lavrova 2019-11-11 13:23:25 -05:00 committed by Skia Commit-Bot
parent 4a09815d8e
commit b00ccf52de
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/skparagraph/src/OneLineShaper.cpp
View File

@ -235,8 +235,7 @@ void OneLineShaper::increment(TextIndex& index) {
// Make it [left:right) regardless of a text direction
TextRange OneLineShaper::normalizeTextRange(GlyphRange glyphRange) {
TextRange textRange(fCurrentText.start + fCurrentRun->fClusterIndexes[glyphRange.start],
fCurrentText.start + fCurrentRun->fClusterIndexes[glyphRange.end]);
TextRange textRange(clusterIndex(glyphRange.start), clusterIndex(glyphRange.end));
if (!fCurrentRun->leftToRight()) {
std::swap(textRange.start, textRange.end);
}
@ -289,8 +288,6 @@ void OneLineShaper::sortOutGlyphs(std::function<void(GlyphRange)>&& sortOutUnres
GlyphRange block = EMPTY_RANGE;
for (size_t i = 0; i < fCurrentRun->size(); ++i) {
auto clusterIndex = fCurrentRun->fClusterIndexes[i];
// Inspect the glyph
auto glyph = fCurrentRun->fGlyphs[i];
if (glyph != 0) {
@ -301,7 +298,7 @@ void OneLineShaper::sortOutGlyphs(std::function<void(GlyphRange)>&& sortOutUnres
// This is the end of unresolved block
block.end = i;
} else {
const char* cluster = text.begin() + clusterIndex;
const char* cluster = text.begin() + clusterIndex(i);
SkUnichar codepoint = utf8_next(&cluster, text.end());
if (u_iscntrl(codepoint)) {
// This codepoint does not have to be resolved; let's pretend it's resolved

3
modules/skparagraph/src/OneLineShaper.h
View File

@ -89,6 +89,9 @@ private:
void commitRunBuffer(const RunInfo&) override;
TextRange clusteredText(GlyphRange glyphs);
ClusterIndex clusterIndex(GlyphIndex glyph) {
return fCurrentText.start + fCurrentRun->fClusterIndexes[glyph];
}
void addFullyResolved();
void addUnresolvedWithRun(GlyphRange glyphRange);
void sortOutGlyphs(std::function<void(GlyphRange)>&& sortOutUnresolvedBLock);