2d059fcc22
Implement support for text 'rotate' attribute: https://www.w3.org/TR/SVG11/text.html#TSpanElementRotateAttribute. Unlike other character-positioning attributes (x/y/dx/dy), rotate - is not cumulative - only applies to its respective node scope (does not affect other fragments in the current chunk) - has different padding semantics: if there are fewer rotate values than characters, the remaining characters use the last specified value from the closest ancestor To the last point, we now have to discriminate three states: - unspecified (default -> 0) - explicit value for the given character index - implicit value (last value in the closest ancestor) Local implicit values override implicit ancestor values -- but not explicit ancestor values. High level changes: - plumb 'rotate' attribute - expand per-character position info (ShapeBuffer) to include rotation - expand per-glyph position info (RunRec) to include rotation - expand PosAttrs to include rotation and add specific inheritance rules (see above) - pass computed rotation values to RSX blob buffers Bug: skia:10840 Change-Id: Ia19ec5e8bb6fea06d49a9bd72ace575c2ffd100e Reviewed-on: https://skia-review.googlesource.com/c/skia/+/348877 Commit-Queue: Florin Malita <fmalita@google.com> Reviewed-by: Tyler Denniston <tdenniston@google.com>
134 lines
4.0 KiB
C++
134 lines
4.0 KiB
C++
/*
|
|
* Copyright 2016 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#ifndef SkSVGAttributeParser_DEFINED
|
|
#define SkSVGAttributeParser_DEFINED
|
|
|
|
#include <vector>
|
|
|
|
#include "include/private/SkNoncopyable.h"
|
|
#include "modules/svg/include/SkSVGTypes.h"
|
|
#include "src/core/SkTLazy.h"
|
|
|
|
class SkSVGAttributeParser : public SkNoncopyable {
|
|
public:
|
|
SkSVGAttributeParser(const char[]);
|
|
|
|
bool parseInteger(SkSVGIntegerType*);
|
|
bool parseViewBox(SkSVGViewBoxType*);
|
|
bool parsePoints(SkSVGPointsType*);
|
|
bool parsePreserveAspectRatio(SkSVGPreserveAspectRatio*);
|
|
|
|
// TODO: Migrate all parse*() functions to this style (and delete the old version)
|
|
// so they can be used by parse<T>():
|
|
bool parse(SkSVGIntegerType* v) { return parseInteger(v); }
|
|
|
|
template <typename T> using ParseResult = SkTLazy<T>;
|
|
|
|
template <typename T> static ParseResult<T> parse(const char* value) {
|
|
ParseResult<T> result;
|
|
T parsedValue;
|
|
if (SkSVGAttributeParser(value).parse(&parsedValue)) {
|
|
result.set(std::move(parsedValue));
|
|
}
|
|
return result;
|
|
}
|
|
|
|
template <typename T>
|
|
static ParseResult<T> parse(const char* expectedName,
|
|
const char* name,
|
|
const char* value) {
|
|
if (!strcmp(name, expectedName)) {
|
|
return parse<T>(value);
|
|
}
|
|
|
|
return ParseResult<T>();
|
|
}
|
|
|
|
template <typename PropertyT>
|
|
static ParseResult<PropertyT> parseProperty(const char* expectedName,
|
|
const char* name,
|
|
const char* value) {
|
|
if (strcmp(name, expectedName) != 0) {
|
|
return ParseResult<PropertyT>();
|
|
}
|
|
|
|
if (!strcmp(value, "inherit")) {
|
|
PropertyT result(SkSVGPropertyState::kInherit);
|
|
return ParseResult<PropertyT>(&result);
|
|
}
|
|
|
|
auto pr = parse<typename PropertyT::ValueT>(value);
|
|
if (pr.isValid()) {
|
|
PropertyT result(*pr);
|
|
return ParseResult<PropertyT>(&result);
|
|
}
|
|
|
|
return ParseResult<PropertyT>();
|
|
}
|
|
|
|
private:
|
|
// Stack-only
|
|
void* operator new(size_t) = delete;
|
|
void* operator new(size_t, void*) = delete;
|
|
|
|
template <typename T>
|
|
bool parse(T*);
|
|
|
|
template <typename F>
|
|
bool advanceWhile(F func);
|
|
|
|
bool parseWSToken();
|
|
bool parseEOSToken();
|
|
bool parseSepToken();
|
|
bool parseCommaWspToken();
|
|
bool parseExpectedStringToken(const char*);
|
|
bool parseScalarToken(SkScalar*);
|
|
bool parseInt32Token(int32_t*);
|
|
bool parseHexToken(uint32_t*);
|
|
bool parseLengthUnitToken(SkSVGLength::Unit*);
|
|
bool parseNamedColorToken(SkColor*);
|
|
bool parseHexColorToken(SkColor*);
|
|
bool parseColorComponentToken(int32_t*);
|
|
bool parseRGBColorToken(SkColor*);
|
|
bool parseFuncIRI(SkSVGStringType*);
|
|
|
|
// Transform helpers
|
|
bool parseMatrixToken(SkMatrix*);
|
|
bool parseTranslateToken(SkMatrix*);
|
|
bool parseScaleToken(SkMatrix*);
|
|
bool parseRotateToken(SkMatrix*);
|
|
bool parseSkewXToken(SkMatrix*);
|
|
bool parseSkewYToken(SkMatrix*);
|
|
|
|
// Parses a sequence of 'WS* <prefix> WS* (<nested>)', where the nested sequence
|
|
// is handled by the passed functor.
|
|
template <typename Func, typename T>
|
|
bool parseParenthesized(const char* prefix, Func, T* result);
|
|
|
|
template <typename T>
|
|
bool parseList(std::vector<T>*);
|
|
|
|
template <typename T, typename TArray>
|
|
bool parseEnumMap(const TArray& arr, T* result) {
|
|
for (size_t i = 0; i < SK_ARRAY_COUNT(arr); ++i) {
|
|
if (this->parseExpectedStringToken(std::get<0>(arr[i]))) {
|
|
*result = std::get<1>(arr[i]);
|
|
return true;
|
|
}
|
|
}
|
|
return false;
|
|
}
|
|
|
|
// The current position in the input string.
|
|
const char* fCurPos;
|
|
|
|
using INHERITED = SkNoncopyable;
|
|
};
|
|
|
|
#endif // SkSVGAttributeParser_DEFINED
|