Result of running tools/sanitize_source_files.py (which was added in https://codereview.appspot.com/6465078/)
This CL is part II of IV (I broke down the 1280 files into 4 CLs).
Review URL: https://codereview.appspot.com/6474054
git-svn-id: http://skia.googlecode.com/svn/trunk@5263 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/experimental/Debugger/DebuggerCommandsView.cpp b/experimental/Debugger/DebuggerCommandsView.cpp
index bd1fe03..735c808 100644
--- a/experimental/Debugger/DebuggerCommandsView.cpp
+++ b/experimental/Debugger/DebuggerCommandsView.cpp
@@ -12,7 +12,7 @@
fTopIndex = 0;
fHighlight = 0;
fResizing = false;
-
+
SkPaint p;
p.setTextSize(SkIntToScalar(SKDEBUGGER_TEXTSIZE));
fSpacing = p.getFontSpacing();
@@ -42,7 +42,7 @@
if (!fCentered || fHighlight < fRange/2 || fHighlight > (fList.count() - fRange/2)) {
return;
} else {
- if (fHighlight > (fTopIndex + fRange/2))
+ if (fHighlight > (fTopIndex + fRange/2))
fTopIndex += fHighlight - (fTopIndex + fRange/2);
if (fHighlight < (fTopIndex + fRange/2))
fTopIndex -= (fTopIndex + fRange/2) - fHighlight;
@@ -115,30 +115,30 @@
void DebuggerCommandsView::onDraw(SkCanvas* canvas) {
canvas->drawColor(fBGColor);
-
+
SkPaint p;
p.setTextSize(SkIntToScalar(SKDEBUGGER_TEXTSIZE));
p.setAntiAlias(true);
-
+
//draw highlight
int selected = fHighlight - fTopIndex;
SkRect r = {0, fSpacing * selected, this->width(), fSpacing * (selected+1)};
p.setColor(SKDEBUGGER_HIGHLIGHTCOLOR);
canvas->drawRect(r, p);
-
- int endIndex = fTopIndex + fRange;
+
+ int endIndex = fTopIndex + fRange;
if (endIndex > fList.count())
endIndex = fList.count();
-
+
p.setColor(SKDEBUGGER_TEXTCOLOR);
int pos;
for (int i = fTopIndex; i < endIndex; ++i) {
pos = i - fTopIndex;
- canvas->drawText(fList[i]->c_str(), fList[i]->size(),
+ canvas->drawText(fList[i]->c_str(), fList[i]->size(),
0, fSpacing - 2 + fSpacing * pos, p);
}
p.setColor(SKDEBUGGER_RESIZEBARCOLOR);
- r = SkRect::MakeXYWH(this->width() - SKDEBUGGER_RESIZEBARSIZE, 0,
+ r = SkRect::MakeXYWH(this->width() - SKDEBUGGER_RESIZEBARSIZE, 0,
SKDEBUGGER_RESIZEBARSIZE, this->height());
canvas->drawRect(r, p);
}
diff --git a/experimental/Debugger/DebuggerContentView.cpp b/experimental/Debugger/DebuggerContentView.cpp
index 27fc8c6..02ea404 100644
--- a/experimental/Debugger/DebuggerContentView.cpp
+++ b/experimental/Debugger/DebuggerContentView.cpp
@@ -11,44 +11,44 @@
fCommandsResizing = false;
fStateVisible = true;
fStateResizing = false;
-
+
fCommands = new DebuggerCommandsView;
fCommands->setVisibleP(fCommandsVisible);
this->attachChildToFront(fCommands)->unref();
-
+
fState = new DebuggerStateView;
fState->setVisibleP(fStateVisible);
this->attachChildToFront(fState)->unref();
-
+
fAtomsToRead = 0;
fDisplayClip = false;
-
- fDumper = new SkDebugDumper(this->getSinkID(), fCommands->getSinkID(),
+
+ fDumper = new SkDebugDumper(this->getSinkID(), fCommands->getSinkID(),
fState->getSinkID());
-
+
fDumper->unload();
fAtomBounds.reset();
fFrameBounds.reset();
-
+
SkDumpCanvas* dumpCanvas = new SkDumpCanvas(fDumper);
SkGPipeReader* dumpReader = new SkGPipeReader(dumpCanvas);
-
+
if (size > 0) {
int offset = 0;
int frameBound = 0;
size_t bytesRead;
while (static_cast<unsigned>(offset) < size) {
- SkGPipeReader::Status s = dumpReader->playback(data + offset,
- size - offset,
- &bytesRead,
+ SkGPipeReader::Status s = dumpReader->playback(data + offset,
+ size - offset,
+ &bytesRead,
true);
SkASSERT(SkGPipeReader::kError_Status != s);
offset += bytesRead;
-
+
if (SkGPipeReader::kDone_Status == s) {
- fDumper->dump(dumpCanvas, SkDumpCanvas::kNULL_Verb,
+ fDumper->dump(dumpCanvas, SkDumpCanvas::kNULL_Verb,
"End of Frame", NULL);
delete dumpReader;
delete dumpCanvas;
@@ -60,34 +60,34 @@
fFrameBounds.append(1, &frameBound);
}
}
-
+
delete dumpReader;
delete dumpCanvas;
-
+
fDumper->load();
}
-
+
~DebuggerView() {
fAtomBounds.reset();
fFrameBounds.reset();
delete fDumper;
}
-
+
virtual void requestMenu(SkOSMenu* menu) {
menu->setTitle("Debugger");
menu->appendSwitch("Show Commands", "Commands", this->getSinkID(), fCommandsVisible);
menu->appendSwitch("Show State", "State", this->getSinkID(), fStateVisible);
menu->appendSwitch("Display Clip", "Clip", this->getSinkID(), fDisplayClip);
}
-
-
+
+
void goToAtom(int atom) {
if (atom != fAtomsToRead) {
fAtomsToRead = atom;
this->inval(NULL);
}
}
-
+
protected:
virtual bool onQuery(SkEvent* evt) {
if (SampleCode::TitleQ(*evt)) {
@@ -99,7 +99,7 @@
}
return this->INHERITED::onQuery(evt);
}
-
+
virtual bool onEvent(const SkEvent& evt) {
if (SkOSMenu::FindSwitchState(evt, "Commands", &fCommandsVisible) ||
SkOSMenu::FindSwitchState(evt, "State", &fStateVisible)) {
@@ -117,13 +117,13 @@
}
return this->INHERITED::onEvent(evt);
}
-
+
virtual void onDrawContent(SkCanvas* canvas) {
if (fData.count() <= 0)
return;
SkAutoCanvasRestore acr(canvas, true);
canvas->translate(fStateOffset, 0);
-
+
int lastFrameBound = fFrameBounds[fAtomsToRead];
int toBeRead = fAtomBounds[fAtomsToRead] - lastFrameBound;
int firstChunk = (fAtomsToRead > 0) ? fAtomBounds[fAtomsToRead - 1] - lastFrameBound: 0;
@@ -132,7 +132,7 @@
SkGPipeReader* dumpReader = new SkGPipeReader(dumpCanvas);
SkGPipeReader* reader = new SkGPipeReader(canvas);
fDumper->disable();
-
+
int offset = 0;
size_t bytesRead;
SkGPipeReader::Status s;
@@ -163,7 +163,7 @@
delete reader;
delete dumpReader;
delete dumpCanvas;
-
+
if (fDisplayClip) {
SkPaint p;
p.setColor(0x440000AA);
@@ -173,11 +173,11 @@
}
}
}
-
+
virtual SkView::Click* onFindClickHandler(SkScalar x, SkScalar y) {
return new Click(this);
}
-
+
virtual bool onClick(SkView::Click* click) {
SkPoint prev = click->fPrev;
SkPoint curr = click->fCurr;
@@ -195,7 +195,7 @@
fAtomsToRead = fCommands->selectHighlight(
SkScalarFloorToInt(curr.fY));
}
- else
+ else
handled = false;
break;
case SkView::Click::kMoved_State:
@@ -220,7 +220,7 @@
default:
break;
}
-
+
fStateOffset = fCommands->width();
fState->setSize(this->width() - fStateOffset, fState->height());
fState->setLoc(fStateOffset, this->height() - fState->height());
@@ -228,7 +228,7 @@
this->inval(NULL);
return handled;
}
-
+
virtual void onSizeChange() {
this->INHERITED::onSizeChange();
fCommands->setSize(CMD_WIDTH, this->height());
@@ -236,7 +236,7 @@
fState->setSize(this->width() - CMD_WIDTH, SkFloatToScalar(INFO_HEIGHT));
fState->setLoc(CMD_WIDTH, this->height() - SkFloatToScalar(INFO_HEIGHT));
}
-
+
private:
DebuggerCommandsView* fCommands;
DebuggerStateView* fState;
@@ -251,7 +251,7 @@
SkTDArray<int> fFrameBounds;
SkTDArray<char> fData;
SkDebugDumper* fDumper;
-
+
typedef SampleView INHERITED;
};
@@ -264,5 +264,5 @@
bool is_debugger(SkView* view) {
SkEvent isDebugger(gIsDebuggerQuery);
- return view->doQuery(&isDebugger);
+ return view->doQuery(&isDebugger);
}
diff --git a/experimental/Debugger/DebuggerStateView.cpp b/experimental/Debugger/DebuggerStateView.cpp
index aaf6fb5..27befcb 100644
--- a/experimental/Debugger/DebuggerStateView.cpp
+++ b/experimental/Debugger/DebuggerStateView.cpp
@@ -18,7 +18,7 @@
if (evt.isType(SKDEBUGGER_STATETYPE)) {
fMatrix = evt.findString(SKDEBUGGER_MATRIX);
fClip = evt.findString(SKDEBUGGER_CLIP);
-
+
SkPaint* ptr;
if (evt.getMetaData().findPtr(SKDEBUGGER_PAINT, (void**)&ptr)) {
fPaint = *ptr;
@@ -32,7 +32,7 @@
void DebuggerStateView::onDraw(SkCanvas* canvas) {
canvas->drawColor(fBGColor);
-
+
//Display Current Paint
SkRect r = {10, 20, 40, 50};
canvas->drawRect(r, fPaint);
@@ -44,7 +44,7 @@
canvas->drawText(fPaintInfo.c_str(), fPaintInfo.size(), x, 30, p);
canvas->drawText(fMatrix.c_str(), fMatrix.size(), x, 60, p);
canvas->drawText(fClip.c_str(), fClip.size(), x, 90, p);
-
+
p.setColor(SKDEBUGGER_RESIZEBARCOLOR);
r = SkRect::MakeXYWH(0, 0, this->width(), SKDEBUGGER_RESIZEBARSIZE);
canvas->drawRect(r, p);
diff --git a/experimental/Debugger/DebuggerViews.h b/experimental/Debugger/DebuggerViews.h
index f025c79..c63283f 100644
--- a/experimental/Debugger/DebuggerViews.h
+++ b/experimental/Debugger/DebuggerViews.h
@@ -37,7 +37,7 @@
class DebuggerStateView : public SkView {
public:
DebuggerStateView();
-
+
protected:
virtual bool onEvent(const SkEvent& evt);
virtual void onDraw(SkCanvas* canvas);
@@ -65,7 +65,7 @@
void highlight(int index);
int selectHighlight(int ypos);
void toggleCentered();
-
+
protected:
virtual bool onEvent(const SkEvent& evt);
virtual void onSizeChange();
@@ -87,7 +87,7 @@
static void* PaintProc(void* ptr, bool doRef) {
SkPaint* p = (SkPaint*) ptr;
-
+
if (doRef) {
return new SkPaint(*p);
}
@@ -95,6 +95,6 @@
delete p;
return NULL;
}
-
+
}
diff --git a/experimental/Debugger/SkDebugDumper.cpp b/experimental/Debugger/SkDebugDumper.cpp
index 69b1896..cfda184 100644
--- a/experimental/Debugger/SkDebugDumper.cpp
+++ b/experimental/Debugger/SkDebugDumper.cpp
@@ -16,7 +16,7 @@
#include "SkMaskFilter.h"
#include "DebuggerViews.h"
-SkDebugDumper::SkDebugDumper(SkEventSinkID cID, SkEventSinkID clID,
+SkDebugDumper::SkDebugDumper(SkEventSinkID cID, SkEventSinkID clID,
SkEventSinkID ipID) {
fContentID = cID;
fCommandsID = clID;
@@ -43,17 +43,17 @@
SkString str;
SkMatrix m = canvas->getTotalMatrix();
str.append("Matrix:");
- str.appendf("Translate (%0.4g, %0.4g) ",
- SkScalarToFloat(m.get(SkMatrix::kMTransX)),
+ str.appendf("Translate (%0.4g, %0.4g) ",
+ SkScalarToFloat(m.get(SkMatrix::kMTransX)),
SkScalarToFloat(m.get(SkMatrix::kMTransY)));
- str.appendf("Scale (%0.4g, %0.4g) ",
- SkScalarToFloat(m.get(SkMatrix::kMScaleX)),
+ str.appendf("Scale (%0.4g, %0.4g) ",
+ SkScalarToFloat(m.get(SkMatrix::kMScaleX)),
SkScalarToFloat(m.get(SkMatrix::kMScaleY)));
- str.appendf("Skew (%0.4g, %0.4g) ",
- SkScalarToFloat(m.get(SkMatrix::kMSkewX)),
+ str.appendf("Skew (%0.4g, %0.4g) ",
+ SkScalarToFloat(m.get(SkMatrix::kMSkewX)),
SkScalarToFloat(m.get(SkMatrix::kMSkewY)));
- str.appendf("Perspective (%0.4g, %0.4g, %0.4g) ",
- SkScalarToFloat(SkPerspToScalar(m.get(SkMatrix::kMPersp0))),
+ str.appendf("Perspective (%0.4g, %0.4g, %0.4g) ",
+ SkScalarToFloat(SkPerspToScalar(m.get(SkMatrix::kMPersp0))),
SkScalarToFloat(SkPerspToScalar(m.get(SkMatrix::kMPersp1))),
SkScalarToFloat(SkPerspToScalar(m.get(SkMatrix::kMPersp2))));
return str;
@@ -67,7 +67,7 @@
if (canvas->getTotalClip().getBoundaryPath(&p)) {
SkPoint pts[maxPts];
int numPts = p.getPoints(pts, maxPts);
-
+
str.append("Clip: [ ");
for (int i = 0; i < numPts; ++i) {
str.appendf("(%0.4g, %0.4g)", pts[i].x(), pts[i].y());
@@ -99,7 +99,7 @@
static SkString dumpPaint(SkDumpCanvas* canvas, const SkPaint* p,
SkDumpCanvas::Verb verb) {
SkString str;
- str.appendf("Color: #%08X\n", p->getColor());
+ str.appendf("Color: #%08X\n", p->getColor());
str.appendf("Flags: %s\n", gPaintFlags[p->getFlags()]);
appendFlattenable(&str, p->getShader(), "shader");
appendFlattenable(&str, p->getXfermode(), "xfermode");
@@ -107,26 +107,26 @@
appendFlattenable(&str, p->getMaskFilter(), "maskFilter");
appendFlattenable(&str, p->getPathEffect(), "pathEffect");
appendFlattenable(&str, p->getColorFilter(), "filter");
-
+
if (SkDumpCanvas::kDrawText_Verb == verb) {
str.appendf("Text Size:%0.4g\n", SkScalarToFloat(p->getTextSize()));
appendPtr(&str, p->getTypeface(), "typeface");
}
-
+
return str;
}
void SkDebugDumper::dump(SkDumpCanvas* canvas, SkDumpCanvas::Verb verb,
- const char str[], const SkPaint* p) {
+ const char str[], const SkPaint* p) {
if (!fDisabled) {
SkString msg, tab;
-
+
const int level = canvas->getNestLevel() + canvas->getSaveCount() - 1;
SkASSERT(level >= 0);
for (int i = 0; i < level; i++) {
tab.append("| ");
}
-
+
msg.appendf("%03d: %s%s\n", fCount, tab.c_str(), str);
++fCount;
if (!fInit) {
diff --git a/experimental/Debugger/SkDebugDumper.h b/experimental/Debugger/SkDebugDumper.h
index fdc7e0f..e7d6956 100644
--- a/experimental/Debugger/SkDebugDumper.h
+++ b/experimental/Debugger/SkDebugDumper.h
@@ -20,7 +20,7 @@
// the function pointer that was passed to the constructor
virtual void dump(SkDumpCanvas*, SkDumpCanvas::Verb, const char str[],
const SkPaint*);
-
+
void load() { fInit = true; };
void unload() { fInit = false; fCount = 0;};
void disable() { fDisabled = true; };
@@ -32,7 +32,7 @@
SkEventSinkID fContentID;
SkEventSinkID fCommandsID;
SkEventSinkID fStateID;
-
+
typedef SkDumpCanvas::Dumper INHERITED;
};
#endif