673e87cda9
When SkBaseDevice switched to drawGlyphRunList(), we lost the ability to detect a) constant-Y text and b) default-positioned text. As a result, the emitted SVG contains lots of redundant/repeating glyph positions. This CL enhances SVGTextBuilder to detect and consolidate constant-Y glyph positions. Also restore a useful whitespace unit test. Change-Id: I50568aef1955f75898ebab41441ad5fe418dac43 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/228563 Commit-Queue: Florin Malita <fmalita@chromium.org> Reviewed-by: Mike Reed <reed@google.com>
416 lines
16 KiB
C++
416 lines
16 KiB
C++
/*
|
|
* Copyright 2015 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#define ABORT_TEST(r, cond, ...) \
|
|
do { \
|
|
if (cond) { \
|
|
REPORT_FAILURE(r, #cond, SkStringPrintf(__VA_ARGS__)); \
|
|
return; \
|
|
} \
|
|
} while (0)
|
|
|
|
#include "include/core/SkBitmap.h"
|
|
#include "include/core/SkCanvas.h"
|
|
#include "include/core/SkColorFilter.h"
|
|
#include "include/core/SkData.h"
|
|
#include "include/core/SkImage.h"
|
|
#include "include/core/SkShader.h"
|
|
#include "include/core/SkStream.h"
|
|
#include "include/core/SkTextBlob.h"
|
|
#include "include/private/SkTo.h"
|
|
#include "include/svg/SkSVGCanvas.h"
|
|
#include "include/utils/SkParse.h"
|
|
#include "src/core/SkMakeUnique.h"
|
|
#include "src/shaders/SkImageShader.h"
|
|
#include "tests/Test.h"
|
|
#include "tools/ToolUtils.h"
|
|
|
|
#include <string.h>
|
|
|
|
#ifdef SK_XML
|
|
|
|
#include "src/svg/SkSVGDevice.h"
|
|
#include "src/xml/SkDOM.h"
|
|
#include "src/xml/SkXMLWriter.h"
|
|
|
|
static std::unique_ptr<SkCanvas> MakeDOMCanvas(SkDOM* dom, uint32_t flags = 0) {
|
|
auto svgDevice = SkSVGDevice::Make(SkISize::Make(100, 100),
|
|
skstd::make_unique<SkXMLParserWriter>(dom->beginParsing()),
|
|
flags);
|
|
return svgDevice ? skstd::make_unique<SkCanvas>(svgDevice)
|
|
: nullptr;
|
|
}
|
|
|
|
namespace {
|
|
|
|
|
|
void check_text_node(skiatest::Reporter* reporter,
|
|
const SkDOM& dom,
|
|
const SkDOM::Node* root,
|
|
const SkPoint& offset,
|
|
unsigned scalarsPerPos,
|
|
const char* txt,
|
|
const char* expected) {
|
|
if (root == nullptr) {
|
|
ERRORF(reporter, "root element not found.");
|
|
return;
|
|
}
|
|
|
|
const SkDOM::Node* textElem = dom.getFirstChild(root, "text");
|
|
if (textElem == nullptr) {
|
|
ERRORF(reporter, "<text> element not found.");
|
|
return;
|
|
}
|
|
REPORTER_ASSERT(reporter, dom.getType(textElem) == SkDOM::kElement_Type);
|
|
|
|
const SkDOM::Node* textNode= dom.getFirstChild(textElem);
|
|
REPORTER_ASSERT(reporter, textNode != nullptr);
|
|
if (textNode != nullptr) {
|
|
REPORTER_ASSERT(reporter, dom.getType(textNode) == SkDOM::kText_Type);
|
|
REPORTER_ASSERT(reporter, strcmp(expected, dom.getName(textNode)) == 0);
|
|
}
|
|
|
|
int textLen = SkToInt(strlen(expected));
|
|
|
|
const char* x = dom.findAttr(textElem, "x");
|
|
REPORTER_ASSERT(reporter, x != nullptr);
|
|
if (x != nullptr) {
|
|
int xposCount = textLen;
|
|
REPORTER_ASSERT(reporter, SkParse::Count(x) == xposCount);
|
|
|
|
SkAutoTMalloc<SkScalar> xpos(xposCount);
|
|
SkParse::FindScalars(x, xpos.get(), xposCount);
|
|
if (scalarsPerPos < 1) {
|
|
// For default-positioned text, we cannot make any assumptions regarding
|
|
// the first glyph position when the string has leading whitespace (to be stripped).
|
|
if (txt[0] != ' ' && txt[0] != '\t') {
|
|
REPORTER_ASSERT(reporter, xpos[0] == offset.x());
|
|
}
|
|
} else {
|
|
for (int i = 0; i < xposCount; ++i) {
|
|
REPORTER_ASSERT(reporter, xpos[i] == SkIntToScalar(expected[i]));
|
|
}
|
|
}
|
|
}
|
|
|
|
const char* y = dom.findAttr(textElem, "y");
|
|
REPORTER_ASSERT(reporter, y != nullptr);
|
|
if (y != nullptr) {
|
|
int yposCount = (scalarsPerPos < 2) ? 1 : textLen;
|
|
REPORTER_ASSERT(reporter, SkParse::Count(y) == yposCount);
|
|
|
|
SkAutoTMalloc<SkScalar> ypos(yposCount);
|
|
SkParse::FindScalars(y, ypos.get(), yposCount);
|
|
if (scalarsPerPos < 2) {
|
|
REPORTER_ASSERT(reporter, ypos[0] == offset.y());
|
|
} else {
|
|
for (int i = 0; i < yposCount; ++i) {
|
|
REPORTER_ASSERT(reporter, ypos[i] == 150 - SkIntToScalar(expected[i]));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
void test_whitespace_pos(skiatest::Reporter* reporter,
|
|
const char* txt,
|
|
const char* expected) {
|
|
size_t len = strlen(txt);
|
|
|
|
SkDOM dom;
|
|
SkPaint paint;
|
|
SkFont font(ToolUtils::create_portable_typeface());
|
|
SkPoint offset = SkPoint::Make(10, 20);
|
|
|
|
{
|
|
MakeDOMCanvas(&dom)->drawSimpleText(txt, len, SkTextEncoding::kUTF8,
|
|
offset.x(), offset.y(), font, paint);
|
|
}
|
|
check_text_node(reporter, dom, dom.finishParsing(), offset, 0, txt, expected);
|
|
|
|
{
|
|
SkAutoTMalloc<SkScalar> xpos(len);
|
|
for (int i = 0; i < SkToInt(len); ++i) {
|
|
xpos[i] = SkIntToScalar(txt[i]);
|
|
}
|
|
|
|
auto blob = SkTextBlob::MakeFromPosTextH(txt, len, &xpos[0], offset.y(), font);
|
|
MakeDOMCanvas(&dom)->drawTextBlob(blob, 0, 0, paint);
|
|
}
|
|
check_text_node(reporter, dom, dom.finishParsing(), offset, 1, txt, expected);
|
|
|
|
{
|
|
SkAutoTMalloc<SkPoint> pos(len);
|
|
for (int i = 0; i < SkToInt(len); ++i) {
|
|
pos[i] = SkPoint::Make(SkIntToScalar(txt[i]), 150 - SkIntToScalar(txt[i]));
|
|
}
|
|
|
|
auto blob = SkTextBlob::MakeFromPosText(txt, len, &pos[0], font);
|
|
MakeDOMCanvas(&dom)->drawTextBlob(blob, 0, 0, paint);
|
|
}
|
|
check_text_node(reporter, dom, dom.finishParsing(), offset, 2, txt, expected);
|
|
}
|
|
|
|
} // namespace
|
|
|
|
DEF_TEST(SVGDevice_whitespace_pos, reporter) {
|
|
static const struct {
|
|
const char* tst_in;
|
|
const char* tst_out;
|
|
} tests[] = {
|
|
{ "abcd" , "abcd" },
|
|
{ "ab cd" , "ab cd" },
|
|
{ "ab \t\t cd", "ab cd" },
|
|
{ " abcd" , "abcd" },
|
|
{ " abcd" , "abcd" },
|
|
{ " \t\t abcd", "abcd" },
|
|
{ "abcd " , "abcd " }, // we allow one trailing whitespace char
|
|
{ "abcd " , "abcd " }, // because it makes no difference and
|
|
{ "abcd\t " , "abcd " }, // simplifies the implementation
|
|
{ "\t\t \t ab \t\t \t cd \t\t \t ", "ab cd " },
|
|
};
|
|
|
|
for (unsigned i = 0; i < SK_ARRAY_COUNT(tests); ++i) {
|
|
test_whitespace_pos(reporter, tests[i].tst_in, tests[i].tst_out);
|
|
}
|
|
}
|
|
|
|
void SetImageShader(SkPaint* paint, int imageWidth, int imageHeight, SkTileMode xTile,
|
|
SkTileMode yTile) {
|
|
auto surface = SkSurface::MakeRasterN32Premul(imageWidth, imageHeight);
|
|
paint->setShader(surface->makeImageSnapshot()->makeShader(xTile, yTile, nullptr));
|
|
}
|
|
|
|
// Attempt to find the three nodes on which we have expectations:
|
|
// the pattern node, the image within that pattern, and the rect which
|
|
// uses the pattern as a fill.
|
|
// returns false if not all nodes are found.
|
|
bool FindImageShaderNodes(skiatest::Reporter* reporter, const SkDOM* dom, const SkDOM::Node* root,
|
|
const SkDOM::Node** patternOut, const SkDOM::Node** imageOut,
|
|
const SkDOM::Node** rectOut) {
|
|
if (root == nullptr || dom == nullptr) {
|
|
ERRORF(reporter, "root element not found");
|
|
return false;
|
|
}
|
|
|
|
|
|
const SkDOM::Node* rect = dom->getFirstChild(root, "rect");
|
|
if (rect == nullptr) {
|
|
ERRORF(reporter, "rect not found");
|
|
return false;
|
|
}
|
|
*rectOut = rect;
|
|
|
|
const SkDOM::Node* defs = dom->getFirstChild(root, "defs");
|
|
if (defs == nullptr) {
|
|
ERRORF(reporter, "defs not found");
|
|
return false;
|
|
}
|
|
|
|
const SkDOM::Node* pattern = dom->getFirstChild(defs, "pattern");
|
|
if (pattern == nullptr) {
|
|
ERRORF(reporter, "pattern not found");
|
|
return false;
|
|
}
|
|
*patternOut = pattern;
|
|
|
|
const SkDOM::Node* image = dom->getFirstChild(pattern, "image");
|
|
if (image == nullptr) {
|
|
ERRORF(reporter, "image not found");
|
|
return false;
|
|
}
|
|
*imageOut = image;
|
|
|
|
return true;
|
|
}
|
|
|
|
void ImageShaderTestSetup(SkDOM* dom, SkPaint* paint, int imageWidth, int imageHeight,
|
|
int rectWidth, int rectHeight, SkTileMode xTile, SkTileMode yTile) {
|
|
SetImageShader(paint, imageWidth, imageHeight, xTile, yTile);
|
|
auto svgCanvas = MakeDOMCanvas(dom);
|
|
|
|
SkRect bounds{0, 0, SkIntToScalar(rectWidth), SkIntToScalar(rectHeight)};
|
|
svgCanvas->drawRect(bounds, *paint);
|
|
}
|
|
|
|
|
|
DEF_TEST(SVGDevice_image_shader_norepeat, reporter) {
|
|
SkDOM dom;
|
|
SkPaint paint;
|
|
int imageWidth = 3, imageHeight = 3;
|
|
int rectWidth = 10, rectHeight = 10;
|
|
ImageShaderTestSetup(&dom, &paint, imageWidth, imageHeight, rectWidth, rectHeight,
|
|
SkTileMode::kClamp, SkTileMode::kClamp);
|
|
|
|
const SkDOM::Node* root = dom.finishParsing();
|
|
|
|
const SkDOM::Node *patternNode, *imageNode, *rectNode;
|
|
bool structureAppropriate =
|
|
FindImageShaderNodes(reporter, &dom, root, &patternNode, &imageNode, &rectNode);
|
|
REPORTER_ASSERT(reporter, structureAppropriate);
|
|
|
|
// the image should always maintain its size.
|
|
REPORTER_ASSERT(reporter, atoi(dom.findAttr(imageNode, "width")) == imageWidth);
|
|
REPORTER_ASSERT(reporter, atoi(dom.findAttr(imageNode, "height")) == imageHeight);
|
|
|
|
// making the pattern as large as the container prevents
|
|
// it from repeating.
|
|
REPORTER_ASSERT(reporter, strcmp(dom.findAttr(patternNode, "width"), "100%") == 0);
|
|
REPORTER_ASSERT(reporter, strcmp(dom.findAttr(patternNode, "height"), "100%") == 0);
|
|
}
|
|
|
|
DEF_TEST(SVGDevice_image_shader_tilex, reporter) {
|
|
SkDOM dom;
|
|
SkPaint paint;
|
|
int imageWidth = 3, imageHeight = 3;
|
|
int rectWidth = 10, rectHeight = 10;
|
|
ImageShaderTestSetup(&dom, &paint, imageWidth, imageHeight, rectWidth, rectHeight,
|
|
SkTileMode::kRepeat, SkTileMode::kClamp);
|
|
|
|
const SkDOM::Node* root = dom.finishParsing();
|
|
const SkDOM::Node* innerSvg = dom.getFirstChild(root, "svg");
|
|
if (innerSvg == nullptr) {
|
|
ERRORF(reporter, "inner svg element not found");
|
|
return;
|
|
}
|
|
|
|
const SkDOM::Node *patternNode, *imageNode, *rectNode;
|
|
bool structureAppropriate =
|
|
FindImageShaderNodes(reporter, &dom, innerSvg, &patternNode, &imageNode, &rectNode);
|
|
REPORTER_ASSERT(reporter, structureAppropriate);
|
|
|
|
// the imageNode should always maintain its size.
|
|
REPORTER_ASSERT(reporter, atoi(dom.findAttr(imageNode, "width")) == imageWidth);
|
|
REPORTER_ASSERT(reporter, atoi(dom.findAttr(imageNode, "height")) == imageHeight);
|
|
|
|
// if the patternNode width matches the imageNode width,
|
|
// it will repeat in along the x axis.
|
|
REPORTER_ASSERT(reporter, atoi(dom.findAttr(patternNode, "width")) == imageWidth);
|
|
REPORTER_ASSERT(reporter, strcmp(dom.findAttr(patternNode, "height"), "100%") == 0);
|
|
}
|
|
|
|
DEF_TEST(SVGDevice_image_shader_tiley, reporter) {
|
|
SkDOM dom;
|
|
SkPaint paint;
|
|
int imageNodeWidth = 3, imageNodeHeight = 3;
|
|
int rectNodeWidth = 10, rectNodeHeight = 10;
|
|
ImageShaderTestSetup(&dom, &paint, imageNodeWidth, imageNodeHeight, rectNodeWidth,
|
|
rectNodeHeight, SkTileMode::kClamp, SkTileMode::kRepeat);
|
|
|
|
const SkDOM::Node* root = dom.finishParsing();
|
|
const SkDOM::Node* innerSvg = dom.getFirstChild(root, "svg");
|
|
if (innerSvg == nullptr) {
|
|
ERRORF(reporter, "inner svg element not found");
|
|
return;
|
|
}
|
|
|
|
const SkDOM::Node *patternNode, *imageNode, *rectNode;
|
|
bool structureAppropriate =
|
|
FindImageShaderNodes(reporter, &dom, innerSvg, &patternNode, &imageNode, &rectNode);
|
|
REPORTER_ASSERT(reporter, structureAppropriate);
|
|
|
|
// the imageNode should always maintain its size.
|
|
REPORTER_ASSERT(reporter, atoi(dom.findAttr(imageNode, "width")) == imageNodeWidth);
|
|
REPORTER_ASSERT(reporter, atoi(dom.findAttr(imageNode, "height")) == imageNodeHeight);
|
|
|
|
// making the patternNode as large as the container prevents
|
|
// it from repeating.
|
|
REPORTER_ASSERT(reporter, strcmp(dom.findAttr(patternNode, "width"), "100%") == 0);
|
|
REPORTER_ASSERT(reporter, atoi(dom.findAttr(patternNode, "height")) == imageNodeHeight);
|
|
}
|
|
|
|
DEF_TEST(SVGDevice_image_shader_tileboth, reporter) {
|
|
SkDOM dom;
|
|
SkPaint paint;
|
|
int imageWidth = 3, imageHeight = 3;
|
|
int rectWidth = 10, rectHeight = 10;
|
|
ImageShaderTestSetup(&dom, &paint, imageWidth, imageHeight, rectWidth, rectHeight,
|
|
SkTileMode::kRepeat, SkTileMode::kRepeat);
|
|
|
|
const SkDOM::Node* root = dom.finishParsing();
|
|
|
|
const SkDOM::Node *patternNode, *imageNode, *rectNode;
|
|
const SkDOM::Node* innerSvg = dom.getFirstChild(root, "svg");
|
|
if (innerSvg == nullptr) {
|
|
ERRORF(reporter, "inner svg element not found");
|
|
return;
|
|
}
|
|
bool structureAppropriate =
|
|
FindImageShaderNodes(reporter, &dom, innerSvg, &patternNode, &imageNode, &rectNode);
|
|
REPORTER_ASSERT(reporter, structureAppropriate);
|
|
|
|
// the imageNode should always maintain its size.
|
|
REPORTER_ASSERT(reporter, atoi(dom.findAttr(imageNode, "width")) == imageWidth);
|
|
REPORTER_ASSERT(reporter, atoi(dom.findAttr(imageNode, "height")) == imageHeight);
|
|
|
|
REPORTER_ASSERT(reporter, atoi(dom.findAttr(patternNode, "width")) == imageWidth);
|
|
REPORTER_ASSERT(reporter, atoi(dom.findAttr(patternNode, "height")) == imageHeight);
|
|
}
|
|
|
|
DEF_TEST(SVGDevice_ColorFilters, reporter) {
|
|
SkDOM dom;
|
|
SkPaint paint;
|
|
paint.setColorFilter(SkColorFilters::Blend(SK_ColorRED, SkBlendMode::kSrcIn));
|
|
{
|
|
auto svgCanvas = MakeDOMCanvas(&dom);
|
|
SkRect bounds{0, 0, SkIntToScalar(100), SkIntToScalar(100)};
|
|
svgCanvas->drawRect(bounds, paint);
|
|
}
|
|
const SkDOM::Node* rootElement = dom.finishParsing();
|
|
ABORT_TEST(reporter, !rootElement, "root element not found");
|
|
|
|
const SkDOM::Node* filterElement = dom.getFirstChild(rootElement, "filter");
|
|
ABORT_TEST(reporter, !filterElement, "filter element not found");
|
|
|
|
const SkDOM::Node* floodElement = dom.getFirstChild(filterElement, "feFlood");
|
|
ABORT_TEST(reporter, !floodElement, "feFlood element not found");
|
|
|
|
const SkDOM::Node* compositeElement = dom.getFirstChild(filterElement, "feComposite");
|
|
ABORT_TEST(reporter, !compositeElement, "feComposite element not found");
|
|
|
|
REPORTER_ASSERT(reporter, strcmp(dom.findAttr(filterElement, "width"), "100%") == 0);
|
|
REPORTER_ASSERT(reporter, strcmp(dom.findAttr(filterElement, "height"), "100%") == 0);
|
|
|
|
REPORTER_ASSERT(reporter,
|
|
strcmp(dom.findAttr(floodElement, "flood-color"), "rgb(255,0,0)") == 0);
|
|
REPORTER_ASSERT(reporter, atoi(dom.findAttr(floodElement, "flood-opacity")) == 1);
|
|
|
|
REPORTER_ASSERT(reporter, strcmp(dom.findAttr(compositeElement, "in"), "flood") == 0);
|
|
REPORTER_ASSERT(reporter, strcmp(dom.findAttr(compositeElement, "operator"), "in") == 0);
|
|
}
|
|
|
|
DEF_TEST(SVGDevice_textpath, reporter) {
|
|
SkDOM dom;
|
|
SkFont font(ToolUtils::create_portable_typeface());
|
|
SkPaint paint;
|
|
|
|
// By default, we emit <text> nodes.
|
|
{
|
|
auto svgCanvas = MakeDOMCanvas(&dom);
|
|
svgCanvas->drawString("foo", 100, 100, font, paint);
|
|
}
|
|
const auto* rootElement = dom.finishParsing();
|
|
REPORTER_ASSERT(reporter, rootElement, "root element not found");
|
|
const auto* textElement = dom.getFirstChild(rootElement, "text");
|
|
REPORTER_ASSERT(reporter, textElement, "text element not found");
|
|
const auto* pathElement = dom.getFirstChild(rootElement, "path");
|
|
REPORTER_ASSERT(reporter, !pathElement, "path element found");
|
|
|
|
// With kConvertTextToPaths_Flag, we emit <path> nodes.
|
|
{
|
|
auto svgCanvas = MakeDOMCanvas(&dom, SkSVGCanvas::kConvertTextToPaths_Flag);
|
|
svgCanvas->drawString("foo", 100, 100, font, paint);
|
|
}
|
|
rootElement = dom.finishParsing();
|
|
REPORTER_ASSERT(reporter, rootElement, "root element not found");
|
|
textElement = dom.getFirstChild(rootElement, "text");
|
|
REPORTER_ASSERT(reporter, !textElement, "text element found");
|
|
pathElement = dom.getFirstChild(rootElement, "path");
|
|
REPORTER_ASSERT(reporter, pathElement, "path element not found");
|
|
}
|
|
|
|
#endif
|