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

[SVGDom] Add opacity support

Browse Source 
Group opacity support.  Unlike the other presentation attributes we
support thus far, group opacity is not inherited.

R=robertphillips@google.com,stephana@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2246943002

Review-Url: https://codereview.chromium.org/2246943002
This commit is contained in:
fmalita 2016-08-15 12:45:11 -07:00 committed by Commit bot
parent d39430d057
commit 6fb0648c35
6 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
experimental/svg/model/SkSVGAttribute.h
View File

@ -18,6 +18,7 @@ enum class SkSVGAttribute {
kFill,
kFillOpacity,
kHeight,
kOpacity,
kPoints,
kRx,
kRy,
@ -48,6 +49,8 @@ struct SkSVGPresentationAttributes {
SkTLazy<SkSVGLineJoin> fStrokeLineJoin;
SkTLazy<SkSVGNumberType> fStrokeOpacity;
SkTLazy<SkSVGLength> fStrokeWidth;
SkTLazy<SkSVGNumberType> fOpacity;
};
#endif // SkSVGAttribute_DEFINED

1
experimental/svg/model/SkSVGDOM.cpp
View File

@ -217,6 +217,7 @@ SortedDictionaryEntry<AttrParseInfo> gAttributeParseInfo[] = {
{ "fill" , { SkSVGAttribute::kFill , SetPaintAttribute }},
{ "fill-opacity" , { SkSVGAttribute::kFillOpacity , SetNumberAttribute }},
{ "height" , { SkSVGAttribute::kHeight , SetLengthAttribute }},
{ "opacity" , { SkSVGAttribute::kOpacity , SetNumberAttribute }},
{ "points" , { SkSVGAttribute::kPoints , SetPointsAttribute }},
{ "rx" , { SkSVGAttribute::kRx , SetLengthAttribute }},
{ "ry" , { SkSVGAttribute::kRy , SetLengthAttribute }},

10
experimental/svg/model/SkSVGNode.cpp
View File

@ -42,6 +42,11 @@ void SkSVGNode::setFillOpacity(const SkSVGNumberType& opacity) {
SkSVGNumberType(SkTPin<SkScalar>(opacity.value(), 0, 1)));
}
void SkSVGNode::setOpacity(const SkSVGNumberType& opacity) {
fPresentationAttributes.fOpacity.set(
SkSVGNumberType(SkTPin<SkScalar>(opacity.value(), 0, 1)));
}
void SkSVGNode::setStroke(const SkSVGPaint& svgPaint) {
fPresentationAttributes.fStroke.set(svgPaint);
}
@ -67,6 +72,11 @@ void SkSVGNode::onSetAttribute(SkSVGAttribute attr, const SkSVGValue& v) {
this->setFillOpacity(*opacity);
}
break;
case SkSVGAttribute::kOpacity:
if (const SkSVGNumberValue* opacity = v.as<SkSVGNumberValue>()) {
this->setOpacity(*opacity);
}
break;
case SkSVGAttribute::kStroke:
if (const SkSVGPaintValue* paint = v.as<SkSVGPaintValue>()) {
this->setStroke(*paint);

1
experimental/svg/model/SkSVGNode.h
View File

@ -39,6 +39,7 @@ public:
void setFill(const SkSVGPaint&);
void setFillOpacity(const SkSVGNumberType&);
void setOpacity(const SkSVGNumberType&);
void setStroke(const SkSVGPaint&);
void setStrokeOpacity(const SkSVGNumberType&);
void setStrokeWidth(const SkSVGLength&);

9
experimental/svg/model/SkSVGRenderContext.cpp
View File

@ -224,6 +224,15 @@ void SkSVGRenderContext::applyPresentationAttributes(const SkSVGPresentationAttr
ApplyLazyInheritedAttribute(StrokeWidth);
#undef ApplyLazyInheritedAttribute
// Uninherited attributes. Only apply to the current context.
if (auto* opacity = attrs.fOpacity.getMaybeNull()) {
SkPaint opacityPaint;
opacityPaint.setAlpha(static_cast<uint8_t>(opacity->value() * 255));
// Balanced in the destructor, via restoreToCount().
fCanvas->saveLayer(nullptr, &opacityPaint);
}
}
const SkPaint* SkSVGRenderContext::fillPaint() const {

10
infra/bots/recipes/swarm_test.py
View File

@ -259,6 +259,16 @@ def dm_flags(bot):
blacklist.extend([ '2ndpic-8888', 'gm', '_', test])
blacklist.extend(['serialize-8888', 'gm', '_', test])
# SaveLayerDrawRestoreNooper diffs
for test in ['car.svg',
'gallardo.svg',
'rg1024_green_grapes.svg',
'Seal_of_Kansas.svg']:
blacklist.extend([ 'sp-8888', 'svg', '_', test])
blacklist.extend([ 'pic-8888', 'svg', '_', test])
blacklist.extend([ '2ndpic-8888', 'svg', '_', test])
blacklist.extend(['serialize-8888', 'svg', '_', test])
# Extensions for RAW images
r = ["arw", "cr2", "dng", "nef", "nrw", "orf", "raf", "rw2", "pef", "srw",
"ARW", "CR2", "DNG", "NEF", "NRW", "ORF", "RAF", "RW2", "PEF", "SRW"]