AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[svg] Add several skeleton classes for filters

Browse Source 
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>
This commit is contained in:
Tyler Denniston 2020-10-30 16:01:54 -04:00 committed by Skia Commit-Bot
parent b3cafbc45b
commit df208a341b
10 changed files with 188 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/svg/include/SkSVGAttribute.h
View File

@ -24,6 +24,7 @@ enum class SkSVGAttribute {
kFillOpacity,
kFillRule,
kFilter,
kFilterUnits,
kFontFamily,
kFontSize,
kFontStyle,

35
modules/svg/include/SkSVGFe.h Normal file
View File

@ -0,0 +1,35 @@
/*
* Copyright 2020 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
#ifndef SkSVGFe_DEFINED
#define SkSVGFe_DEFINED
#include "modules/svg/include/SkSVGHiddenContainer.h"
class SkImageFilter;
class SkSVGFilterContext;
class SkSVGFe : public SkSVGHiddenContainer {
public:
~SkSVGFe() override = default;
static bool IsFilterElement(const sk_sp<SkSVGNode>& node) { return false; }
sk_sp<SkImageFilter> makeImageFilter(const SkSVGRenderContext& ctx,
SkSVGFilterContext* fctx) const;
protected:
explicit SkSVGFe(SkSVGTag t) : INHERITED(t) {}
virtual sk_sp<SkImageFilter> onMakeImageFilter(const SkSVGRenderContext&,
const SkSVGFilterContext&) const = 0;
private:
using INHERITED = SkSVGHiddenContainer;
};
#endif // SkSVGFe_DEFINED

36
modules/svg/include/SkSVGFilter.h Normal file
View File

@ -0,0 +1,36 @@
/*
* Copyright 2020 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
#ifndef SkSVGFilter_DEFINED
#define SkSVGFilter_DEFINED
#include "modules/svg/include/SkSVGHiddenContainer.h"
#include "modules/svg/include/SkSVGTypes.h"
class SkSVGFilter final : public SkSVGHiddenContainer {
public:
~SkSVGFilter() override = default;
static sk_sp<SkSVGFilter> Make() { return sk_sp<SkSVGFilter>(new SkSVGFilter()); }
SVG_ATTR(X, SkSVGLength, SkSVGLength(-10, SkSVGLength::Unit::kPercentage))
SVG_ATTR(Y, SkSVGLength, SkSVGLength(-10, SkSVGLength::Unit::kPercentage))
SVG_ATTR(Width, SkSVGLength, SkSVGLength(120, SkSVGLength::Unit::kPercentage))
SVG_ATTR(Height, SkSVGLength, SkSVGLength(120, SkSVGLength::Unit::kPercentage))
SVG_ATTR(FilterUnits,
SkSVGObjectBoundingBoxUnits,
SkSVGObjectBoundingBoxUnits(SkSVGObjectBoundingBoxUnits::Type::kObjectBoundingBox))
private:
SkSVGFilter() : INHERITED(SkSVGTag::kFilter) {}
void onSetAttribute(SkSVGAttribute, const SkSVGValue&) override;
using INHERITED = SkSVGHiddenContainer;
};
#endif // SkSVGFilter_DEFINED

32
modules/svg/include/SkSVGFilterContext.h Normal file
View File

@ -0,0 +1,32 @@
/*
* Copyright 2020 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
#ifndef SkSVGFilterContext_DEFINED
#define SkSVGFilterContext_DEFINED
#include "include/core/SkRect.h"
#include "include/core/SkRefCnt.h"
#include "include/private/SkTHash.h"
class SkImageFilter;
class SkPicture;
class SkString;
class SkSVGFilterContext {
public:
SkSVGFilterContext(const SkRect& filterEffectsRegion)
: fFilterEffectsRegion(filterEffectsRegion) {}
sk_sp<SkImageFilter> findResultById(const SkString& id) const;
const SkRect& filterEffectsRegion() const { return fFilterEffectsRegion; }
private:
SkRect fFilterEffectsRegion;
};
#endif // SkSVGFilterContext_DEFINED

1
modules/svg/include/SkSVGNode.h
View File

@ -24,6 +24,7 @@ enum class SkSVGTag {
kClipPath,
kDefs,
kEllipse,
kFilter,
kG,
kLine,
kLinearGradient,

4
modules/svg/src/SkSVGDOM.cpp
View File

@ -15,6 +15,7 @@
#include "modules/svg/include/SkSVGDOM.h"
#include "modules/svg/include/SkSVGDefs.h"
#include "modules/svg/include/SkSVGEllipse.h"
#include "modules/svg/include/SkSVGFilter.h"
#include "modules/svg/include/SkSVGG.h"
#include "modules/svg/include/SkSVGLine.h"
#include "modules/svg/include/SkSVGLinearGradient.h"
@ -434,6 +435,8 @@ SortedDictionaryEntry<AttrParseInfo> gAttributeParseInfo[] = {
{ "fill-opacity" , { SkSVGAttribute::kFillOpacity , SetNumberAttribute }},
{ "fill-rule" , { SkSVGAttribute::kFillRule , SetFillRuleAttribute }},
{ "filter" , { SkSVGAttribute::kFilter , SetFilterAttribute }},
{ "filterUnits" , { SkSVGAttribute::kFilterUnits ,
SetObjectBoundingBoxUnitsAttribute }},
{ "font-family" , { SkSVGAttribute::kFontFamily , SetFontFamilyAttribute }},
{ "font-size" , { SkSVGAttribute::kFontSize , SetFontSizeAttribute }},
{ "font-style" , { SkSVGAttribute::kFontStyle , SetFontStyleAttribute }},
@ -487,6 +490,7 @@ SortedDictionaryEntry<sk_sp<SkSVGNode>(*)()> gTagFactories[] = {
{ "clipPath" , []() -> sk_sp<SkSVGNode> { return SkSVGClipPath::Make(); }},
{ "defs" , []() -> sk_sp<SkSVGNode> { return SkSVGDefs::Make(); }},
{ "ellipse" , []() -> sk_sp<SkSVGNode> { return SkSVGEllipse::Make(); }},
{ "filter" , []() -> sk_sp<SkSVGNode> { return SkSVGFilter::Make(); }},
{ "g" , []() -> sk_sp<SkSVGNode> { return SkSVGG::Make(); }},
{ "line" , []() -> sk_sp<SkSVGNode> { return SkSVGLine::Make(); }},
{ "linearGradient", []() -> sk_sp<SkSVGNode> { return SkSVGLinearGradient::Make(); }},

15
modules/svg/src/SkSVGFe.cpp Normal file
View File

@ -0,0 +1,15 @@
/*
* Copyright 2020 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
#include "include/effects/SkImageFilters.h"
#include "modules/svg/include/SkSVGFe.h"
#include "modules/svg/include/SkSVGFilterContext.h"
sk_sp<SkImageFilter> SkSVGFe::makeImageFilter(const SkSVGRenderContext& ctx,
SkSVGFilterContext* fctx) const {
return this->onMakeImageFilter(ctx, *fctx);
}

45
modules/svg/src/SkSVGFilter.cpp Normal file
View File

@ -0,0 +1,45 @@
/*
* Copyright 2020 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
#include "include/effects/SkImageFilters.h"
#include "modules/svg/include/SkSVGFe.h"
#include "modules/svg/include/SkSVGFilter.h"
#include "modules/svg/include/SkSVGFilterContext.h"
#include "modules/svg/include/SkSVGRenderContext.h"
#include "modules/svg/include/SkSVGValue.h"
void SkSVGFilter::onSetAttribute(SkSVGAttribute attr, const SkSVGValue& v) {
switch (attr) {
case SkSVGAttribute::kX:
if (const auto* x = v.as<SkSVGLengthValue>()) {
this->setX(*x);
}
break;
case SkSVGAttribute::kY:
if (const auto* y = v.as<SkSVGLengthValue>()) {
this->setY(*y);
}
break;
case SkSVGAttribute::kWidth:
if (const auto* w = v.as<SkSVGLengthValue>()) {
this->setWidth(*w);
}
break;
case SkSVGAttribute::kHeight:
if (const auto* h = v.as<SkSVGLengthValue>()) {
this->setHeight(*h);
}
break;
case SkSVGAttribute::kFilterUnits:
if (const auto* filterUnits = v.as<SkSVGObjectBoundingBoxUnitsValue>()) {
this->setFilterUnits(*filterUnits);
}
break;
default:
this->INHERITED::onSetAttribute(attr, v);
}
}

13
modules/svg/src/SkSVGFilterContext.cpp Normal file
View File

@ -0,0 +1,13 @@
/*
* Copyright 2020 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
#include "include/effects/SkImageFilters.h"
#include "modules/svg/include/SkSVGFilterContext.h"
sk_sp<SkImageFilter> SkSVGFilterContext::findResultById(const SkString& id) const {
return nullptr;
}

6
modules/svg/svg.gni
View File

@ -16,6 +16,9 @@ skia_svg_public = [
"$_include/SkSVGDefs.h",
"$_include/SkSVGDOM.h",
"$_include/SkSVGEllipse.h",
"$_include/SkSVGFe.h",
"$_include/SkSVGFilter.h",
"$_include/SkSVGFilterContext.h",
"$_include/SkSVGG.h",
"$_include/SkSVGGradient.h",
"$_include/SkSVGHiddenContainer.h",
@ -47,6 +50,9 @@ skia_svg_sources = [
"$_src/SkSVGContainer.cpp",
"$_src/SkSVGDOM.cpp",
"$_src/SkSVGEllipse.cpp",
"$_src/SkSVGFe.cpp",
"$_src/SkSVGFilter.cpp",
"$_src/SkSVGFilterContext.cpp",
"$_src/SkSVGGradient.cpp",
"$_src/SkSVGLine.cpp",
"$_src/SkSVGLinearGradient.cpp",