diff options
author | borenet <borenet@google.com> | 2016-09-20 13:39:46 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-09-20 13:39:46 -0700 |
commit | a5344ee50a643ca72742e065f5268d9cbc3e0c82 (patch) | |
tree | b3db7005bbaf34e9b1c828e0fb83a35c10c03af5 /experimental/svg/model/SkSVGRenderContext.cpp | |
parent | a627b5c3b9004118621bfa99f3952465adfa4ad6 (diff) |
Revert of [SVGDom] Opacity optimization (patchset #4 id:60001 of https://codereview.chromium.org/2353503005/ )
Reason for revert:
Failing assertion
Original issue's description:
> [SVGDom] Opacity optimization
>
> Apply opacity as fill/stroke paint alpha instead of saveLayer, when
> possible.
>
> R=robertphillips@google.com,stephana@google.com,reed@google.com
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2353503005
>
> Committed: https://skia.googlesource.com/skia/+/3dbb7b9f196d793fbd16243157ee67638891f5dc
TBR=reed@google.com,robertphillips@google.com,stephana@google.com,fmalita@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review-Url: https://codereview.chromium.org/2359603002
Diffstat (limited to 'experimental/svg/model/SkSVGRenderContext.cpp')
-rw-r--r-- | experimental/svg/model/SkSVGRenderContext.cpp | 35 |
1 files changed, 4 insertions, 31 deletions
diff --git a/experimental/svg/model/SkSVGRenderContext.cpp b/experimental/svg/model/SkSVGRenderContext.cpp index 147d64edb3..7e2e90e22c 100644 --- a/experimental/svg/model/SkSVGRenderContext.cpp +++ b/experimental/svg/model/SkSVGRenderContext.cpp @@ -239,8 +239,7 @@ const SkSVGNode* SkSVGRenderContext::findNodeById(const SkString& id) const { return v ? v->get() : nullptr; } -void SkSVGRenderContext::applyPresentationAttributes(const SkSVGPresentationAttributes& attrs, - uint32_t flags) { +void SkSVGRenderContext::applyPresentationAttributes(const SkSVGPresentationAttributes& attrs) { #define ApplyLazyInheritedAttribute(ATTR) \ do { \ @@ -268,36 +267,10 @@ void SkSVGRenderContext::applyPresentationAttributes(const SkSVGPresentationAttr // Uninherited attributes. Only apply to the current context. - if (auto* opacity = attrs.fOpacity.getMaybeNull()) { - this->applyOpacity(opacity->value(), flags); - } -} - -void SkSVGRenderContext::applyOpacity(SkScalar opacity, uint32_t flags) { - if (opacity >= 1) { - return; - } - - const bool hasFill = SkToBool(this->fillPaint()); - const bool hasStroke = SkToBool(this->strokePaint()); - - // We can apply the opacity as paint alpha iif it only affects one atomic draw. - // For now, this means a) the target node doesn't have any descendants, and - // b) it only has a stroke or a fill (but not both). Going forward, we may need - // to refine this heuristic (e.g. to accommodate markers). - if ((flags & kLeaf) && (hasFill ^ hasStroke)) { - auto* pctx = fPresentationContext.writable(); - if (hasFill) { - pctx->fFillPaint.setAlpha( - SkScalarRoundToInt(opacity * pctx->fFillPaint.getAlpha())); - } else { - pctx->fStrokePaint.setAlpha( - SkScalarRoundToInt(opacity * pctx->fStrokePaint.getAlpha())); - } - } else { - // Expensive, layer-based fall back. + auto* opacity = attrs.fOpacity.getMaybeNull(); + if (opacity && opacity->value() < 1) { SkPaint opacityPaint; - opacityPaint.setAlpha(opacity_to_alpha(opacity)); + opacityPaint.setAlpha(opacity_to_alpha(opacity->value())); // Balanced in the destructor, via restoreToCount(). fCanvas->saveLayer(nullptr, &opacityPaint); } |