AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
32b3089618
skia2/modules/svg/include/SkSVGAttribute.h

116 lines
3.4 KiB
C
Raw Normal View History

Reland "[svg] Relocate out of experimental" Move the SVG rendering code to modules/svg, and componentize. Also split into include/src/utils. As external clients still reference the old header locations, introduce temporary forwarding headers to facilitate the migration. This reverts commit d6cf56fd3400f16aed443807390340c8efdcce1c. TBR= Change-Id: Ibadd7c8dc0464ec0c27841530ade0c2098305d20 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/327344 Commit-Queue: Florin Malita <fmalita@google.com> Reviewed-by: Florin Malita <fmalita@google.com>
2020-10-15 22:10:29 +00:00
/*
* 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 SkSVGAttribute_DEFINED
#define SkSVGAttribute_DEFINED
#include "modules/svg/include/SkSVGTypes.h"
#include "src/core/SkTLazy.h"
class SkSVGRenderContext;
enum class SkSVGAttribute {
kClipRule,
kColor,
[svg] Add support for mask color-interpolation https://www.w3.org/TR/SVG11/painting.html#ColorInterpolationProperty Bug: skia:10842 Change-Id: I3e97577ee257c9afe64d924c768c85badbfab07d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/354220 Commit-Queue: Florin Malita <fmalita@google.com> Reviewed-by: Tyler Denniston <tdenniston@google.com>
2021-01-15 13:58:09 +00:00
kColorInterpolation,
[svg] Add plumbing for color-interpolation-filters property The default colorspace for filter effects is linear RGB, as specified in https://www.w3.org/TR/SVG11/painting.html#ColorInterpolationProperties. Currently we perform all filtering in the destination colorspace. This CL adds the new presentation attribute with the default setting (according to the spec) of linear RGB. This CL does not actually implement any colorspace transformations for filters. Bug: skia:10841 Change-Id: Id778ad3fa5cb6e0aed756584a50880edd9d82e2b Reviewed-on: https://skia-review.googlesource.com/c/skia/+/352738 Commit-Queue: Tyler Denniston <tdenniston@google.com> Reviewed-by: Florin Malita <fmalita@chromium.org>
2021-01-13 17:08:04 +00:00
kColorInterpolationFilters,
Reland "[svg] Relocate out of experimental" Move the SVG rendering code to modules/svg, and componentize. Also split into include/src/utils. As external clients still reference the old header locations, introduce temporary forwarding headers to facilitate the migration. This reverts commit d6cf56fd3400f16aed443807390340c8efdcce1c. TBR= Change-Id: Ibadd7c8dc0464ec0c27841530ade0c2098305d20 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/327344 Commit-Queue: Florin Malita <fmalita@google.com> Reviewed-by: Florin Malita <fmalita@google.com>
2020-10-15 22:10:29 +00:00
kCx, // <circle>, <ellipse>, <radialGradient>: center x position
kCy, // <circle>, <ellipse>, <radialGradient>: center y position
kD,
kFill,
kFillOpacity,
kFillRule,
[svg] Add 'filter' presentation attribute and parsing Not yet used by anything. Bug: skia:10841 Change-Id: I6ed0a434cf670d73f06eaf0bbfe70d727ffe4950 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/330617 Commit-Queue: Tyler Denniston <tdenniston@google.com> Reviewed-by: Florin Malita <fmalita@chromium.org>
2020-10-30 19:00:48 +00:00
kFilter,
[svg] Add several skeleton classes for filters Added: - SkSVGFilter: This corresponds to a <filter> element. Also added some of the attributes of this element. - SkSVGFe: This will be the base class of all <fe*> elements. - SkSVGFilterContext: This will hold the contextual mapping of string id -> image filter result, for constructing pipelines. Bug: skia:10841 Change-Id: I15a29d39411a6255ab4e11f022baa10554b2bce6 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/330618 Commit-Queue: Tyler Denniston <tdenniston@google.com> Reviewed-by: Florin Malita <fmalita@chromium.org>
2020-10-30 20:01:54 +00:00
kFilterUnits,
Reland "[svg] Relocate out of experimental" Move the SVG rendering code to modules/svg, and componentize. Also split into include/src/utils. As external clients still reference the old header locations, introduce temporary forwarding headers to facilitate the migration. This reverts commit d6cf56fd3400f16aed443807390340c8efdcce1c. TBR= Change-Id: Ibadd7c8dc0464ec0c27841530ade0c2098305d20 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/327344 Commit-Queue: Florin Malita <fmalita@google.com> Reviewed-by: Florin Malita <fmalita@google.com>
2020-10-15 22:10:29 +00:00
kFontFamily,
kFontSize,
kFontStyle,
kFontWeight,
kFx, // <radialGradient>: focal point x position
kFy, // <radialGradient>: focal point y position
[svg] Add gradientUnits attribute, value, and parsing Specifying gradientUnits will allow gradient coordinates to be specified relative to object bounding boxes, as seen in test 'coords-units-01-b'. Not yet used with this CL. Bug: skia:10842 Change-Id: I6038cf3995a94c7e3a7ac73ad8305872353a403c Reviewed-on: https://skia-review.googlesource.com/c/skia/+/328977 Reviewed-by: Florin Malita <fmalita@chromium.org> Auto-Submit: Tyler Denniston <tdenniston@google.com> Commit-Queue: Tyler Denniston <tdenniston@google.com>
2020-10-21 19:08:45 +00:00
kGradientUnits,
Reland "[svg] Relocate out of experimental" Move the SVG rendering code to modules/svg, and componentize. Also split into include/src/utils. As external clients still reference the old header locations, introduce temporary forwarding headers to facilitate the migration. This reverts commit d6cf56fd3400f16aed443807390340c8efdcce1c. TBR= Change-Id: Ibadd7c8dc0464ec0c27841530ade0c2098305d20 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/327344 Commit-Queue: Florin Malita <fmalita@google.com> Reviewed-by: Florin Malita <fmalita@google.com>
2020-10-15 22:10:29 +00:00
kGradientTransform,
kHeight,
kHref,
kOffset,
kOpacity,
kPatternTransform,
kPoints,
[svg] Add support for preserveAspectRatio This fixes the aspect ratio for pretty much all tests. Since we're going to rebaseline everything, also have dm use a white background (to match other user agents). Bug: skia:10842 Change-Id: Iab2afd61560af540539c216d1c3673f19fe0fe51 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/328982 Commit-Queue: Florin Malita <fmalita@chromium.org> Commit-Queue: Florin Malita <fmalita@google.com> Reviewed-by: Tyler Denniston <tdenniston@google.com>
2020-10-21 20:55:46 +00:00
kPreserveAspectRatio,
Reland "[svg] Relocate out of experimental" Move the SVG rendering code to modules/svg, and componentize. Also split into include/src/utils. As external clients still reference the old header locations, introduce temporary forwarding headers to facilitate the migration. This reverts commit d6cf56fd3400f16aed443807390340c8efdcce1c. TBR= Change-Id: Ibadd7c8dc0464ec0c27841530ade0c2098305d20 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/327344 Commit-Queue: Florin Malita <fmalita@google.com> Reviewed-by: Florin Malita <fmalita@google.com>
2020-10-15 22:10:29 +00:00
kR, // <circle>, <radialGradient>: radius
kRx, // <ellipse>,<rect>: horizontal (corner) radius
kRy, // <ellipse>,<rect>: vertical (corner) radius
kSpreadMethod,
kStroke,
kStrokeDashArray,
kStrokeDashOffset,
kStrokeOpacity,
kStrokeLineCap,
kStrokeLineJoin,
kStrokeMiterLimit,
kStrokeWidth,
kTransform,
kText,
kTextAnchor,
kViewBox,
kVisibility,
kWidth,
kX,
kX1, // <line>: first endpoint x
kX2, // <line>: second endpoint x
kY,
kY1, // <line>: first endpoint y
kY2, // <line>: second endpoint y
kUnknown,
};
struct SkSVGPresentationAttributes {
static SkSVGPresentationAttributes MakeInitial();
[svg] Add SkSVGProperty class for presentation attributes This CL adds a new SkSVGProperty<T,B> class and uses it instead of SkTLazy for the presentation attributes. Ideally this will form the foundation for improvements to our presentation attribute parsing as well as correctness for inherited/non-inherited properties. Change-Id: Ie1cdb3db9674c55376e127cc1a8b8cb303a1bd13 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/334837 Commit-Queue: Tyler Denniston <tdenniston@google.com> Reviewed-by: Florin Malita <fmalita@chromium.org>
2020-11-17 17:26:25 +00:00
// TODO: SkSVGProperty adds an extra ptr per attribute; refactor to reduce overhead.
Reland "[svg] Relocate out of experimental" Move the SVG rendering code to modules/svg, and componentize. Also split into include/src/utils. As external clients still reference the old header locations, introduce temporary forwarding headers to facilitate the migration. This reverts commit d6cf56fd3400f16aed443807390340c8efdcce1c. TBR= Change-Id: Ibadd7c8dc0464ec0c27841530ade0c2098305d20 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/327344 Commit-Queue: Florin Malita <fmalita@google.com> Reviewed-by: Florin Malita <fmalita@google.com>
2020-10-15 22:10:29 +00:00
[svg] Add SkSVGProperty class for presentation attributes This CL adds a new SkSVGProperty<T,B> class and uses it instead of SkTLazy for the presentation attributes. Ideally this will form the foundation for improvements to our presentation attribute parsing as well as correctness for inherited/non-inherited properties. Change-Id: Ie1cdb3db9674c55376e127cc1a8b8cb303a1bd13 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/334837 Commit-Queue: Tyler Denniston <tdenniston@google.com> Reviewed-by: Florin Malita <fmalita@chromium.org>
2020-11-17 17:26:25 +00:00
SkSVGProperty<SkSVGPaint , true> fFill;
SkSVGProperty<SkSVGNumberType, true> fFillOpacity;
SkSVGProperty<SkSVGFillRule , true> fFillRule;
SkSVGProperty<SkSVGFillRule , true> fClipRule;
Reland "[svg] Relocate out of experimental" Move the SVG rendering code to modules/svg, and componentize. Also split into include/src/utils. As external clients still reference the old header locations, introduce temporary forwarding headers to facilitate the migration. This reverts commit d6cf56fd3400f16aed443807390340c8efdcce1c. TBR= Change-Id: Ibadd7c8dc0464ec0c27841530ade0c2098305d20 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/327344 Commit-Queue: Florin Malita <fmalita@google.com> Reviewed-by: Florin Malita <fmalita@google.com>
2020-10-15 22:10:29 +00:00
[svg] Add SkSVGProperty class for presentation attributes This CL adds a new SkSVGProperty<T,B> class and uses it instead of SkTLazy for the presentation attributes. Ideally this will form the foundation for improvements to our presentation attribute parsing as well as correctness for inherited/non-inherited properties. Change-Id: Ie1cdb3db9674c55376e127cc1a8b8cb303a1bd13 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/334837 Commit-Queue: Tyler Denniston <tdenniston@google.com> Reviewed-by: Florin Malita <fmalita@chromium.org>
2020-11-17 17:26:25 +00:00
SkSVGProperty<SkSVGPaint , true> fStroke;
SkSVGProperty<SkSVGDashArray , true> fStrokeDashArray;
SkSVGProperty<SkSVGLength , true> fStrokeDashOffset;
SkSVGProperty<SkSVGLineCap , true> fStrokeLineCap;
SkSVGProperty<SkSVGLineJoin , true> fStrokeLineJoin;
SkSVGProperty<SkSVGNumberType, true> fStrokeMiterLimit;
SkSVGProperty<SkSVGNumberType, true> fStrokeOpacity;
SkSVGProperty<SkSVGLength , true> fStrokeWidth;
Reland "[svg] Relocate out of experimental" Move the SVG rendering code to modules/svg, and componentize. Also split into include/src/utils. As external clients still reference the old header locations, introduce temporary forwarding headers to facilitate the migration. This reverts commit d6cf56fd3400f16aed443807390340c8efdcce1c. TBR= Change-Id: Ibadd7c8dc0464ec0c27841530ade0c2098305d20 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/327344 Commit-Queue: Florin Malita <fmalita@google.com> Reviewed-by: Florin Malita <fmalita@google.com>
2020-10-15 22:10:29 +00:00
[svg] Add SkSVGProperty class for presentation attributes This CL adds a new SkSVGProperty<T,B> class and uses it instead of SkTLazy for the presentation attributes. Ideally this will form the foundation for improvements to our presentation attribute parsing as well as correctness for inherited/non-inherited properties. Change-Id: Ie1cdb3db9674c55376e127cc1a8b8cb303a1bd13 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/334837 Commit-Queue: Tyler Denniston <tdenniston@google.com> Reviewed-by: Florin Malita <fmalita@chromium.org>
2020-11-17 17:26:25 +00:00
SkSVGProperty<SkSVGVisibility, true> fVisibility;
Reland "[svg] Relocate out of experimental" Move the SVG rendering code to modules/svg, and componentize. Also split into include/src/utils. As external clients still reference the old header locations, introduce temporary forwarding headers to facilitate the migration. This reverts commit d6cf56fd3400f16aed443807390340c8efdcce1c. TBR= Change-Id: Ibadd7c8dc0464ec0c27841530ade0c2098305d20 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/327344 Commit-Queue: Florin Malita <fmalita@google.com> Reviewed-by: Florin Malita <fmalita@google.com>
2020-10-15 22:10:29 +00:00
[svg] Add SkSVGProperty class for presentation attributes This CL adds a new SkSVGProperty<T,B> class and uses it instead of SkTLazy for the presentation attributes. Ideally this will form the foundation for improvements to our presentation attribute parsing as well as correctness for inherited/non-inherited properties. Change-Id: Ie1cdb3db9674c55376e127cc1a8b8cb303a1bd13 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/334837 Commit-Queue: Tyler Denniston <tdenniston@google.com> Reviewed-by: Florin Malita <fmalita@chromium.org>
2020-11-17 17:26:25 +00:00
SkSVGProperty<SkSVGColorType , true> fColor;
[svg] Add support for mask color-interpolation https://www.w3.org/TR/SVG11/painting.html#ColorInterpolationProperty Bug: skia:10842 Change-Id: I3e97577ee257c9afe64d924c768c85badbfab07d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/354220 Commit-Queue: Florin Malita <fmalita@google.com> Reviewed-by: Tyler Denniston <tdenniston@google.com>
2021-01-15 13:58:09 +00:00
SkSVGProperty<SkSVGColorspace, true> fColorInterpolation;
[svg] Add plumbing for color-interpolation-filters property The default colorspace for filter effects is linear RGB, as specified in https://www.w3.org/TR/SVG11/painting.html#ColorInterpolationProperties. Currently we perform all filtering in the destination colorspace. This CL adds the new presentation attribute with the default setting (according to the spec) of linear RGB. This CL does not actually implement any colorspace transformations for filters. Bug: skia:10841 Change-Id: Id778ad3fa5cb6e0aed756584a50880edd9d82e2b Reviewed-on: https://skia-review.googlesource.com/c/skia/+/352738 Commit-Queue: Tyler Denniston <tdenniston@google.com> Reviewed-by: Florin Malita <fmalita@chromium.org>
2021-01-13 17:08:04 +00:00
SkSVGProperty<SkSVGColorspace, true> fColorInterpolationFilters;
Reland "[svg] Relocate out of experimental" Move the SVG rendering code to modules/svg, and componentize. Also split into include/src/utils. As external clients still reference the old header locations, introduce temporary forwarding headers to facilitate the migration. This reverts commit d6cf56fd3400f16aed443807390340c8efdcce1c. TBR= Change-Id: Ibadd7c8dc0464ec0c27841530ade0c2098305d20 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/327344 Commit-Queue: Florin Malita <fmalita@google.com> Reviewed-by: Florin Malita <fmalita@google.com>
2020-10-15 22:10:29 +00:00
[svg] Add SkSVGProperty class for presentation attributes This CL adds a new SkSVGProperty<T,B> class and uses it instead of SkTLazy for the presentation attributes. Ideally this will form the foundation for improvements to our presentation attribute parsing as well as correctness for inherited/non-inherited properties. Change-Id: Ie1cdb3db9674c55376e127cc1a8b8cb303a1bd13 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/334837 Commit-Queue: Tyler Denniston <tdenniston@google.com> Reviewed-by: Florin Malita <fmalita@chromium.org>
2020-11-17 17:26:25 +00:00
SkSVGProperty<SkSVGFontFamily, true> fFontFamily;
SkSVGProperty<SkSVGFontStyle , true> fFontStyle;
SkSVGProperty<SkSVGFontSize , true> fFontSize;
SkSVGProperty<SkSVGFontWeight, true> fFontWeight;
SkSVGProperty<SkSVGTextAnchor, true> fTextAnchor;
[svg] Parse text attributes Convert font-family, font-size, font-style and font-weight to presentation attributes, and add parsing utils. Bug: skia:10840 Change-Id: I1acdb59bc95fe46e67ed0f499dd0732420016663 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/328436 Commit-Queue: Florin Malita <fmalita@google.com> Reviewed-by: Tyler Denniston <tdenniston@google.com>
2020-10-20 14:43:03 +00:00
Reland "[svg] Relocate out of experimental" Move the SVG rendering code to modules/svg, and componentize. Also split into include/src/utils. As external clients still reference the old header locations, introduce temporary forwarding headers to facilitate the migration. This reverts commit d6cf56fd3400f16aed443807390340c8efdcce1c. TBR= Change-Id: Ibadd7c8dc0464ec0c27841530ade0c2098305d20 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/327344 Commit-Queue: Florin Malita <fmalita@google.com> Reviewed-by: Florin Malita <fmalita@google.com>
2020-10-15 22:10:29 +00:00
// uninherited
[svg] Add SkSVGProperty class for presentation attributes This CL adds a new SkSVGProperty<T,B> class and uses it instead of SkTLazy for the presentation attributes. Ideally this will form the foundation for improvements to our presentation attribute parsing as well as correctness for inherited/non-inherited properties. Change-Id: Ie1cdb3db9674c55376e127cc1a8b8cb303a1bd13 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/334837 Commit-Queue: Tyler Denniston <tdenniston@google.com> Reviewed-by: Florin Malita <fmalita@chromium.org>
2020-11-17 17:26:25 +00:00
SkSVGProperty<SkSVGNumberType, false> fOpacity;
[svg] Initial mask plumbing Introduce SkSVGMask and plumb related attributes. Also consolidate the clip/mask/filter property types - they all support the same values: <funciri>|none|inherit. Bug: skia:10842 Change-Id: If45a75cccc19b84d6547237336fe5d562a85d594 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/353436 Commit-Queue: Florin Malita <fmalita@chromium.org> Commit-Queue: Florin Malita <fmalita@google.com> Reviewed-by: Tyler Denniston <tdenniston@google.com>
2021-01-13 16:48:02 +00:00
SkSVGProperty<SkSVGFuncIRI , false> fClipPath;
SkSVGProperty<SkSVGFuncIRI , false> fMask;
SkSVGProperty<SkSVGFuncIRI , false> fFilter;
[svg] Convert stop-color and stop-opacity to presentation attrs These are somewhat the first presentation attributes of their kind, in that they are non-inherited but also not applied via canvas layers. Implementation-wise the main difference is that these attributes are not propagated through the fInherited field of the render context's presentation attribute list. Change-Id: I0909507b0ecbd21732b3f80c46a343f5a0a9bf7a Reviewed-on: https://skia-review.googlesource.com/c/skia/+/340661 Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Tyler Denniston <tdenniston@google.com>
2020-12-09 19:16:25 +00:00
SkSVGProperty<SkSVGColor , false> fStopColor;
SkSVGProperty<SkSVGNumberType, false> fStopOpacity;
[svg] Add feFlood filter node Several related W3C tests still won't pass until we implement the filter primitive subregion. Bug: skia:10841 Change-Id: I9e4beb9da8aa769f23a979ad5116a38fcda85ca4 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/343105 Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Tyler Denniston <tdenniston@google.com>
2020-12-10 20:51:04 +00:00
SkSVGProperty<SkSVGColor , false> fFloodColor;
SkSVGProperty<SkSVGNumberType, false> fFloodOpacity;
[svg] Add light source classes and lighting-color pres attr https://www.w3.org/TR/SVG11/filters.html#LightSourceDefinitions The three classes represent light source elements that will eventually be used for feSpecularLighting and feDiffuseLighting. Currently they are unused. Also added the (currently unused) lighting-color presentation attribute. Bug: skia:10841 Change-Id: Ic7824671662b8cd88cf627affc54173d5e881b7d Reviewed-on: https://skia-review.googlesource.com/c/skia/+/359557 Commit-Queue: Tyler Denniston <tdenniston@google.com> Reviewed-by: Florin Malita <fmalita@chromium.org>
2021-01-26 19:36:32 +00:00
SkSVGProperty<SkSVGColor , false> fLightingColor;
Reland "[svg] Relocate out of experimental" Move the SVG rendering code to modules/svg, and componentize. Also split into include/src/utils. As external clients still reference the old header locations, introduce temporary forwarding headers to facilitate the migration. This reverts commit d6cf56fd3400f16aed443807390340c8efdcce1c. TBR= Change-Id: Ibadd7c8dc0464ec0c27841530ade0c2098305d20 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/327344 Commit-Queue: Florin Malita <fmalita@google.com> Reviewed-by: Florin Malita <fmalita@google.com>
2020-10-15 22:10:29 +00:00
};
#endif // SkSVGAttribute_DEFINED
Reference in New Issue Copy Permalink