AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Sanitizing source files in Housekeeper-Nightly

Browse Source 
git-svn-id: http://skia.googlecode.com/svn/trunk@13634 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
skia.committer@gmail.com 2014-03-01 03:02:09 +00:00
parent f4c06531dc
commit 370a89980b
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
experimental/PdfViewer/SkNulCanvas.h
View File

@ -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;

2
src/core/SkCanvas.cpp
View File

@ -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;

8
src/utils/debugger/SkDebugCanvas.h
View File

@ -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;

12
tests/PictureTest.cpp
View File

@ -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);