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

Cleanup SkText warnings

Browse Source 
Some unused var and pessimizing move warnings, e.g.

../../experimental/sktext/src/Text.cpp:316:12: warning: moving a local object in a return statement prevents copy elision [-Wpessimizing-move]
    return std::move(shapedText);
           ^
../../experimental/sktext/src/Text.cpp:316:12: note: remove std::move call here
    return std::move(shapedText);
           ^~~~~~~~~~

Change-Id: Id5c220b7a850b2013e2bf065a87d4a296bd0369c
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/542522
Reviewed-by: Julia Lavrova <jlavrova@google.com>
Commit-Queue: Florin Malita <fmalita@google.com>
Auto-Submit: Florin Malita <fmalita@chromium.org>
This commit is contained in:
Florin Malita 2022-05-20 11:03:52 -04:00 committed by SkCQ
parent 97caefd055
commit 1da7be7a85
3 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
experimental/sktext/samples/Text.cpp
View File

@ -47,9 +47,6 @@ protected:
const std::u16string& text,
TextAlign align,
TextDirection direction = TextDirection::kLtr) {
const std::u16string& ellipsis = u"\u2026";
SkScalar margin = 20;
SkAutoCanvasRestore acr(canvas, true);
canvas->clipRect(SkRect::MakeWH(w, h));

13
experimental/sktext/src/Text.cpp
View File

@ -94,7 +94,7 @@ std::unique_ptr<FontResolvedText> UnicodeText::resolveFonts(SkSpan<FontBlock> bl
SkDebugf("[%d:%d)\n", f.textRange.fStart, f.textRange.fEnd);
}
*/
return std::move(fontResolvedText);
return fontResolvedText;
}
bool FontResolvedText::resolveChain(UnicodeText* unicodeText, TextRange textRange, const FontChain& fontChain) {
@ -259,7 +259,6 @@ std::unique_ptr<ShapedText> FontResolvedText::shape(UnicodeText* unicodeText,
formattingMarks.emplace_back(text8.size()/* UTF8FromUTF16[text16.size() */);
// Convert fontBlocks from utf16 to utf8
SkTArray<ResolvedFontBlock, true> fontBlocks8;
TextIndex index8 = 0;
for (auto& fb : fResolvedFonts) {
TextRange text8(UTF8FromUTF16[fb.textRange.fStart], UTF8FromUTF16[fb.textRange.fEnd]);
fontBlocks8.emplace_back(text8, fb.typeface, fb.size, fb.style);
@ -313,7 +312,7 @@ std::unique_ptr<ShapedText> FontResolvedText::shape(UnicodeText* unicodeText,
logicalRun.setRunType(LogicalRunType::kLineBreak);
}
}
return std::move(shapedText);
return shapedText;
}
// TODO: Implement the vertical restriction (height) and add ellipsis
@ -370,9 +369,7 @@ std::unique_ptr<WrappedText> ShapedText::wrap(UnicodeText* unicodeText, float wi
clusterGlyphs.fEnd = glyphIndex;
cluster = Stretch(runIndex, clusterGlyphs, clusterText.normalized(), run.calculateWidth(clusterGlyphs), runMetrics);
auto isSoftLineBreak = unicodeText->isSoftLineBreak(cluster.textStart());
auto isWhitespaces = unicodeText->isWhitespaces(cluster.textRange());
auto isEndOfText = run.leftToRight() ? textIndex == run.fUtf16Range.fEnd : textIndex == run.fUtf16Range.fStart;
// line + spaces + clusters + cluster
if (isWhitespaces) {
// This is the end of the word
@ -429,7 +426,7 @@ std::unique_ptr<WrappedText> ShapedText::wrap(UnicodeText* unicodeText, float wi
}
this->addLine(wrappedText.get(), unicodeText->getUnicode(), line, spaces, false);
wrappedText->fActualSize.fWidth = width;
return std::move(wrappedText);
return wrappedText;
}
SkTArray<int32_t> ShapedText::getVisualOrder(SkUnicode* unicode, RunIndex startRun, RunIndex endRun) {
@ -458,7 +455,7 @@ void ShapedText::addLine(WrappedText* wrappedText, SkUnicode* unicode, Stretch&
auto startRun = lineStretch.glyphStart().runIndex();
auto endRun = lineStretch.glyphEnd().runIndex();
// Reorder and cut (if needed) runs so they fit the line
auto visualOrder = std::move(this->getVisualOrder(unicode, startRun, endRun));
auto visualOrder = this->getVisualOrder(unicode, startRun, endRun);
// Walk through the line's runs in visual order
auto firstRunIndex = startRun;
auto runStart = wrappedText->fVisualRuns.size();
@ -547,7 +544,7 @@ std::vector<TextIndex> WrappedText::chunksToBlocks(SkSpan<size_t> chunks) {
index += chunk;
}
blocks.emplace_back(index);
return std::move(blocks);
return blocks;
}
SkSpan<TextIndex> WrappedText::limitBlocks(TextRange textRange, SkSpan<TextIndex> blocks) {

1
experimental/sktext/tests/SelectableText.cpp
View File

@ -158,7 +158,6 @@ UNIX_ONLY_TEST(SkText_SelectableText_Navigation_FirstLast, reporter) {
// First position
auto firstLine = testVisitor.fTestLines.front();
auto firstRun = testVisitor.fTestRuns.front();
auto firstPosition = selectableText->firstPosition(PositionType::kGraphemeCluster);
REPORTER_ASSERT(reporter, firstPosition.fLineIndex == 0);
REPORTER_ASSERT(reporter, firstPosition.fTextRange == TextRange(0, 0));