dec78021f5
This reverts commite2f6245352. Reason for revert: relanding with fixes Original change's description: > Revert "[svg] Absolute positioning support for text" > > This reverts commitfebb1b87a5. > > Reason for revert: breaking the android roll > > Original change's description: > > [svg] Absolute positioning support for text > > > > Implement per-character position attribute lookup based on [1]: > > > > - convert "x" and "y" attributes to arrays > > - introduce ScopedPosResolver to handle positioning attribute lookup > > and fallback > > - push a new resolver every time we enter a text positioning element > > scope (<text>, <tspan>, etc). > > - flush/reposition a new text chunk every time we encounter explicit > > absolute positions > > > > The position attribute fallback logic is complex enough to warrant a > > unit test. > > > > [1] https://www.w3.org/TR/SVG11/text.html#TSpanElementXAttribute > > > > Bug: skia:10840 > > Change-Id: I66c478fea4a179fdb8b1a6a9ff00c4dd9509f8d2 > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/345161 > > Commit-Queue: Florin Malita <fmalita@chromium.org> > > Commit-Queue: Florin Malita <fmalita@google.com> > > Reviewed-by: Tyler Denniston <tdenniston@google.com> > > TBR=fmalita@chromium.org,fmalita@google.com,tdenniston@google.com > > Change-Id: I80e3396d555369fe835ee73102135061f63e8bf0 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: skia:10840 > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/345417 > Reviewed-by: Derek Sollenberger <djsollen@google.com> > Commit-Queue: Derek Sollenberger <djsollen@google.com> TBR=djsollen@google.com,fmalita@chromium.org,fmalita@google.com,tdenniston@google.com # Not skipping CQ checks because this is a reland. Bug: skia:10840 Change-Id: I4c6f6a9f19c0f7598bdcf34e915f43c139b995a9 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/345420 Reviewed-by: Florin Malita <fmalita@google.com> Commit-Queue: Florin Malita <fmalita@google.com>
83 lines
2.3 KiB
Plaintext
83 lines
2.3 KiB
Plaintext
# Copyright 2020 Google Inc.
|
|
#
|
|
# Use of this source code is governed by a BSD-style license that can be
|
|
# found in the LICENSE file.
|
|
|
|
# Things are easiest for everyone if these source paths are absolute.
|
|
_src = get_path_info("src", "abspath")
|
|
_include = get_path_info("include", "abspath")
|
|
|
|
skia_svg_public = [
|
|
"$_include/SkSVGAttribute.h",
|
|
"$_include/SkSVGAttributeParser.h",
|
|
"$_include/SkSVGCircle.h",
|
|
"$_include/SkSVGClipPath.h",
|
|
"$_include/SkSVGContainer.h",
|
|
"$_include/SkSVGDefs.h",
|
|
"$_include/SkSVGDOM.h",
|
|
"$_include/SkSVGEllipse.h",
|
|
"$_include/SkSVGFe.h",
|
|
"$_include/SkSVGFeColorMatrix.h",
|
|
"$_include/SkSVGFeComposite.h",
|
|
"$_include/SkSVGFeFlood.h",
|
|
"$_include/SkSVGFeTurbulence.h",
|
|
"$_include/SkSVGFilter.h",
|
|
"$_include/SkSVGFilterContext.h",
|
|
"$_include/SkSVGG.h",
|
|
"$_include/SkSVGGradient.h",
|
|
"$_include/SkSVGHiddenContainer.h",
|
|
"$_include/SkSVGIDMapper.h",
|
|
"$_include/SkSVGLinearGradient.h",
|
|
"$_include/SkSVGLine.h",
|
|
"$_include/SkSVGNode.h",
|
|
"$_include/SkSVGPath.h",
|
|
"$_include/SkSVGPattern.h",
|
|
"$_include/SkSVGPoly.h",
|
|
"$_include/SkSVGRadialGradient.h",
|
|
"$_include/SkSVGRect.h",
|
|
"$_include/SkSVGRenderContext.h",
|
|
"$_include/SkSVGShape.h",
|
|
"$_include/SkSVGStop.h",
|
|
"$_include/SkSVGSVG.h",
|
|
"$_include/SkSVGText.h",
|
|
"$_include/SkSVGTransformableNode.h",
|
|
"$_include/SkSVGTypes.h",
|
|
"$_include/SkSVGUse.h",
|
|
"$_include/SkSVGValue.h",
|
|
]
|
|
|
|
skia_svg_sources = [
|
|
"$_src/SkSVGAttribute.cpp",
|
|
"$_src/SkSVGAttributeParser.cpp",
|
|
"$_src/SkSVGCircle.cpp",
|
|
"$_src/SkSVGClipPath.cpp",
|
|
"$_src/SkSVGContainer.cpp",
|
|
"$_src/SkSVGDOM.cpp",
|
|
"$_src/SkSVGEllipse.cpp",
|
|
"$_src/SkSVGFe.cpp",
|
|
"$_src/SkSVGFeColorMatrix.cpp",
|
|
"$_src/SkSVGFeComposite.cpp",
|
|
"$_src/SkSVGFeFlood.cpp",
|
|
"$_src/SkSVGFeTurbulence.cpp",
|
|
"$_src/SkSVGFilter.cpp",
|
|
"$_src/SkSVGFilterContext.cpp",
|
|
"$_src/SkSVGGradient.cpp",
|
|
"$_src/SkSVGLine.cpp",
|
|
"$_src/SkSVGLinearGradient.cpp",
|
|
"$_src/SkSVGNode.cpp",
|
|
"$_src/SkSVGPath.cpp",
|
|
"$_src/SkSVGPattern.cpp",
|
|
"$_src/SkSVGPoly.cpp",
|
|
"$_src/SkSVGRadialGradient.cpp",
|
|
"$_src/SkSVGRect.cpp",
|
|
"$_src/SkSVGRenderContext.cpp",
|
|
"$_src/SkSVGSVG.cpp",
|
|
"$_src/SkSVGShape.cpp",
|
|
"$_src/SkSVGStop.cpp",
|
|
"$_src/SkSVGText.cpp",
|
|
"$_src/SkSVGTextPriv.h",
|
|
"$_src/SkSVGTransformableNode.cpp",
|
|
"$_src/SkSVGUse.cpp",
|
|
"$_src/SkSVGValue.cpp",
|
|
]
|