Iterate over unresolved instead of cycling.
This makes it much clearer which code is actually adding to and removing
from the unresolved queue. This also makes fillGaps much more
performant since it no longer needs to make a full copy of the
unresolved blocks.
Change-Id: I62a5eb32118fec6745b7079f537ccbd07b018c12
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/291318
Commit-Queue: Ben Wagner <bungeman@google.com>
Reviewed-by: Julia Lavrova <jlavrova@google.com>
diff --git a/modules/skparagraph/src/OneLineShaper.cpp b/modules/skparagraph/src/OneLineShaper.cpp
index e9691eb..1e9db85 100644
--- a/modules/skparagraph/src/OneLineShaper.cpp
+++ b/modules/skparagraph/src/OneLineShaper.cpp
@@ -76,20 +76,12 @@
auto size = fUnresolvedBlocks.size();
SkDebugf("Unresolved: %d\n", size);
- for (size_t i = 0; i < size; ++i) {
- auto unresolved = fUnresolvedBlocks.front();
- fUnresolvedBlocks.pop();
+ for (const auto& unresolved : fUnresolvedBlocks) {
SkDebugf("[%d:%d)\n", unresolved.fText.start, unresolved.fText.end);
- fUnresolvedBlocks.emplace(unresolved);
}
}
#endif
-void OneLineShaper::dropUnresolved() {
- SkASSERT(!fUnresolvedBlocks.empty());
- fUnresolvedBlocks.pop();
-}
-
void OneLineShaper::fillGaps(size_t startingCount) {
// Fill out gaps between all unresolved blocks
TextRange resolvedTextLimits = fCurrentRun->fTextRange;
@@ -99,17 +91,12 @@
TextIndex resolvedTextStart = resolvedTextLimits.start;
GlyphIndex resolvedGlyphsStart = 0;
- auto count = fUnresolvedBlocks.size();
- for (size_t i = 0; i < count; ++i) {
- auto front = fUnresolvedBlocks.front();
- fUnresolvedBlocks.pop();
- fUnresolvedBlocks.push(front);
- if (i < startingCount) {
- // Skip the first ones
- continue;
- }
+ auto begin = fUnresolvedBlocks.begin();
+ auto end = fUnresolvedBlocks.end();
+ begin += startingCount; // Skip the old ones, do the new ones
+ for (; begin != end; ++begin) {
+ auto& unresolved = *begin;
- auto& unresolved = fUnresolvedBlocks.back();
TextRange resolvedText(resolvedTextStart, fCurrentRun->leftToRight() ? unresolved.fText.start : unresolved.fText.end);
if (resolvedText.width() > 0) {
if (!fCurrentRun->leftToRight()) {
@@ -154,7 +141,7 @@
// Add all unresolved blocks to resolved blocks
while (!fUnresolvedBlocks.empty()) {
auto unresolved = fUnresolvedBlocks.front();
- fUnresolvedBlocks.pop();
+ fUnresolvedBlocks.pop_front();
if (unresolved.fText.width() == 0) {
continue;
}
@@ -307,7 +294,7 @@
}
}
}
- fUnresolvedBlocks.emplace(unresolved);
+ fUnresolvedBlocks.emplace_back(unresolved);
}
void OneLineShaper::sortOutGlyphs(std::function<void(GlyphRange)>&& sortOutUnresolvedBLock) {
@@ -584,7 +571,7 @@
fHeight = block.fStyle.getHeightOverride() ? block.fStyle.getHeight() : 0;
fAdvance = SkVector::Make(advanceX, 0);
fCurrentText = block.fRange;
- fUnresolvedBlocks.emplace(RunBlock(block.fRange));
+ fUnresolvedBlocks.emplace_back(RunBlock(block.fRange));
matchResolvedFonts(block.fStyle, [&](sk_sp<SkTypeface> typeface) {
@@ -628,7 +615,7 @@
// Take off the queue the block we tried to resolved -
// whatever happened, we have now smaller pieces of it to deal with
- this->dropUnresolved();
+ fUnresolvedBlocks.pop_front();
}
if (fUnresolvedBlocks.empty()) {
diff --git a/modules/skparagraph/src/OneLineShaper.h b/modules/skparagraph/src/OneLineShaper.h
index 456855f..45e36c6 100644
--- a/modules/skparagraph/src/OneLineShaper.h
+++ b/modules/skparagraph/src/OneLineShaper.h
@@ -69,7 +69,6 @@
#ifdef SK_DEBUG
void printState();
#endif
- void dropUnresolved();
void finish(TextRange text, SkScalar height, SkScalar& advanceX);
void beginLine() override {}
@@ -109,7 +108,7 @@
// TODO: Something that is not thead-safe since we don't need it
std::shared_ptr<Run> fCurrentRun;
- std::queue<RunBlock> fUnresolvedBlocks;
+ std::deque<RunBlock> fUnresolvedBlocks;
std::vector<RunBlock> fResolvedBlocks;
// Keeping all resolved typefaces