385804514e
This reverts commit e2e52e46ca.
Reason for revert: See if this is blocking the Chrome roll
Original change's description:
> Remove drawTextBlob from device use drawGlyphRunList
>
> Convert all backends to use GlyphRunList instead of
> text blobs. If the device did not originally implement
> drawTextBlob it will be simulated by drawPosText on the
> device.
>
> Other changes:
> Change to using an origin from absolulte positioning. The GPU
> code uses origin change to update blobs under translation.
>
> Change cluster to use const uint32_t instead of just
> uint32_t.
>
> Add SkPaint to runs.
>
> The draw filter is hosted up to the canavas level and applied there.
>
> Change-Id: Ib105b6bd26b67db55f1c954e37c79fbdcaa9d4a2
> Reviewed-on: https://skia-review.googlesource.com/137224
> Reviewed-by: Herb Derby <herb@google.com>
> Reviewed-by: Khusal Sagar <khushalsagar@chromium.org>
> Reviewed-by: Hal Canary <halcanary@google.com>
> Reviewed-by: Jim Van Verth <jvanverth@google.com>
> Commit-Queue: Herb Derby <herb@google.com>
TBR=jvanverth@google.com,halcanary@google.com,bungeman@google.com,herb@google.com,reed@google.com,khushalsagar@chromium.org,khushalsagar@google.com
Change-Id: I4d93a534990c89deee7d3aaa00ec40d47e0d2ece
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/138120
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
99 lines
2.9 KiB
C++
99 lines
2.9 KiB
C++
/*
|
|
* Copyright 2018 The Android Open Source Project
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#include "SkGlyphRun.h"
|
|
|
|
#include "SkTextBlob.h"
|
|
|
|
#include "Test.h"
|
|
|
|
DEF_TEST(GlyphSetBasic, reporter) {
|
|
SkGlyphSet set;
|
|
|
|
std::vector<SkGlyphID> unique;
|
|
|
|
set.reuse(10, &unique);
|
|
REPORTER_ASSERT(reporter, set.add(7) == 0);
|
|
REPORTER_ASSERT(reporter, set.add(3) == 1);
|
|
set.reuse(10, &unique);
|
|
REPORTER_ASSERT(reporter, set.add(5) == 0);
|
|
REPORTER_ASSERT(reporter, set.add(8) == 1);
|
|
REPORTER_ASSERT(reporter, set.add(3) == 2);
|
|
|
|
REPORTER_ASSERT(reporter, unique.size() == 5);
|
|
REPORTER_ASSERT(reporter, unique[0] == 7);
|
|
REPORTER_ASSERT(reporter, unique[1] == 3);
|
|
REPORTER_ASSERT(reporter, unique[2] == 5);
|
|
REPORTER_ASSERT(reporter, unique[3] == 8);
|
|
REPORTER_ASSERT(reporter, unique[4] == 3);
|
|
}
|
|
|
|
DEF_TEST(GlyphRunBasic, reporter) {
|
|
SkGlyphID glyphs[] = {100, 3, 240, 3, 234, 111, 3, 4, 10, 11};
|
|
uint16_t count = SK_ARRAY_COUNT(glyphs);
|
|
|
|
SkPaint paint;
|
|
paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
|
|
|
|
SkGlyphRunBuilder builder;
|
|
builder.prepareDrawText(paint, glyphs, count, SkPoint::Make(0, 0));
|
|
}
|
|
|
|
DEF_TEST(GlyphRunBlob, reporter) {
|
|
constexpr uint16_t count = 5;
|
|
constexpr int runCount = 2;
|
|
|
|
auto tf = SkTypeface::MakeFromName("monospace", SkFontStyle());
|
|
|
|
SkPaint font;
|
|
font.setTypeface(tf);
|
|
font.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
|
|
font.setTextAlign(SkPaint::kLeft_Align);
|
|
font.setStyle(SkPaint::kFill_Style);
|
|
font.setHinting(SkPaint::kNormal_Hinting);
|
|
font.setTextSize(1u);
|
|
|
|
SkTextBlobBuilder blobBuilder;
|
|
for (int runNum = 0; runNum < runCount; runNum++) {
|
|
const auto& runBuffer = blobBuilder.allocRunPosH(font, count, runNum);
|
|
SkASSERT(runBuffer.utf8text == nullptr);
|
|
SkASSERT(runBuffer.clusters == nullptr);
|
|
|
|
for (int i = 0; i < count; i++) {
|
|
runBuffer.glyphs[i] = static_cast<SkGlyphID>(i + runNum * count);
|
|
runBuffer.pos[i] = SkIntToScalar(i + runNum * count);
|
|
}
|
|
}
|
|
|
|
auto blob = blobBuilder.make();
|
|
|
|
SkPaint paint;
|
|
paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
|
|
|
|
SkGlyphRunBuilder runBuilder;
|
|
runBuilder.prepareTextBlob(font, *blob, SkPoint::Make(0, 0));
|
|
|
|
auto runList = runBuilder.useGlyphRunList();
|
|
|
|
REPORTER_ASSERT(reporter, runList->size() == runCount);
|
|
int runIndex = 0;
|
|
for (auto& run : *runList) {
|
|
REPORTER_ASSERT(reporter, run.runSize() == count);
|
|
REPORTER_ASSERT(reporter, run.uniqueSize() == count);
|
|
|
|
int index = 0;
|
|
for (auto p : run.positions()) {
|
|
if (p.x() != runIndex * count + index) {
|
|
ERRORF(reporter, "x: %g != k: %d", p.x(), runIndex * count + index);
|
|
break;
|
|
}
|
|
index += 1;
|
|
}
|
|
|
|
runIndex += 1;
|
|
}
|
|
} |