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/src/animator/SkAnimator.cpp b/src/animator/SkAnimator.cpp
index c1fba65..5d1f220 100644
--- a/src/animator/SkAnimator.cpp
+++ b/src/animator/SkAnimator.cpp
@@ -34,7 +34,7 @@
#define _static static
#endif
-_static const char gMathPrimerText[] =
+_static const char gMathPrimerText[] =
"<screenplay>"
"<Math id=\"Math\"/>"
"<Number id=\"Number\"/>"
@@ -108,9 +108,9 @@
state.fX = x;
state.fY = y;
fMaker->fEnableTime = fMaker->getAppTime();
- bool result = fMaker->fEvents.doEvent(*fMaker,
- clickState == 0 ? SkDisplayEvent::kMouseDown :
- clickState == 1 ? SkDisplayEvent::kMouseDrag :
+ bool result = fMaker->fEvents.doEvent(*fMaker,
+ clickState == 0 ? SkDisplayEvent::kMouseDown :
+ clickState == 1 ? SkDisplayEvent::kMouseDrag :
SkDisplayEvent::kMouseUp, &state);
fMaker->notifyInval();
return result;
@@ -160,7 +160,7 @@
SkPaint paint;
return draw(canvas, &paint, time);
}
-
+
#ifdef SK_DEBUG
void SkAnimator::eventDone(const SkEvent& ) {
}
@@ -231,7 +231,7 @@
return info->getArrayValue(element, index, operand);
}
-int32_t SkAnimator::getArrayInt(const SkDisplayable* ae,
+int32_t SkAnimator::getArrayInt(const SkDisplayable* ae,
const SkMemberInfo* ai, int index) {
SkOperand operand;
bool result = getArrayCommon(ae, ai, index, &operand, SkType_Int);
@@ -248,7 +248,7 @@
return getArrayInt(element, field, index);
}
-SkScalar SkAnimator::getArrayScalar(const SkDisplayable* ae,
+SkScalar SkAnimator::getArrayScalar(const SkDisplayable* ae,
const SkMemberInfo* ai, int index) {
SkOperand operand;
bool result = getArrayCommon(ae, ai, index, &operand, SkType_Float);
@@ -265,7 +265,7 @@
return getArrayScalar(element, field, index);
}
-const char* SkAnimator::getArrayString(const SkDisplayable* ae,
+const char* SkAnimator::getArrayString(const SkDisplayable* ae,
const SkMemberInfo* ai, int index) {
SkOperand operand;
bool result = getArrayCommon(ae, ai, index, &operand, SkType_String);
@@ -360,7 +360,7 @@
return getScalar(element, field);
}
-const char* SkAnimator::getString(const SkDisplayable* ae,
+const char* SkAnimator::getString(const SkDisplayable* ae,
const SkMemberInfo* ai) {
const SkDisplayable* element = (const SkDisplayable*) ae;
const SkMemberInfo* info = (const SkMemberInfo*) ai;
@@ -501,11 +501,11 @@
}
SkEventSinkID SkAnimator::getHostEventSinkID() const {
- return fMaker->fHostEventSinkID;
+ return fMaker->fHostEventSinkID;
}
void SkAnimator::setHostEventSinkID(SkEventSinkID target) {
- fMaker->fHostEventSinkID = target;
+ fMaker->fHostEventSinkID = target;
}
void SkAnimator::onSetHostHandler(Handler ) {
@@ -530,7 +530,7 @@
SkTypedArray tArray(SkType_Int);
tArray.setCount(num);
for (int i = 0; i < num; i++) {
- SkOperand op;
+ SkOperand op;
op.fS32 = array[i];
tArray[i] = op;
}
@@ -546,7 +546,7 @@
SkDisplayTypes type = element->getType();
if (type == SkType_Array) {
SkDisplayArray* dispArray = (SkDisplayArray*) element;
- dispArray->values = array;
+ dispArray->values = array;
return true;
}
else
@@ -614,9 +614,9 @@
return setScalar(element, field, scalar);
}
-bool SkAnimator::setString(SkDisplayable* element,
+bool SkAnimator::setString(SkDisplayable* element,
const SkMemberInfo* info, const char* str) {
- // !!! until this is fixed, can't call script with global references from here
+ // !!! until this is fixed, can't call script with global references from here
info->setValue(*fMaker, NULL, 0, info->fCount, element, info->getType(), str, strlen(str));
return true;
}