Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@13961 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/core/SkPictureStateTree.cpp b/src/core/SkPictureStateTree.cpp
index df8edba..ca3032d 100644
--- a/src/core/SkPictureStateTree.cpp
+++ b/src/core/SkPictureStateTree.cpp
@@ -104,16 +104,16 @@
if (fPlaybackIndex >= fDraws->count()) {
// restore back to where we started
fCanvas->setMatrix(fPlaybackMatrix);
- if (fCurrentNode->fFlags & Node::kSaveLayer_Flag) {
- fCanvas->restore();
+ if (fCurrentNode->fFlags & Node::kSaveLayer_Flag) {
+ fCanvas->restore();
}
fCurrentNode = fCurrentNode->fParent;
while (NULL != fCurrentNode) {
- if (fCurrentNode->fFlags & Node::kSave_Flag) {
- fCanvas->restore();
+ if (fCurrentNode->fFlags & Node::kSave_Flag) {
+ fCanvas->restore();
}
- if (fCurrentNode->fFlags & Node::kSaveLayer_Flag) {
- fCanvas->restore();
+ if (fCurrentNode->fFlags & Node::kSaveLayer_Flag) {
+ fCanvas->restore();
}
fCurrentNode = fCurrentNode->fParent;
}
@@ -143,11 +143,11 @@
uint16_t currentLevel = tmp->fLevel;
uint16_t targetLevel = ancestor->fLevel;
if (currentLevel >= targetLevel) {
- if (tmp != fCurrentNode && tmp->fFlags & Node::kSave_Flag) {
- fCanvas->restore();
+ if (tmp != fCurrentNode && tmp->fFlags & Node::kSave_Flag) {
+ fCanvas->restore();
}
- if (tmp->fFlags & Node::kSaveLayer_Flag) {
- fCanvas->restore();
+ if (tmp->fFlags & Node::kSaveLayer_Flag) {
+ fCanvas->restore();
}
tmp = tmp->fParent;
}
@@ -158,11 +158,11 @@
}
if (ancestor->fFlags & Node::kSave_Flag) {
- if (fCurrentNode != ancestor) {
- fCanvas->restore();
+ if (fCurrentNode != ancestor) {
+ fCanvas->restore();
}
- if (targetNode != ancestor) {
- fCanvas->save(SkCanvas::kClip_SaveFlag);
+ if (targetNode != ancestor) {
+ fCanvas->save(SkCanvas::kClip_SaveFlag);
}
}
fCurrentNode = ancestor;
diff --git a/src/gpu/GrDrawTarget.h b/src/gpu/GrDrawTarget.h
index f7b5fe8..5b26ff5 100644
--- a/src/gpu/GrDrawTarget.h
+++ b/src/gpu/GrDrawTarget.h
@@ -505,7 +505,7 @@
const GrDeviceCoordTexture* dstCopy) {
this->onDrawPaths(pathCount, paths, transforms, fill, stroke, dstCopy);
}
-
+
inline bool isGpuTracingEnabled() const {
return this->getContext()->isGpuTracingEnabled();
}
diff --git a/src/gpu/GrTraceMarker.cpp b/src/gpu/GrTraceMarker.cpp
index 470f364..16c90c2 100644
--- a/src/gpu/GrTraceMarker.cpp
+++ b/src/gpu/GrTraceMarker.cpp
@@ -46,7 +46,7 @@
////////////////////////////////////////////////////////////////////////////////
GrTraceMarkerSet::GrTraceMarkerSet(const GrTraceMarkerSet& other) {
- this->addSet(other);
+ this->addSet(other);
}
void GrTraceMarkerSet::add(const GrGpuTraceMarker& marker) {
@@ -114,4 +114,3 @@
GrTraceMarkerSet::Iter GrTraceMarkerSet::end() const {
return Iter(this, this->fMarkerArray.count());
}
-
diff --git a/src/gpu/GrTraceMarker.h b/src/gpu/GrTraceMarker.h
index 38e87fd..7cc2f7f 100644
--- a/src/gpu/GrTraceMarker.h
+++ b/src/gpu/GrTraceMarker.h
@@ -39,7 +39,7 @@
GrTraceMarkerSet(const GrTraceMarkerSet& other);
// Adds marker to the set.
- void add(const GrGpuTraceMarker& marker);
+ void add(const GrGpuTraceMarker& marker);
// Adds all markers from one set into this set.
void addSet(const GrTraceMarkerSet& markerSet);
@@ -53,7 +53,7 @@
* marker string used in the TraceMarker and the (#,#,..) is a list of instance
* id's for the the given marker string
*/
- SkString toString() const;
+ SkString toString() const;
class Iter;
@@ -66,4 +66,3 @@
};
#endif
-
diff --git a/src/gpu/GrTracing.h b/src/gpu/GrTracing.h
index 4a79f25..cfce039 100644
--- a/src/gpu/GrTracing.h
+++ b/src/gpu/GrTracing.h
@@ -63,4 +63,3 @@
#endif
-
diff --git a/src/utils/debugger/SkDrawCommand.cpp b/src/utils/debugger/SkDrawCommand.cpp
index f10f1e8..079961a 100644
--- a/src/utils/debugger/SkDrawCommand.cpp
+++ b/src/utils/debugger/SkDrawCommand.cpp
@@ -213,7 +213,7 @@
return true;
}
-SkClipRegionCommand::SkClipRegionCommand(const SkRegion& region, SkRegion::Op op)
+SkClipRegionCommand::SkClipRegionCommand(const SkRegion& region, SkRegion::Op op)
: INHERITED(CLIP_REGION) {
fRegion = region;
fOp = op;
@@ -241,7 +241,7 @@
canvas->clipRect(fRect, fOp, fDoAA);
}
-SkClipRRectCommand::SkClipRRectCommand(const SkRRect& rrect, SkRegion::Op op, bool doAA)
+SkClipRRectCommand::SkClipRRectCommand(const SkRRect& rrect, SkRegion::Op op, bool doAA)
: INHERITED(CLIP_RRECT) {
fRRect = rrect;
fOp = op;
@@ -273,7 +273,7 @@
}
SkDrawBitmapCommand::SkDrawBitmapCommand(const SkBitmap& bitmap, SkScalar left, SkScalar top,
- const SkPaint* paint)
+ const SkPaint* paint)
: INHERITED(DRAW_BITMAP) {
fBitmap = bitmap;
fLeft = left;
@@ -304,7 +304,7 @@
SkDrawBitmapMatrixCommand::SkDrawBitmapMatrixCommand(const SkBitmap& bitmap,
const SkMatrix& matrix,
- const SkPaint* paint)
+ const SkPaint* paint)
: INHERITED(DRAW_BITMAP_MATRIX) {
fBitmap = bitmap;
fMatrix = matrix;
@@ -332,7 +332,7 @@
}
SkDrawBitmapNineCommand::SkDrawBitmapNineCommand(const SkBitmap& bitmap, const SkIRect& center,
- const SkRect& dst, const SkPaint* paint)
+ const SkRect& dst, const SkPaint* paint)
: INHERITED(DRAW_BITMAP_NINE) {
fBitmap = bitmap;
fCenter = center;
@@ -363,7 +363,7 @@
SkDrawBitmapRectCommand::SkDrawBitmapRectCommand(const SkBitmap& bitmap, const SkRect* src,
const SkRect& dst, const SkPaint* paint,
- SkCanvas::DrawBitmapRectFlags flags)
+ SkCanvas::DrawBitmapRectFlags flags)
: INHERITED(DRAW_BITMAP_RECT_TO_RECT) {
fBitmap = bitmap;
if (NULL != src) {
@@ -401,7 +401,7 @@
return true;
}
-SkDrawDataCommand::SkDrawDataCommand(const void* data, size_t length)
+SkDrawDataCommand::SkDrawDataCommand(const void* data, size_t length)
: INHERITED(DRAW_DATA) {
fData = new char[length];
memcpy(fData, data, length);
@@ -434,7 +434,7 @@
fInfo.push(temp);
}
-SkEndCommentGroupCommand::SkEndCommentGroupCommand()
+SkEndCommentGroupCommand::SkEndCommentGroupCommand()
: INHERITED(END_COMMENT_GROUP) {
}
@@ -502,7 +502,7 @@
return true;
}
-SkDrawPictureCommand::SkDrawPictureCommand(SkPicture& picture)
+SkDrawPictureCommand::SkDrawPictureCommand(SkPicture& picture)
: INHERITED(DRAW_PICTURE)
, fPicture(picture) {
SkString* temp = new SkString;