Roll Skia to 7b971f0152299ae9a924252a9bfd220318497bdd

sky/engine/platform/graphics/Path.cpp

Index: sky/engine/platform/graphics/Path.cpp
diff --git a/sky/engine/platform/graphics/Path.cpp b/sky/engine/platform/graphics/Path.cpp
index 9151dd725ff816b7bf4ff30619225beeae8984e8..5ac7f788d438ac94300e1d8b014c20abdeeca949 100644
--- a/sky/engine/platform/graphics/Path.cpp
+++ b/sky/engine/platform/graphics/Path.cpp
@@ -481,17 +481,17 @@ void Path::translate(const FloatSize& size)
 
 bool Path::subtractPath(const Path& other)
 {
-    return Op(m_path, other.m_path, kDifference_PathOp, &m_path);
+    return Op(m_path, other.m_path, kDifference_SkPathOp, &m_path);
 }
 
 bool Path::intersectPath(const Path& other)
 {
-    return Op(m_path, other.m_path, kIntersect_PathOp, &m_path);
+    return Op(m_path, other.m_path, kIntersect_SkPathOp, &m_path);
 }
 
 bool Path::unionPath(const Path& other)
 {
-    return Op(m_path, other.m_path, kUnion_PathOp, &m_path);
+    return Op(m_path, other.m_path, kUnion_SkPathOp, &m_path);
 }
 
 #if ENABLE(ASSERT)