Index: Source/platform/graphics/GraphicsContext.cpp |
diff --git a/Source/platform/graphics/GraphicsContext.cpp b/Source/platform/graphics/GraphicsContext.cpp |
index 4ce482aefa6b19d5c961748aeebef2a915222af6..f36c5a67b0cbe3e8849936ba42888dce7ef53df5 100644 |
--- a/Source/platform/graphics/GraphicsContext.cpp |
+++ b/Source/platform/graphics/GraphicsContext.cpp |
@@ -1524,13 +1524,13 @@ void GraphicsContext::strokeEllipse(const FloatRect& ellipse) |
drawOval(ellipse, immutableState()->strokePaint()); |
} |
-void GraphicsContext::clipRoundedRect(const RoundedRect& rect, SkRegion::Op regionOp) |
+void GraphicsContext::clipRoundedRect(const RoundedRect& rect, SkClipOp op) |
{ |
if (contextDisabled()) |
return; |
if (!rect.isRounded()) { |
- clipRect(rect.rect(), NotAntiAliased, regionOp); |
+ clipRect(rect.rect(), NotAntiAliased, op); |
return; |
} |
@@ -1541,7 +1541,7 @@ void GraphicsContext::clipRoundedRect(const RoundedRect& rect, SkRegion::Op regi |
SkRRect r; |
r.setRectRadii(rect.rect(), radii); |
- clipRRect(r, AntiAliased, regionOp); |
+ clipRRect(r, AntiAliased, op); |
} |
void GraphicsContext::clipOut(const Path& pathToClip) |
@@ -1589,10 +1589,10 @@ void GraphicsContext::clipOutRoundedRect(const RoundedRect& rect) |
if (contextDisabled()) |
return; |
- clipRoundedRect(rect, SkRegion::kDifference_Op); |
+ clipRoundedRect(rect, kDifference_SkClipOp); |
} |
-void GraphicsContext::clipRect(const SkRect& rect, AntiAliasingMode aa, SkRegion::Op op) |
+void GraphicsContext::clipRect(const SkRect& rect, AntiAliasingMode aa, SkClipOp op) |
{ |
ASSERT(m_canvas); |
if (contextDisabled()) |
@@ -1601,7 +1601,7 @@ void GraphicsContext::clipRect(const SkRect& rect, AntiAliasingMode aa, SkRegion |
m_canvas->clipRect(rect, op, aa == AntiAliased); |
} |
-void GraphicsContext::clipPath(const SkPath& path, AntiAliasingMode aa, SkRegion::Op op) |
+void GraphicsContext::clipPath(const SkPath& path, AntiAliasingMode aa, SkClipOp op) |
{ |
ASSERT(m_canvas); |
if (contextDisabled()) |
@@ -1610,7 +1610,7 @@ void GraphicsContext::clipPath(const SkPath& path, AntiAliasingMode aa, SkRegion |
m_canvas->clipPath(path, op, aa == AntiAliased); |
} |
-void GraphicsContext::clipRRect(const SkRRect& rect, AntiAliasingMode aa, SkRegion::Op op) |
+void GraphicsContext::clipRRect(const SkRRect& rect, AntiAliasingMode aa, SkClipOp op) |
{ |
ASSERT(m_canvas); |
if (contextDisabled()) |