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

share tiny bit of code for std language iter

Browse Source 
Change-Id: I928ba956c1ff038332d7c7497fe5fc0c297f4f22
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/217140
Commit-Queue: Ben Wagner <bungeman@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Mike Reed <reed@google.com>
Auto-Submit: Mike Reed <reed@google.com>
This commit is contained in:
Mike Reed 2019-05-30 14:09:33 -04:00 committed by Skia Commit-Bot
parent 3a79bf4959
commit c72216583d
2 changed files with 3 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/skshaper/include/SkShaper.h
View File

@ -128,9 +128,9 @@ public:
public:
TrivialLanguageRunIterator(const char* language, size_t utf8Bytes)
: TrivialRunIterator(utf8Bytes), fLanguage(language) {}
const char* currentLanguage() const override { return fLanguage; }
const char* currentLanguage() const override { return fLanguage.c_str(); }
private:
const char* fLanguage;
SkString fLanguage;
};
class RunHandler {

30
modules/skshaper/src/SkShaper.cpp
View File

@ -124,37 +124,9 @@ SkShaper::MakeFontMgrRunIterator(const char* utf8, size_t utf8Bytes,
return skstd::make_unique<FontMgrRunIterator>(utf8, utf8Bytes, font, std::move(fallback));
}
class StdLanguageRunIterator final : public SkShaper::LanguageRunIterator {
public:
StdLanguageRunIterator(const char* utf8, size_t utf8Bytes)
: fCurrent(utf8), fBegin(utf8), fEnd(fCurrent + utf8Bytes)
, fLanguage(std::locale().name().c_str())
{ }
void consume() override {
// Ideally something like cld2/3 could be used, or user signals.
SkASSERT(fCurrent < fEnd);
fCurrent = fEnd;
}
size_t endOfCurrentRun() const override {
return fCurrent - fBegin;
}
bool atEnd() const override {
return fCurrent == fEnd;
}
const char* currentLanguage() const override {
return fLanguage.c_str();
}
private:
char const * fCurrent;
char const * const fBegin;
char const * const fEnd;
const SkString fLanguage;
};
std::unique_ptr<SkShaper::LanguageRunIterator>
SkShaper::MakeStdLanguageRunIterator(const char* utf8, size_t utf8Bytes) {
return skstd::make_unique<StdLanguageRunIterator>(utf8, utf8Bytes);
return skstd::make_unique<TrivialLanguageRunIterator>(std::locale().name().c_str(), utf8Bytes);
}
void SkTextBlobBuilderRunHandler::beginLine() {