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

Pass dashing info from drawPath to Gr side

Browse Source 
Pass dashing info also from drawPath calls to gpu path rendering code.
Previously dashing info was preserved only for fast-pathed drawRects and
such.

This enables path renderers to see dashing info for arbitrary paths.

Review URL: https://codereview.chromium.org/1114463002
This commit is contained in:
kkinnunen 2015-04-28 22:19:25 -07:00 committed by Commit bot
parent 5b6db07fb5
commit 280a9c81aa
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/gpu/SkGpuDevice.cpp
View File

@ -825,17 +825,23 @@ void SkGpuDevice::internalDrawPath(const SkPath& origSrcPath, const SkPaint& pai
const SkRect* cullRect = NULL; // TODO: what is our bounds?
SkStrokeRec* strokePtr = strokeInfo.getStrokeRecPtr();
if (pathEffect && pathEffect->filterPath(effectPath.init(), *pathPtr, strokePtr,
cullRect)) {
if (!strokeInfo.isDashed() && pathEffect && pathEffect->filterPath(effectPath.init(), *pathPtr,
strokePtr, cullRect)) {
pathPtr = effectPath.get();
pathIsMutable = true;
strokeInfo.removeDash();
}
const SkStrokeRec& stroke = strokeInfo.getStrokeRec();
if (paint.getMaskFilter()) {
if (!stroke.isHairlineStyle()) {
SkPath* strokedPath = pathIsMutable ? pathPtr : tmpPath.init();
if (strokeInfo.isDashed()) {
if (pathEffect->filterPath(strokedPath, *pathPtr, strokePtr, cullRect)) {
pathPtr = strokedPath;
pathIsMutable = true;
}
strokeInfo.removeDash();
}
if (stroke.applyToPath(strokedPath, *pathPtr)) {
pathPtr = strokedPath;
pathIsMutable = true;