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@13961 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
skia.committer@gmail.com 2014-03-27 03:02:48 +00:00
parent 787227d356
commit db35dab49e
7 changed files with 28 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debugger/QT/SkDebuggerGUI.cpp
View File

@ -141,7 +141,7 @@ void SkDebuggerGUI::actionBreakpoints() {
void SkDebuggerGUI::actionToggleIndexStyle() {
fIndexStyleToggle = !fIndexStyleToggle;
SkListWidget* list = (SkListWidget*) fListWidget.itemDelegate();
list->setIndexStyle(fIndexStyleToggle ? SkListWidget::kIndex_IndexStyle :
list->setIndexStyle(fIndexStyleToggle ? SkListWidget::kIndex_IndexStyle :
SkListWidget::kOffset_IndexStyle);
fListWidget.update();
}

28
src/core/SkPictureStateTree.cpp
View File

@ -104,16 +104,16 @@ uint32_t SkPictureStateTree::Iterator::draw() {
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 @@ uint32_t SkPictureStateTree::Iterator::draw() {
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 @@ uint32_t SkPictureStateTree::Iterator::draw() {
}
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;

2
src/gpu/GrDrawTarget.h
View File

@ -505,7 +505,7 @@ public:
const GrDeviceCoordTexture* dstCopy) {
this->onDrawPaths(pathCount, paths, transforms, fill, stroke, dstCopy);
}
inline bool isGpuTracingEnabled() const {
return this->getContext()->isGpuTracingEnabled();
}

3
src/gpu/GrTraceMarker.cpp
View File

@ -46,7 +46,7 @@ private:
////////////////////////////////////////////////////////////////////////////////
GrTraceMarkerSet::GrTraceMarkerSet(const GrTraceMarkerSet& other) {
this->addSet(other);
this->addSet(other);
}
void GrTraceMarkerSet::add(const GrGpuTraceMarker& marker) {
@ -114,4 +114,3 @@ GrTraceMarkerSet::Iter GrTraceMarkerSet::begin() const {
GrTraceMarkerSet::Iter GrTraceMarkerSet::end() const {
return Iter(this, this->fMarkerArray.count());
}

5
src/gpu/GrTraceMarker.h
View File

@ -39,7 +39,7 @@ public:
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 @@ public:
* 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 @@ private:
};
#endif

1
src/gpu/GrTracing.h
View File

@ -63,4 +63,3 @@ private:
#endif

18
src/utils/debugger/SkDrawCommand.cpp
View File

@ -213,7 +213,7 @@ bool SkClipPathCommand::render(SkCanvas* canvas) const {
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 @@ void SkClipRectCommand::execute(SkCanvas* canvas) {
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 @@ void SkConcatCommand::execute(SkCanvas* canvas) {
}
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 @@ bool SkDrawBitmapCommand::render(SkCanvas* canvas) const {
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 @@ bool SkDrawBitmapMatrixCommand::render(SkCanvas* canvas) const {
}
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 @@ bool SkDrawBitmapNineCommand::render(SkCanvas* canvas) const {
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 @@ bool SkDrawBitmapRectCommand::render(SkCanvas* canvas) const {
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 @@ SkCommentCommand::SkCommentCommand(const char* kywd, const char* value)
fInfo.push(temp);
}
SkEndCommentGroupCommand::SkEndCommentGroupCommand()
SkEndCommentGroupCommand::SkEndCommentGroupCommand()
: INHERITED(END_COMMENT_GROUP) {
}
@ -502,7 +502,7 @@ bool SkDrawPathCommand::render(SkCanvas* canvas) const {
return true;
}
SkDrawPictureCommand::SkDrawPictureCommand(SkPicture& picture)
SkDrawPictureCommand::SkDrawPictureCommand(SkPicture& picture)
: INHERITED(DRAW_PICTURE)
, fPicture(picture) {
SkString* temp = new SkString;