| Index: src/core/SkRecorder.cpp
|
| diff --git a/src/core/SkRecorder.cpp b/src/core/SkRecorder.cpp
|
| index 4c09e514be5f7997752fe94b73364d9d450e4c9e..0c236716bc86a3ae52e052b7014de119e8ccc0c4 100644
|
| --- a/src/core/SkRecorder.cpp
|
| +++ b/src/core/SkRecorder.cpp
|
| @@ -402,25 +402,25 @@ void SkRecorder::didTranslateZ(SkScalar z) {
|
| #endif
|
| }
|
|
|
| -void SkRecorder::onClipRect(const SkRect& rect, SkRegion::Op op, ClipEdgeStyle edgeStyle) {
|
| +void SkRecorder::onClipRect(const SkRect& rect, ClipOp op, ClipEdgeStyle edgeStyle) {
|
| INHERITED(onClipRect, rect, op, edgeStyle);
|
| - SkRecords::RegionOpAndAA opAA(op, kSoft_ClipEdgeStyle == edgeStyle);
|
| + SkRecords::ClipOpAndAA opAA(op, kSoft_ClipEdgeStyle == edgeStyle);
|
| APPEND(ClipRect, this->devBounds(), rect, opAA);
|
| }
|
|
|
| -void SkRecorder::onClipRRect(const SkRRect& rrect, SkRegion::Op op, ClipEdgeStyle edgeStyle) {
|
| +void SkRecorder::onClipRRect(const SkRRect& rrect, ClipOp op, ClipEdgeStyle edgeStyle) {
|
| INHERITED(onClipRRect, rrect, op, edgeStyle);
|
| - SkRecords::RegionOpAndAA opAA(op, kSoft_ClipEdgeStyle == edgeStyle);
|
| + SkRecords::ClipOpAndAA opAA(op, kSoft_ClipEdgeStyle == edgeStyle);
|
| APPEND(ClipRRect, this->devBounds(), rrect, opAA);
|
| }
|
|
|
| -void SkRecorder::onClipPath(const SkPath& path, SkRegion::Op op, ClipEdgeStyle edgeStyle) {
|
| +void SkRecorder::onClipPath(const SkPath& path, ClipOp op, ClipEdgeStyle edgeStyle) {
|
| INHERITED(onClipPath, path, op, edgeStyle);
|
| - SkRecords::RegionOpAndAA opAA(op, kSoft_ClipEdgeStyle == edgeStyle);
|
| + SkRecords::ClipOpAndAA opAA(op, kSoft_ClipEdgeStyle == edgeStyle);
|
| APPEND(ClipPath, this->devBounds(), path, opAA);
|
| }
|
|
|
| -void SkRecorder::onClipRegion(const SkRegion& deviceRgn, SkRegion::Op op) {
|
| +void SkRecorder::onClipRegion(const SkRegion& deviceRgn, ClipOp op) {
|
| INHERITED(onClipRegion, deviceRgn, op);
|
| APPEND(ClipRegion, this->devBounds(), deviceRgn, op);
|
| }
|
|
|