diff options
author | Leon Scroggins III <scroggo@google.com> | 2020-01-30 15:34:13 -0500 |
---|---|---|
committer | Leon Scroggins III <scroggo@google.com> | 2020-01-31 14:21:46 -0500 |
commit | a49beaaa693d0900a65c8ebf2a1f44242e469f59 (patch) | |
tree | d91d0c4407a0871ee6c1f23ff19261c985449890 /libs/hwui | |
parent | b29730fc9b687605d4e3cadd3d27bc98d529867c (diff) |
Replace Outline#setConvexPath with Outline#setPath
Bug: 148544953
Test: No change in behavior, no new tests
setConvexPath no longer requires that the Path be Convex, so deprecate
the method and replace it with a name that does not imply it must be
Convex.
Update internal references to the Path being Convex as well.
Change-Id: I8935dc8ac7f7fb7db0d667e35fda67afdf2e6ac8
Diffstat (limited to 'libs/hwui')
-rw-r--r-- | libs/hwui/Outline.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/hwui/Outline.h b/libs/hwui/Outline.h index f1c38031980e..2eb2c7c7e299 100644 --- a/libs/hwui/Outline.h +++ b/libs/hwui/Outline.h @@ -26,7 +26,7 @@ namespace uirenderer { class Outline { public: - enum class Type { None = 0, Empty = 1, ConvexPath = 2, RoundRect = 3 }; + enum class Type { None = 0, Empty = 1, Path = 2, RoundRect = 3 }; Outline() : mShouldClip(false), mType(Type::None), mRadius(0), mAlpha(0.0f) {} @@ -57,12 +57,12 @@ public: } } - void setConvexPath(const SkPath* outline, float alpha) { + void setPath(const SkPath* outline, float alpha) { if (!outline) { setEmpty(); return; } - mType = Type::ConvexPath; + mType = Type::Path; mPath = *outline; mBounds.set(outline->getBounds()); mAlpha = alpha; |