Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@7755 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/core/SkPicturePlayback.cpp b/src/core/SkPicturePlayback.cpp
index 2fedd08..2d6f57d 100644
--- a/src/core/SkPicturePlayback.cpp
+++ b/src/core/SkPicturePlayback.cpp
@@ -631,9 +631,9 @@
/*
* Read the next op code and chunk size from 'reader'. The returned size
- * is the entire size of the chunk (including the opcode). Thus, the
+ * is the entire size of the chunk (including the opcode). Thus, the
* offset just prior to calling read_op_and_size + 'size' is the offset
- * to the next chunk's op code. This also means that the size of a chunk
+ * to the next chunk's op code. This also means that the size of a chunk
* with no arguments (just an opcode) will be 4.
*/
static DrawType read_op_and_size(SkReader32* reader, uint32_t* size) {
diff --git a/src/core/SkPictureRecord.cpp b/src/core/SkPictureRecord.cpp
index 762c1e7..c851833 100644
--- a/src/core/SkPictureRecord.cpp
+++ b/src/core/SkPictureRecord.cpp
@@ -85,7 +85,7 @@
fRestoreOffsetStack.push(-(int32_t)fWriter.size());
// op + bool for 'bounds'
- uint32_t size = 2 * kUInt32Size;
+ uint32_t size = 2 * kUInt32Size;
if (NULL != bounds) {
size += sizeof(*bounds); // + rect
}
@@ -127,7 +127,7 @@
UNPACK_8_24(*peek, op, *size);
if (MASK_24 == *size) {
// size required its own slot right after the op code
- *size = *writer->peek32(offset+kUInt32Size);
+ *size = *writer->peek32(offset+kUInt32Size);
}
return (DrawType) op;
}
@@ -462,7 +462,7 @@
// + restore offset
size += kUInt32Size;
}
- uint32_t initialOffset = this->addDraw(CLIP_REGION, &size);
+ uint32_t initialOffset = this->addDraw(CLIP_REGION, &size);
addRegion(region);
addInt(ClipParams_pack(op, false));
recordRestoreOffsetPlaceholder(op);
@@ -565,7 +565,7 @@
void SkPictureRecord::drawBitmapRectToRect(const SkBitmap& bitmap, const SkRect* src,
const SkRect& dst, const SkPaint* paint) {
// id + paint index + bitmap index + bool for 'src'
- uint32_t size = 4 * kUInt32Size;
+ uint32_t size = 4 * kUInt32Size;
if (NULL != src) {
size += sizeof(*src); // + rect
}
@@ -593,7 +593,7 @@
void SkPictureRecord::drawBitmapNine(const SkBitmap& bitmap, const SkIRect& center,
const SkRect& dst, const SkPaint* paint) {
// op + paint index + bitmap id + center + dst rect
- uint32_t size = 3 * kUInt32Size + sizeof(center) + sizeof(dst);
+ uint32_t size = 3 * kUInt32Size + sizeof(center) + sizeof(dst);
uint32_t initialOffset = this->addDraw(DRAW_BITMAP_NINE, &size);
addPaintPtr(paint);
addBitmap(bitmap);
@@ -761,7 +761,7 @@
// + y + the actual points
size += 1 * kUInt32Size + points * sizeof(SkScalar);
- uint32_t initialOffset = this->addDraw(fast ? DRAW_POS_TEXT_H_TOP_BOTTOM : DRAW_POS_TEXT_H,
+ uint32_t initialOffset = this->addDraw(fast ? DRAW_POS_TEXT_H_TOP_BOTTOM : DRAW_POS_TEXT_H,
&size);
const SkFlatData* flatPaintData = addPaint(paint);
SkASSERT(flatPaintData);
@@ -855,7 +855,7 @@
void SkPictureRecord::drawData(const void* data, size_t length) {
// op + length + 'length' worth of data
uint32_t size = 2 * kUInt32Size + SkAlign4(length);
- uint32_t initialOffset = this->addDraw(DRAW_DATA, &size);
+ uint32_t initialOffset = this->addDraw(DRAW_DATA, &size);
addInt(length);
fWriter.writePad(data, length);
validate(initialOffset, size);
diff --git a/src/core/SkPictureRecord.h b/src/core/SkPictureRecord.h
index 39811bb..7a2bb8d 100644
--- a/src/core/SkPictureRecord.h
+++ b/src/core/SkPictureRecord.h
@@ -115,11 +115,11 @@
/*
* Write the 'drawType' operation and chunk size to the skp. 'size'
- * can potentially be increased if the chunk size needs its own storage
+ * can potentially be increased if the chunk size needs its own storage
* location (i.e., it overflows 24 bits).
* Returns the start offset of the chunk. This is the location at which
* the opcode & size are stored.
- * TODO: since we are handing the size into here we could call reserve
+ * TODO: since we are handing the size into here we could call reserve
* and then return a pointer to the memory storage. This could decrease
* allocation overhead but could lead to more wasted space (the tail
* end of blocks could go unused). Possibly add a second addDraw that