Result of running tools/sanitize_source_files.py (which was added in https://codereview.appspot.com/6465078/)
This CL is part I of IV (I broke down the 1280 files into 4 CLs).
Review URL: https://codereview.appspot.com/6485054
git-svn-id: http://skia.googlecode.com/svn/trunk@5262 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/include/utils/SkBoundaryPatch.h b/include/utils/SkBoundaryPatch.h
index 7997cf8..89060a6 100644
--- a/include/utils/SkBoundaryPatch.h
+++ b/include/utils/SkBoundaryPatch.h
@@ -49,7 +49,7 @@
class SkLineBoundary : public SkBoundary {
public:
SkPoint fPts[4];
-
+
// override
virtual SkPoint eval(Edge, SkScalar);
};
@@ -58,7 +58,7 @@
public:
// the caller sets the first 12 entries. The 13th is used by the impl.
SkPoint fPts[13];
-
+
// override
virtual SkPoint eval(Edge, SkScalar);
};
diff --git a/include/utils/SkCamera.h b/include/utils/SkCamera.h
index d3bddaa..6527c32 100644
--- a/include/utils/SkCamera.h
+++ b/include/utils/SkCamera.h
@@ -55,7 +55,7 @@
struct SkMatrix3D {
SkScalar fMat[3][4];
-
+
void reset();
void setRow(int row, SkScalar a, SkScalar b, SkScalar c, SkScalar d = 0)
@@ -71,7 +71,7 @@
void setRotateY(SkScalar deg);
void setRotateZ(SkScalar deg);
void setTranslate(SkScalar x, SkScalar y, SkScalar z);
-
+
void preRotateX(SkScalar deg);
void preRotateY(SkScalar deg);
void preRotateZ(SkScalar deg);
@@ -113,7 +113,7 @@
public: // make public for SkDraw3D for now
SkVector3D fU, fV;
SkPoint3D fOrigin;
-
+
friend class SkCamera3D;
};
@@ -161,7 +161,7 @@
void applyToCanvas(SkCanvas*) const;
SkScalar dotWithNormal(SkScalar dx, SkScalar dy, SkScalar dz) const;
-
+
private:
struct Rec {
Rec* fNext;
diff --git a/include/utils/SkCullPoints.h b/include/utils/SkCullPoints.h
index 5458b29..fafa0fc 100644
--- a/include/utils/SkCullPoints.h
+++ b/include/utils/SkCullPoints.h
@@ -16,13 +16,13 @@
public:
SkCullPoints();
SkCullPoints(const SkIRect& r);
-
+
void reset(const SkIRect& r);
-
+
/** Start a contour at (x,y). Follow this with call(s) to lineTo(...)
*/
void moveTo(int x, int y);
-
+
enum LineToResult {
kNo_Result, //!< line segment was completely clipped out
kLineTo_Result, //!< path.lineTo(pts[1]);
@@ -37,7 +37,7 @@
SkIPoint fAsQuad[4]; // cache of fR as 4 points
SkIPoint fPrevPt; // private state
LineToResult fPrevResult; // private state
-
+
bool sect_test(int x0, int y0, int x1, int y1) const;
};
@@ -56,7 +56,7 @@
SkCullPointsPath(const SkIRect& r, SkPath* dst);
void reset(const SkIRect& r, SkPath* dst);
-
+
void moveTo(int x, int y);
void lineTo(int x, int y);
diff --git a/include/utils/SkDeferredCanvas.h b/include/utils/SkDeferredCanvas.h
index ff32351..8779df9 100644
--- a/include/utils/SkDeferredCanvas.h
+++ b/include/utils/SkDeferredCanvas.h
@@ -47,7 +47,7 @@
/**
* Specify a NotificationClient to be used by this canvas. Calling
- * setNotificationClient will release the previously set
+ * setNotificationClient will release the previously set
* NotificationClient, if any. SkDeferredCanvas does not take ownership
* of the notification client. Therefore user code is resposible
* for its destruction. The notification client must be unregistered
@@ -75,7 +75,7 @@
bool isDeferredDrawing() const;
/**
- * Returns true if the canvas contains a fresh frame. A frame is
+ * Returns true if the canvas contains a fresh frame. A frame is
* considered fresh when its content do not depend on the contents
* of the previous frame. For example, if a canvas is cleared before
* drawing each frame, the frames will all be considered fresh.
@@ -181,7 +181,7 @@
/**
* Called after a recording a draw command if additional memory
* had to be allocated for recording.
- * @param newAllocatedStorage same value as would be returned by
+ * @param newAllocatedStorage same value as would be returned by
* storageAllocatedForRecording(), for convenience.
*/
virtual void storageAllocatedForRecordingChanged(
@@ -191,7 +191,7 @@
* Called after pending draw commands have been flushed
*/
virtual void flushedDrawCommands() {}
-
+
private:
typedef SkRefCnt INHERITED;
};
diff --git a/include/utils/SkDumpCanvas.h b/include/utils/SkDumpCanvas.h
index 36c27ca..bae84c6 100644
--- a/include/utils/SkDumpCanvas.h
+++ b/include/utils/SkDumpCanvas.h
@@ -53,7 +53,7 @@
virtual void dump(SkDumpCanvas*, SkDumpCanvas::Verb, const char str[],
const SkPaint*) = 0;
-
+
private:
typedef SkRefCnt INHERITED;
};
diff --git a/include/utils/SkJSON.h b/include/utils/SkJSON.h
index 5268af5..c601fa8 100644
--- a/include/utils/SkJSON.h
+++ b/include/utils/SkJSON.h
@@ -23,9 +23,9 @@
kFloat,
kBool,
};
-
+
class Array;
-
+
class Object {
private:
struct Slot;
@@ -42,7 +42,7 @@
* not be null.
*/
void addObject(const char name[], Object* value);
-
+
/**
* Create a new slot with the specified name and value. The name
* parameter is copied, but ownership of the Array parameter is
@@ -50,26 +50,26 @@
* not be null.
*/
void addArray(const char name[], Array* value);
-
+
/**
* Create a new slot with the specified name and value. Both parameters
* are copied. The value parameter may be null, but the name must
* not be null.
*/
void addString(const char name[], const char value[]);
-
+
/**
* Create a new slot with the specified name and value. The name
* parameter is copied, and must not be null.
*/
void addInt(const char name[], int32_t value);
-
+
/**
* Create a new slot with the specified name and value. The name
* parameter is copied, and must not be null.
*/
void addFloat(const char name[], float value);
-
+
/**
* Create a new slot with the specified name and value. The name
* parameter is copied, and must not be null.
@@ -108,7 +108,7 @@
class Iter {
public:
Iter(const Object&);
-
+
/**
* Returns true when there are no more entries in the iterator.
* In this case, no other methods should be called.
@@ -126,43 +126,43 @@
* if done() returns false.
*/
Type type() const;
-
+
/**
* Returns the name of the current element. Should only be called
* if done() returns false.
*/
const char* name() const;
-
+
/**
* Returns the type of the current element. Should only be called
* if done() returns false and type() returns kObject.
*/
Object* objectValue() const;
-
+
/**
* Returns the type of the current element. Should only be called
* if done() returns false and type() returns kArray.
*/
Array* arrayValue() const;
-
+
/**
* Returns the type of the current element. Should only be called
* if done() returns false and type() returns kString.
*/
const char* stringValue() const;
-
+
/**
* Returns the type of the current element. Should only be called
* if done() returns false and type() returns kInt.
*/
int32_t intValue() const;
-
+
/**
* Returns the type of the current element. Should only be called
* if done() returns false and type() returns kFloat.
*/
float floatValue() const;
-
+
/**
* Returns the type of the current element. Should only be called
* if done() returns false and type() returns kBool.
@@ -176,14 +176,14 @@
private:
Slot* fHead;
Slot* fTail;
-
+
const Slot* findSlot(const char name[], Type) const;
Slot* addSlot(Slot*);
void dumpLevel(int level) const;
-
+
friend class Array;
};
-
+
class Array {
public:
/**
@@ -197,22 +197,22 @@
* values.
*/
Array(const int32_t values[], int count);
-
+
/**
* Creates an array of floats, initialized by copying the specified
* values.
*/
Array(const float values[], int count);
-
+
/**
* Creates an array of bools, initialized by copying the specified
* values.
*/
Array(const bool values[], int count);
-
+
Array(const Array&);
~Array();
-
+
int count() const { return fCount; }
Type type() const { return fType; }
@@ -222,7 +222,7 @@
* Should only be called if the Array's type is kObject.
*/
void setObject(int index, Object*);
-
+
/**
* Replace the element at the specified index with the specified
* Array (which may be null). Ownership of the Array is transferred.
@@ -274,10 +274,10 @@
float* fFloats;
bool* fBools;
} fArray;
-
+
void init(Type, int count, const void* src);
void dumpLevel(int level) const;
-
+
friend class Object;
};
};
diff --git a/include/utils/SkMeshUtils.h b/include/utils/SkMeshUtils.h
index c7cdeca..564df67 100644
--- a/include/utils/SkMeshUtils.h
+++ b/include/utils/SkMeshUtils.h
@@ -19,7 +19,7 @@
public:
SkMeshIndices();
~SkMeshIndices();
-
+
bool init(int texW, int texH, int rows, int cols) {
return this->init(NULL, NULL, texW, texH, rows, cols);
}
diff --git a/include/utils/SkNinePatch.h b/include/utils/SkNinePatch.h
index b0ea46b..4d8788b 100644
--- a/include/utils/SkNinePatch.h
+++ b/include/utils/SkNinePatch.h
@@ -22,7 +22,7 @@
static void DrawNine(SkCanvas* canvas, const SkRect& dst,
const SkBitmap& bitmap, const SkIRect& margins,
const SkPaint* paint = NULL);
-
+
static void DrawMesh(SkCanvas* canvas, const SkRect& dst,
const SkBitmap& bitmap,
const int32_t xDivs[], int numXDivs,
diff --git a/include/utils/ios/SkStream_NSData.h b/include/utils/ios/SkStream_NSData.h
index 0829a4f..8e6f064 100755
--- a/include/utils/ios/SkStream_NSData.h
+++ b/include/utils/ios/SkStream_NSData.h
@@ -30,7 +30,7 @@
public:
SkStream_NSData(NSData* data);
virtual ~SkStream_NSData();
-
+
static SkStream_NSData* CreateFromResource(const char name[],
const char suffix[]);
diff --git a/include/utils/win/SkIStream.h b/include/utils/win/SkIStream.h
index b7d0949..e4e045c 100644
--- a/include/utils/win/SkIStream.h
+++ b/include/utils/win/SkIStream.h
@@ -46,24 +46,24 @@
// IStream Interface
public:
virtual HRESULT STDMETHODCALLTYPE SetSize(ULARGE_INTEGER);
-
+
virtual HRESULT STDMETHODCALLTYPE CopyTo(IStream*
, ULARGE_INTEGER
, ULARGE_INTEGER*
, ULARGE_INTEGER*);
-
+
virtual HRESULT STDMETHODCALLTYPE Commit(DWORD);
-
+
virtual HRESULT STDMETHODCALLTYPE Revert(void);
-
+
virtual HRESULT STDMETHODCALLTYPE LockRegion(ULARGE_INTEGER
, ULARGE_INTEGER
, DWORD);
-
+
virtual HRESULT STDMETHODCALLTYPE UnlockRegion(ULARGE_INTEGER
, ULARGE_INTEGER
, DWORD);
-
+
virtual HRESULT STDMETHODCALLTYPE Clone(IStream **);
virtual HRESULT STDMETHODCALLTYPE Seek(LARGE_INTEGER liDistanceToMove
diff --git a/include/utils/win/SkTScopedComPtr.h b/include/utils/win/SkTScopedComPtr.h
index 14aace5..85c314a 100644
--- a/include/utils/win/SkTScopedComPtr.h
+++ b/include/utils/win/SkTScopedComPtr.h
@@ -47,13 +47,13 @@
this->fPtr = NULL;
}
}
-
+
void swap(SkTScopedComPtr<T>& that) {
T* temp = this->fPtr;
this->fPtr = that.fPtr;
that.fPtr = temp;
}
-
+
T* release() {
T* temp = this->fPtr;
this->fPtr = NULL;