Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Workaround for PathMeasure.getSegment() behavior change" into nyc-dev

Browse Source 
am: d75f694c1a

* commit 'd75f694c1ad05dfd5576d81abda3f5251d5a6813':
  Workaround for PathMeasure.getSegment() behavior change
This commit is contained in:
Doris Liu
2016-03-16 00:24:58 +00:00
committed by android-build-merger
parent f054b33f90 d75f694c1a
commit 3b5723612d
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libs/hwui/VectorDrawable.cpp
View File

@@ -229,19 +229,25 @@ void FullPath::applyTrim() {
// No trimming necessary.
return;
}
mTrimDirty = false;
mTrimmedSkPath.reset();
if (mProperties.trimPathStart == mProperties.trimPathEnd) {
// Trimmed path should be empty.
return;
}
SkPathMeasure measure(mSkPath, false);
float len = SkScalarToFloat(measure.getLength());
float start = len * fmod((mProperties.trimPathStart + mProperties.trimPathOffset), 1.0f);
float end = len * fmod((mProperties.trimPathEnd + mProperties.trimPathOffset), 1.0f);
mTrimmedSkPath.reset();
if (start > end) {
measure.getSegment(start, len, &mTrimmedSkPath, true);
measure.getSegment(0, end, &mTrimmedSkPath, true);
if (end > 0) {
measure.getSegment(0, end, &mTrimmedSkPath, true);
}
} else {
measure.getSegment(start, end, &mTrimmedSkPath, true);
}
mTrimDirty = false;
}
REQUIRE_COMPATIBLE_LAYOUT(FullPath::Properties);