diff options
| -rw-r--r-- | gm/modecolorfilters.cpp | 2 | ||||
| -rw-r--r-- | include/core/SkRRect.h | 2 | ||||
| -rw-r--r-- | include/core/SkWriter32.h | 4 | ||||
| -rw-r--r-- | src/core/SkCanvas.cpp | 2 | ||||
| -rw-r--r-- | src/core/SkPicturePlayback.h | 2 | ||||
| -rw-r--r-- | src/core/SkPictureRecord.cpp | 4 | ||||
| -rw-r--r-- | src/utils/SkDeferredCanvas.cpp | 2 | ||||
| -rw-r--r-- | tests/ClipStackTest.cpp | 2 |
8 files changed, 10 insertions, 10 deletions
diff --git a/gm/modecolorfilters.cpp b/gm/modecolorfilters.cpp index 8c3d3a563d..fa0c09118c 100644 --- a/gm/modecolorfilters.cpp +++ b/gm/modecolorfilters.cpp @@ -137,7 +137,7 @@ protected: SkScalar x = SkIntToScalar(idx % kRectsPerRow); SkScalar y = SkIntToScalar(idx / kRectsPerRow); SkRect rect = SkRect::MakeXYWH(x * kRectWidth, y * kRectHeight, - SkIntToScalar(kRectWidth), + SkIntToScalar(kRectWidth), SkIntToScalar(kRectHeight)); canvas->drawRect(rect, bgPaint); canvas->drawRect(rect, paint); diff --git a/include/core/SkRRect.h b/include/core/SkRRect.h index a900d4a2e5..eb2a770f62 100644 --- a/include/core/SkRRect.h +++ b/include/core/SkRRect.h @@ -222,7 +222,7 @@ public: enum { kSizeInMemory = 12 * sizeof(SkScalar) }; - + /** * Write the rrect into the specified buffer. This is guaranteed to always * write kSizeInMemory bytes, and that value is guaranteed to always be diff --git a/include/core/SkWriter32.h b/include/core/SkWriter32.h index 9368126f4e..3f5a2433ed 100644 --- a/include/core/SkWriter32.h +++ b/include/core/SkWriter32.h @@ -109,11 +109,11 @@ public: void writeRect(const SkRect& rect) { *(SkRect*)this->reserve(sizeof(rect)) = rect; } - + void writeRRect(const SkRRect& rrect) { rrect.writeToMemory(this->reserve(SkRRect::kSizeInMemory)); } - + void writePath(const SkPath& path) { size_t size = path.writeToMemory(NULL); SkASSERT(SkAlign4(size) == size); diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp index 3efdd22c3c..7d25c2848c 100644 --- a/src/core/SkCanvas.cpp +++ b/src/core/SkCanvas.cpp @@ -1486,7 +1486,7 @@ void SkCanvas::drawOval(const SkRect& oval, const SkPaint& paint) { return; } } - + SkPath path; path.addOval(oval); // call the non-virtual version diff --git a/src/core/SkPicturePlayback.h b/src/core/SkPicturePlayback.h index 13a685fb92..b04ba07281 100644 --- a/src/core/SkPicturePlayback.h +++ b/src/core/SkPicturePlayback.h @@ -148,7 +148,7 @@ private: int index = reader.readInt(); return (*fRegions)[index - 1]; } - + void getText(SkReader32& reader, TextContainer* text) { size_t length = text->fByteLength = reader.readInt(); text->fText = (const char*)reader.skip(length); diff --git a/src/core/SkPictureRecord.cpp b/src/core/SkPictureRecord.cpp index 82257c8e57..4010387660 100644 --- a/src/core/SkPictureRecord.cpp +++ b/src/core/SkPictureRecord.cpp @@ -356,7 +356,7 @@ bool SkPictureRecord::clipRect(const SkRect& rect, SkRegion::Op op, bool doAA) { addRect(rect); addInt(ClipParams_pack(op, doAA)); recordRestoreOffsetPlaceholder(op); - + validate(); return this->INHERITED::clipRect(rect, op, doAA); } @@ -370,7 +370,7 @@ bool SkPictureRecord::clipRRect(const SkRRect& rrect, SkRegion::Op op, bool doAA addRRect(rrect); addInt(ClipParams_pack(op, doAA)); recordRestoreOffsetPlaceholder(op); - + validate(); if (fRecordFlags & SkPicture::kUsePathBoundsForClip_RecordingFlag) { diff --git a/src/utils/SkDeferredCanvas.cpp b/src/utils/SkDeferredCanvas.cpp index c827be603c..b0033dfd09 100644 --- a/src/utils/SkDeferredCanvas.cpp +++ b/src/utils/SkDeferredCanvas.cpp @@ -847,7 +847,7 @@ void SkDeferredCanvas::drawRect(const SkRect& rect, const SkPaint& paint) { isPaintOpaque(&paint)) { this->getDeferredDevice()->skipPendingCommands(); } - + AutoImmediateDrawIfNeeded autoDraw(*this, &paint); this->drawingCanvas()->drawRect(rect, paint); this->recordedDrawCommand(); diff --git a/tests/ClipStackTest.cpp b/tests/ClipStackTest.cpp index 5e5c87f827..d4391d7af6 100644 --- a/tests/ClipStackTest.cpp +++ b/tests/ClipStackTest.cpp @@ -519,7 +519,7 @@ static void test_quickContains(skiatest::Reporter* reporter) { // return false because quickContains currently does not care for kDifference_Op REPORTER_ASSERT(reporter, false == stack.quickContains(testRect)); } - + // Replace Op tests { SkClipStack stack; |