diff options
| -rw-r--r-- | experimental/PdfViewer/SkNulCanvas.h | 4 | ||||
| -rw-r--r-- | src/core/SkCanvas.cpp | 2 | ||||
| -rw-r--r-- | src/utils/debugger/SkDebugCanvas.h | 8 | ||||
| -rw-r--r-- | tests/PictureTest.cpp | 12 |
4 files changed, 13 insertions, 13 deletions
diff --git a/experimental/PdfViewer/SkNulCanvas.h b/experimental/PdfViewer/SkNulCanvas.h index 506d49f35f..af933526f5 100644 --- a/experimental/PdfViewer/SkNulCanvas.h +++ b/experimental/PdfViewer/SkNulCanvas.h @@ -87,8 +87,8 @@ public: virtual ClipType getClipType() const SK_OVERRIDE { return kRect_ClipType; } virtual bool getClipBounds(SkRect* bounds) const SK_OVERRIDE { if (NULL != bounds) { - bounds->setXYWH(0, 0, - SkIntToScalar(this->imageInfo().fWidth), + bounds->setXYWH(0, 0, + SkIntToScalar(this->imageInfo().fWidth), SkIntToScalar(this->imageInfo().fHeight)); } return true; diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp index 96d16fcdb9..dfc3f93789 100644 --- a/src/core/SkCanvas.cpp +++ b/src/core/SkCanvas.cpp @@ -1418,7 +1418,7 @@ bool SkCanvas::updateClipConservativelyUsingBounds(const SkRect& bounds, SkRegio this->SkCanvas::save(SkCanvas::kMatrix_SaveFlag); // set the clip in device space this->SkCanvas::setMatrix(SkMatrix::I()); - this->SkCanvas::onClipRect(deviceBounds, SkRegion::kReplace_Op, + this->SkCanvas::onClipRect(deviceBounds, SkRegion::kReplace_Op, kHard_ClipEdgeStyle); this->SkCanvas::restore(); //pop the matrix, but keep the clip break; diff --git a/src/utils/debugger/SkDebugCanvas.h b/src/utils/debugger/SkDebugCanvas.h index ebce6c9131..edf7a2295d 100644 --- a/src/utils/debugger/SkDebugCanvas.h +++ b/src/utils/debugger/SkDebugCanvas.h @@ -224,13 +224,13 @@ public: static const int kVizImageWidth = 256; virtual bool isClipEmpty() const SK_OVERRIDE { return false; } - virtual ClipType getClipType() const SK_OVERRIDE { - return kRect_ClipType; + virtual ClipType getClipType() const SK_OVERRIDE { + return kRect_ClipType; } virtual bool getClipBounds(SkRect* bounds) const SK_OVERRIDE { if (NULL != bounds) { - bounds->setXYWH(0, 0, - SkIntToScalar(this->imageInfo().fWidth), + bounds->setXYWH(0, 0, + SkIntToScalar(this->imageInfo().fWidth), SkIntToScalar(this->imageInfo().fHeight)); } return true; diff --git a/tests/PictureTest.cpp b/tests/PictureTest.cpp index c6afb1f9da..c54a9d56d6 100644 --- a/tests/PictureTest.cpp +++ b/tests/PictureTest.cpp @@ -982,22 +982,22 @@ public: , fClipCount(0){ } - virtual void onClipRect(const SkRect& r, - SkRegion::Op op, + virtual void onClipRect(const SkRect& r, + SkRegion::Op op, ClipEdgeStyle edgeStyle) SK_OVERRIDE { fClipCount += 1; this->INHERITED::onClipRect(r, op, edgeStyle); } - virtual void onClipRRect(const SkRRect& rrect, - SkRegion::Op op, + virtual void onClipRRect(const SkRRect& rrect, + SkRegion::Op op, ClipEdgeStyle edgeStyle)SK_OVERRIDE { fClipCount += 1; this->INHERITED::onClipRRect(rrect, op, edgeStyle); } - virtual void onClipPath(const SkPath& path, - SkRegion::Op op, + virtual void onClipPath(const SkPath& path, + SkRegion::Op op, ClipEdgeStyle edgeStyle) SK_OVERRIDE { fClipCount += 1; this->INHERITED::onClipPath(path, op, edgeStyle); |