| Index: Source/platform/graphics/GraphicsContext.h
|
| diff --git a/Source/platform/graphics/GraphicsContext.h b/Source/platform/graphics/GraphicsContext.h
|
| index 2fa7c531a00ca76da8cc5da5a64d6d8fda21e75e..afda270b92c5cda217235d5981eb3f08a7ada146 100644
|
| --- a/Source/platform/graphics/GraphicsContext.h
|
| +++ b/Source/platform/graphics/GraphicsContext.h
|
| @@ -290,14 +290,14 @@ public:
|
|
|
| void clip(const IntRect& rect) { clipRect(rect); }
|
| void clip(const FloatRect& rect) { clipRect(rect); }
|
| - void clipRoundedRect(const RoundedRect&, SkRegion::Op = SkRegion::kIntersect_Op);
|
| - void clipOut(const IntRect& rect) { clipRect(rect, NotAntiAliased, SkRegion::kDifference_Op); }
|
| + void clipRoundedRect(const RoundedRect&, SkClipOp = kIntersect_SkClipOp);
|
| + void clipOut(const IntRect& rect) { clipRect(rect, NotAntiAliased, kDifference_SkClipOp); }
|
| void clipOut(const Path&);
|
| void clipOutRoundedRect(const RoundedRect&);
|
| void clipPath(const Path&, WindRule = RULE_EVENODD, AntiAliasingMode = AntiAliased);
|
| - void clipPath(const SkPath&, AntiAliasingMode = NotAntiAliased, SkRegion::Op = SkRegion::kIntersect_Op);
|
| + void clipPath(const SkPath&, AntiAliasingMode = NotAntiAliased, SkClipOp = kIntersect_SkClipOp);
|
| void clipPolygon(size_t numPoints, const FloatPoint*, bool antialias);
|
| - void clipRect(const SkRect&, AntiAliasingMode = NotAntiAliased, SkRegion::Op = SkRegion::kIntersect_Op);
|
| + void clipRect(const SkRect&, AntiAliasingMode = NotAntiAliased, SkClipOp = kIntersect_SkClipOp);
|
|
|
| void drawText(const Font&, const TextRunPaintInfo&, const FloatPoint&);
|
| void drawEmphasisMarks(const Font&, const TextRunPaintInfo&, const AtomicString& mark, const FloatPoint&);
|
| @@ -428,7 +428,7 @@ private:
|
| void drawFocusRingRect(const SkRect&, const Color&, int width);
|
|
|
| // SkCanvas wrappers.
|
| - void clipRRect(const SkRRect&, AntiAliasingMode = NotAntiAliased, SkRegion::Op = SkRegion::kIntersect_Op);
|
| + void clipRRect(const SkRRect&, AntiAliasingMode = NotAntiAliased, SkClipOp = kIntersect_SkClipOp);
|
| void concat(const SkMatrix&);
|
| void drawRRect(const SkRRect&, const SkPaint&);
|
|
|
|
|