diff options
author | Mike Reed <reed@google.com> | 2016-12-02 15:36:59 -0500 |
---|---|---|
committer | Mike Reed <reed@google.com> | 2016-12-07 10:34:39 -0500 |
commit | 6e49c9f007c879f05b035c40c0ba543c00f9d0d0 (patch) | |
tree | 236bada9584af476e4989530fcc6154e589ae64a /libs/hwui/pipeline/skia/RenderNodeDrawable.cpp | |
parent | 7bdd131a2458a833af31251b10a37d7ee2b646ed (diff) |
switch over clip calls to use SkClipOp instead of SkRegion::Op
Change-Id: I67d23c487b5249bc31d96e3b2393f693c0b2bcff
Diffstat (limited to 'libs/hwui/pipeline/skia/RenderNodeDrawable.cpp')
-rw-r--r-- | libs/hwui/pipeline/skia/RenderNodeDrawable.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/hwui/pipeline/skia/RenderNodeDrawable.cpp b/libs/hwui/pipeline/skia/RenderNodeDrawable.cpp index 4b34c7c45c74..14cc44973c8f 100644 --- a/libs/hwui/pipeline/skia/RenderNodeDrawable.cpp +++ b/libs/hwui/pipeline/skia/RenderNodeDrawable.cpp @@ -68,7 +68,7 @@ static void clipOutline(const Outline& outline, SkCanvas* canvas, const SkRect* if (pendingClip && !pendingClip->contains(rect)) { canvas->clipRect(*pendingClip); } - canvas->clipRRect(SkRRect::MakeRectXY(rect, radius, radius), SkRegion::kIntersect_Op, true); + canvas->clipRRect(SkRRect::MakeRectXY(rect, radius, radius), kIntersect_SkClipOp, true); } else { if (pendingClip) { (void)rect.intersect(*pendingClip); @@ -263,7 +263,7 @@ void RenderNodeDrawable::setViewProperties(const RenderProperties& properties, S } if (properties.getRevealClip().willClip()) { - canvas->clipPath(*properties.getRevealClip().getPath(), SkRegion::kIntersect_Op, true); + canvas->clipPath(*properties.getRevealClip().getPath(), kIntersect_SkClipOp, true); } else if (properties.getOutline().willClip()) { clipOutline(properties.getOutline(), canvas, pendingClip); pendingClip = nullptr; |