diff options
author | Mike Reed <reed@google.com> | 2016-12-14 10:29:54 -0500 |
---|---|---|
committer | Mike Reed <reed@google.com> | 2016-12-14 10:29:54 -0500 |
commit | 6c67f1d04591f44bccb476d715a005ad5bbdf840 (patch) | |
tree | be97ab65b6793aedf2c574fda7fd1f31a7bc317b /libs/hwui/pipeline/skia/RenderNodeDrawable.cpp | |
parent | 9ed3a080e866c087af725e0b6abda026c83a9aa8 (diff) |
SkClipOp is now an enum class
Change-Id: If423dd013a264162ae0b7674a0eeef34bc2cdaae
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 14cc44973c8f..117395bfc75c 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), kIntersect_SkClipOp, true); + canvas->clipRRect(SkRRect::MakeRectXY(rect, radius, radius), SkClipOp::kIntersect, 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(), kIntersect_SkClipOp, true); + canvas->clipPath(*properties.getRevealClip().getPath(), SkClipOp::kIntersect, true); } else if (properties.getOutline().willClip()) { clipOutline(properties.getOutline(), canvas, pendingClip); pendingClip = nullptr; |