Index: src/core/SkPictureRecord.h |
diff --git a/src/core/SkPictureRecord.h b/src/core/SkPictureRecord.h |
index ac8058b31ed2c34ca380ca3bf1d139e3a69d38d6..6d75609db9e5d92e9249d261dee87b3d24df1f4c 100644 |
--- a/src/core/SkPictureRecord.h |
+++ b/src/core/SkPictureRecord.h |
@@ -76,7 +76,7 @@ protected: |
private: |
void handleOptimization(int opt); |
- size_t recordRestoreOffsetPlaceholder(SkRegion::Op); |
+ size_t recordRestoreOffsetPlaceholder(SkCanvas::ClipOp); |
void fillRestoreOffsetPlaceholdersForCurrentStackLevel(uint32_t restoreOffset); |
SkTDArray<int32_t> fRestoreOffsetStack; |
@@ -205,10 +205,10 @@ protected: |
const uint16_t indices[], int indexCount, |
const SkPaint&) override; |
- void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) override; |
- void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) override; |
- void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) override; |
- void onClipRegion(const SkRegion&, SkRegion::Op) override; |
+ void onClipRect(const SkRect&, ClipOp, ClipEdgeStyle) override; |
+ void onClipRRect(const SkRRect&, ClipOp, ClipEdgeStyle) override; |
+ void onClipPath(const SkPath&, ClipOp, ClipEdgeStyle) override; |
+ void onClipRegion(const SkRegion&, ClipOp) override; |
void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) override; |
@@ -231,10 +231,10 @@ protected: |
void recordConcat(const SkMatrix& matrix); |
void recordTranslate(const SkMatrix& matrix); |
void recordScale(const SkMatrix& matrix); |
- size_t recordClipRect(const SkRect& rect, SkRegion::Op op, bool doAA); |
- size_t recordClipRRect(const SkRRect& rrect, SkRegion::Op op, bool doAA); |
- size_t recordClipPath(int pathID, SkRegion::Op op, bool doAA); |
- size_t recordClipRegion(const SkRegion& region, SkRegion::Op op); |
+ size_t recordClipRect(const SkRect& rect, SkCanvas::ClipOp op, bool doAA); |
+ size_t recordClipRRect(const SkRRect& rrect, SkCanvas::ClipOp op, bool doAA); |
+ size_t recordClipPath(int pathID, SkCanvas::ClipOp op, bool doAA); |
+ size_t recordClipRegion(const SkRegion& region, SkCanvas::ClipOp op); |
void recordSave(); |
void recordSaveLayer(const SaveLayerRec&); |
void recordRestore(bool fillInSkips = true); |