diff options
author | 2013-10-15 07:02:27 +0000 | |
---|---|---|
committer | 2013-10-15 07:02:27 +0000 | |
commit | fbc58a305518fe611113a51649bf557c991ac8cf (patch) | |
tree | 3609a43a4649a24161fcba2b4c620a9b16d9ef1f /src | |
parent | e209a70d1e3290e65d1ef869b6a4ebd87fcad9dc (diff) |
Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@11769 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src')
-rw-r--r-- | src/core/SkData.cpp | 1 | ||||
-rw-r--r-- | src/core/SkPaint.cpp | 2 | ||||
-rw-r--r-- | src/pipe/SkGPipeRead.cpp | 2 | ||||
-rw-r--r-- | src/pipe/SkGPipeWrite.cpp | 6 |
4 files changed, 5 insertions, 6 deletions
diff --git a/src/core/SkData.cpp b/src/core/SkData.cpp index 8a6418946c..8d6156c7f2 100644 --- a/src/core/SkData.cpp +++ b/src/core/SkData.cpp @@ -155,4 +155,3 @@ SkData* SkData::NewWithCString(const char cstr[]) { } return NewWithCopy(cstr, size); } - diff --git a/src/core/SkPaint.cpp b/src/core/SkPaint.cpp index 4e186ac379..cfef8b18cd 100644 --- a/src/core/SkPaint.cpp +++ b/src/core/SkPaint.cpp @@ -2186,7 +2186,7 @@ void SkPaint::unflatten(SkFlattenableReadBuffer& buffer) { SkSafeUnref(this->setRasterizer(buffer.readFlattenableT<SkRasterizer>())); SkSafeUnref(this->setLooper(buffer.readFlattenableT<SkDrawLooper>())); SkSafeUnref(this->setImageFilter(buffer.readFlattenableT<SkImageFilter>())); - + if (buffer.readBool()) { this->setAnnotation(SkNEW_ARGS(SkAnnotation, (buffer)))->unref(); } diff --git a/src/pipe/SkGPipeRead.cpp b/src/pipe/SkGPipeRead.cpp index 6275469cd2..ac0aaddead 100644 --- a/src/pipe/SkGPipeRead.cpp +++ b/src/pipe/SkGPipeRead.cpp @@ -673,7 +673,7 @@ static void typeface_rp(SkCanvas*, SkReader32* reader, uint32_t, static void annotation_rp(SkCanvas*, SkReader32* reader, uint32_t op32, SkGPipeState* state) { SkPaint* p = state->editPaint(); - + if (SkToBool(PaintOp_unpackData(op32))) { const size_t size = reader->readU32(); SkAutoMalloc storage(size); diff --git a/src/pipe/SkGPipeWrite.cpp b/src/pipe/SkGPipeWrite.cpp index 05fbb484a5..607c76b5da 100644 --- a/src/pipe/SkGPipeWrite.cpp +++ b/src/pipe/SkGPipeWrite.cpp @@ -1125,7 +1125,7 @@ void SkGPipeCanvas::writePaint(const SkPaint& paint) { // // Do these after we've written kPaintOp_DrawOp - + if (base.getAnnotation() != paint.getAnnotation()) { if (NULL == paint.getAnnotation()) { this->writeOp(kSetAnnotation_DrawOp, 0, 0); @@ -1133,10 +1133,10 @@ void SkGPipeCanvas::writePaint(const SkPaint& paint) { SkOrderedWriteBuffer buffer(1024); paint.getAnnotation()->writeToBuffer(buffer); size = buffer.bytesWritten(); - + SkAutoMalloc storage(size); buffer.writeToMemory(storage.get()); - + this->writeOp(kSetAnnotation_DrawOp, 0, 1); fWriter.write32(size); fWriter.write(storage.get(), size); |