aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/utils
diff options
context:
space:
mode:
authorGravatar vandebo@chromium.org <vandebo@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-01-28 01:45:11 +0000
committerGravatar vandebo@chromium.org <vandebo@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-01-28 01:45:11 +0000
commit74b461961607fa57a150a9282c410ef0cab38764 (patch)
tree9068e45d51d9176383feff3c5ead98060a654393 /include/utils
parent05e70247c31ae927074ef27ea9893634a8dda543 (diff)
Formatting cleanup: remove extra whitespace
Change by arthurhsu@chromium.org, original CL: http://codereview.appspot.com/5587049/ Review URL: https://codereview.appspot.com/5594043 git-svn-id: http://skia.googlecode.com/svn/trunk@3098 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/utils')
-rw-r--r--include/utils/SkDeferredCanvas.h22
-rw-r--r--include/utils/SkDumpCanvas.h28
-rw-r--r--include/utils/SkNWayCanvas.h6
-rw-r--r--include/utils/SkProxyCanvas.h10
4 files changed, 33 insertions, 33 deletions
diff --git a/include/utils/SkDeferredCanvas.h b/include/utils/SkDeferredCanvas.h
index 14951d944c..9eabb7bfdb 100644
--- a/include/utils/SkDeferredCanvas.h
+++ b/include/utils/SkDeferredCanvas.h
@@ -19,7 +19,7 @@
provided by SkPicture) is that this is a full drop-in replacement for
SkCanvas, while SkPictureRecord only supports draw operations.
SkDeferredCanvas will transparently trigger the flushing of deferred
- draw operations when an attempt is made to access the pixel data.
+ draw operations when an attempt is made to access the pixel data.
*/
class SK_API SkDeferredCanvas : public SkCanvas {
public:
@@ -53,12 +53,12 @@ public:
virtual SkDevice* setDevice(SkDevice* device);
/**
- * Specify a deviceContext to be used by this canvas. Calling
+ * Specify a deviceContext to be used by this canvas. Calling
* setDeviceContext will release the previously set deviceContext, if any.
* A deviceContext must be specified if the device uses a graphics context
- * that requires some form of state initialization prior to drawing
+ * that requires some form of state initialization prior to drawing
* and/or explicit flushing to synchronize the execution of rendering
- * operations.
+ * operations.
* Note: Must be called after the device is set with setDevice.
*
* @deviceContext interface for the device's the graphics context
@@ -102,7 +102,7 @@ public:
SK_OVERRIDE;
virtual void drawPath(const SkPath& path, const SkPaint& paint)
SK_OVERRIDE;
- virtual void drawBitmap(const SkBitmap& bitmap, SkScalar left,
+ virtual void drawBitmap(const SkBitmap& bitmap, SkScalar left,
SkScalar top, const SkPaint* paint)
SK_OVERRIDE;
virtual void drawBitmapRect(const SkBitmap& bitmap, const SkIRect* src,
@@ -119,7 +119,7 @@ public:
virtual void drawText(const void* text, size_t byteLength, SkScalar x,
SkScalar y, const SkPaint& paint) SK_OVERRIDE;
virtual void drawPosText(const void* text, size_t byteLength,
- const SkPoint pos[], const SkPaint& paint)
+ const SkPoint pos[], const SkPaint& paint)
SK_OVERRIDE;
virtual void drawPosTextH(const void* text, size_t byteLength,
const SkScalar xpos[], SkScalar constY,
@@ -192,8 +192,8 @@ public:
virtual int height() const SK_OVERRIDE;
virtual SkGpuRenderTarget* accessRenderTarget() SK_OVERRIDE;
- virtual SkDevice* onCreateCompatibleDevice(SkBitmap::Config config,
- int width, int height,
+ virtual SkDevice* onCreateCompatibleDevice(SkBitmap::Config config,
+ int width, int height,
bool isOpaque,
Usage usage) SK_OVERRIDE;
@@ -207,7 +207,7 @@ public:
SkCanvas::Config8888 config8888) SK_OVERRIDE;
// The following methods are no-ops on a deferred device
- virtual bool filterTextFlags(const SkPaint& paint, TextFlags*)
+ virtual bool filterTextFlags(const SkPaint& paint, TextFlags*)
SK_OVERRIDE
{return false;}
virtual void setMatrixClip(const SkMatrix&, const SkRegion&,
@@ -257,10 +257,10 @@ public:
virtual void drawPosTextOnPath(const SkDraw& draw, const void* text,
size_t len, const SkPoint pos[],
const SkPaint& paint,
- const SkPath& path,
+ const SkPath& path,
const SkMatrix* matrix)
{SkASSERT(0);}
- virtual void drawVertices(const SkDraw&, SkCanvas::VertexMode,
+ virtual void drawVertices(const SkDraw&, SkCanvas::VertexMode,
int vertexCount, const SkPoint verts[],
const SkPoint texs[], const SkColor colors[],
SkXfermode* xmode, const uint16_t indices[],
diff --git a/include/utils/SkDumpCanvas.h b/include/utils/SkDumpCanvas.h
index 5bfd6f6d61..de2af04af1 100644
--- a/include/utils/SkDumpCanvas.h
+++ b/include/utils/SkDumpCanvas.h
@@ -12,7 +12,7 @@
/** This class overrides all the draw methods on SkCanvas, and formats them
as text, and then sends that to a Dumper helper object.
-
+
Typical use might be to dump a display list to a log file to see what is
being drawn.
*/
@@ -22,17 +22,17 @@ public:
explicit SkDumpCanvas(Dumper* = 0);
virtual ~SkDumpCanvas();
-
+
enum Verb {
kNULL_Verb,
kSave_Verb,
kRestore_Verb,
-
+
kMatrix_Verb,
-
+
kClip_Verb,
-
+
kDrawPaint_Verb,
kDrawPoints_Verb,
kDrawRect_Verb,
@@ -43,7 +43,7 @@ public:
kDrawVertices_Verb,
kDrawData_Verb
};
-
+
/** Subclasses of this are installed on the DumpCanvas, and then called for
each drawing command.
*/
@@ -52,12 +52,12 @@ public:
virtual void dump(SkDumpCanvas*, SkDumpCanvas::Verb, const char str[],
const SkPaint*) = 0;
};
-
+
Dumper* getDumper() const { return fDumper; }
void setDumper(Dumper*);
-
+
int getNestLevel() const { return fNestLevel; }
-
+
virtual int save(SaveFlags) SK_OVERRIDE;
virtual int saveLayer(const SkRect* bounds, const SkPaint* paint,
SaveFlags) SK_OVERRIDE;
@@ -69,7 +69,7 @@ public:
virtual bool skew(SkScalar sx, SkScalar sy) SK_OVERRIDE;
virtual bool concat(const SkMatrix& matrix) SK_OVERRIDE;
virtual void setMatrix(const SkMatrix& matrix) SK_OVERRIDE;
-
+
virtual bool clipRect(const SkRect&, SkRegion::Op, bool) SK_OVERRIDE;
virtual bool clipPath(const SkPath&, SkRegion::Op, bool) SK_OVERRIDE;
virtual bool clipRegion(const SkRegion& deviceRgn,
@@ -109,7 +109,7 @@ public:
private:
Dumper* fDumper;
int fNestLevel; // for nesting recursive elements like pictures
-
+
void dump(Verb, const SkPaint*, const char format[], ...);
typedef SkCanvas INHERITED;
@@ -121,16 +121,16 @@ private:
class SkFormatDumper : public SkDumpCanvas::Dumper {
public:
SkFormatDumper(void (*)(const char text[], void* refcon), void* refcon);
-
+
// override from baseclass that does the formatting, and in turn calls
// the function pointer that was passed to the constructor
virtual void dump(SkDumpCanvas*, SkDumpCanvas::Verb, const char str[],
const SkPaint*) SK_OVERRIDE;
-
+
private:
void (*fProc)(const char*, void*);
void* fRefcon;
-
+
typedef SkDumpCanvas::Dumper INHERITED;
};
diff --git a/include/utils/SkNWayCanvas.h b/include/utils/SkNWayCanvas.h
index 4e39c6b252..69c1fcfcd9 100644
--- a/include/utils/SkNWayCanvas.h
+++ b/include/utils/SkNWayCanvas.h
@@ -15,7 +15,7 @@ class SkNWayCanvas : public SkCanvas {
public:
SkNWayCanvas();
virtual ~SkNWayCanvas();
-
+
void addCanvas(SkCanvas*);
void removeCanvas(SkCanvas*);
void removeAll();
@@ -70,10 +70,10 @@ public:
virtual SkBounder* setBounder(SkBounder*) SK_OVERRIDE;
virtual SkDrawFilter* setDrawFilter(SkDrawFilter*) SK_OVERRIDE;
-
+
private:
SkTDArray<SkCanvas*> fList;
-
+
class Iter;
typedef SkCanvas INHERITED;
diff --git a/include/utils/SkProxyCanvas.h b/include/utils/SkProxyCanvas.h
index e96b9b2dac..720436bc42 100644
--- a/include/utils/SkProxyCanvas.h
+++ b/include/utils/SkProxyCanvas.h
@@ -13,7 +13,7 @@
/** This class overrides all virtual methods on SkCanvas, and redirects them
to a "proxy", another SkCanvas instance. It can be the basis for
intercepting (and possibly modifying) calls to a canvas.
-
+
There must be a proxy installed before the proxycanvas can be used (i.e.
before its virtual methods can be called).
*/
@@ -22,10 +22,10 @@ public:
SkProxyCanvas() : fProxy(NULL) {}
SkProxyCanvas(SkCanvas* proxy);
virtual ~SkProxyCanvas();
-
+
SkCanvas* getProxy() const { return fProxy; }
void setProxy(SkCanvas* proxy);
-
+
virtual int save(SaveFlags flags = kMatrixClip_SaveFlag) SK_OVERRIDE;
virtual int saveLayer(const SkRect* bounds, const SkPaint* paint,
SaveFlags flags = kARGB_ClipLayer_SaveFlag) SK_OVERRIDE;
@@ -37,7 +37,7 @@ public:
virtual bool skew(SkScalar sx, SkScalar sy) SK_OVERRIDE;
virtual bool concat(const SkMatrix& matrix) SK_OVERRIDE;
virtual void setMatrix(const SkMatrix& matrix) SK_OVERRIDE;
-
+
virtual bool clipRect(const SkRect&, SkRegion::Op, bool) SK_OVERRIDE;
virtual bool clipPath(const SkPath&, SkRegion::Op, bool) SK_OVERRIDE;
virtual bool clipRegion(const SkRegion& deviceRgn,
@@ -79,7 +79,7 @@ public:
private:
SkCanvas* fProxy;
-
+
typedef SkCanvas INHERITED;
};