aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/core
diff options
context:
space:
mode:
authorGravatar skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-11-30 02:01:24 +0000
committerGravatar skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-11-30 02:01:24 +0000
commitc3d7d90973528527131c72549b10c2a21300e0ac (patch)
treeda78cea0337259a1a57d3897008d017a83c60cdc /include/core
parent1c2c2fed075e05837878813d6f8fe6ca8fc7ea00 (diff)
Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@6632 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/core')
-rw-r--r--include/core/SkClipStack.h4
-rw-r--r--include/core/SkRRect.h44
2 files changed, 24 insertions, 24 deletions
diff --git a/include/core/SkClipStack.h b/include/core/SkClipStack.h
index 4155bd0062..d4f6a52985 100644
--- a/include/core/SkClipStack.h
+++ b/include/core/SkClipStack.h
@@ -103,7 +103,7 @@ public:
clips are Booleaned together. */
SkClipStack::BoundsType fFiniteBoundType;
SkRect fFiniteBound;
-
+
// When element is applied to the previous elements in the stack is the result known to be
// equivalent to a single rect intersection? IIOW, is the clip effectively a rectangle.
bool fIsIntersectionOfRects;
@@ -163,7 +163,7 @@ public:
inline bool operator!=(const Element& b) const;
inline bool canBeIntersectedInPlace(int saveCount, SkRegion::Op op) const;
/* This method checks to see if two rect clips can be safely merged into one. The issue here
- is that to be strictly correct all the edges of the resulting rect must have the same
+ is that to be strictly correct all the edges of the resulting rect must have the same
anti-aliasing. */
bool rectRectIntersectAllowed(const SkRect& newR, bool newAA) const;
/** Determines possible finite bounds for the Element given the previous element of the
diff --git a/include/core/SkRRect.h b/include/core/SkRRect.h
index 046df36c20..66c1ee24da 100644
--- a/include/core/SkRRect.h
+++ b/include/core/SkRRect.h
@@ -33,24 +33,24 @@
// add RR rendering shader to Ganesh (akin to cicle drawing code)
// - only for simple RRs
// detect and triangulate RRectorii rather than falling back to SW in Ganesh
-//
+//
/** \class SkRRect
- The SkRRect class represents a rounded rect with a potentially different
- radii for each corner. It does not have a constructor so must be
- initialized with one of the initialization functions (e.g., setEmpty,
+ The SkRRect class represents a rounded rect with a potentially different
+ radii for each corner. It does not have a constructor so must be
+ initialized with one of the initialization functions (e.g., setEmpty,
setRectRadii, etc.)
- This class is intended to roughly match CSS' border-*-*-radius capabilities.
+ This class is intended to roughly match CSS' border-*-*-radius capabilities.
This means:
- If either of a corner's radii are 0 the corner will be square.
+ If either of a corner's radii are 0 the corner will be square.
Negative radii are not allowed (they are clamped to zero).
If the corner curves overlap they will be proportionally reduced to fit.
*/
class SK_API SkRRect {
public:
- /**
+ /**
* Enum to capture the various possible subtypes of RR. Accessed
* by type(). The subtypes become progressively less restrictive.
*/
@@ -60,16 +60,16 @@ public:
//!< The RR is actually a (non-empty) rect (i.e., at least one radius
//!< at each corner is zero)
- kRect_Type,
+ kRect_Type,
- //!< The RR is actually a (non-empty) oval (i.e., all x radii are equal
+ //!< The RR is actually a (non-empty) oval (i.e., all x radii are equal
//!< and >= width/2 and all the y radii are equal and >= height/2
- kOval_Type,
+ kOval_Type,
- //!< The RR is non-empty and all the x radii are equal & all y radii
- //!< are equal but it is not an oval (i.e., there are lines between
+ //!< The RR is non-empty and all the x radii are equal & all y radii
+ //!< are equal but it is not an oval (i.e., there are lines between
//!< the curves) nor a rect (i.e., both radii are non-zero)
- kSimple_Type,
+ kSimple_Type,
//!< A fully general (non-empty) RR. Some of the x and/or y radii are
//!< different from the others and there must be one corner where
@@ -77,7 +77,7 @@ public:
kComplex_Type,
};
- /**
+ /**
* Returns the RR's sub type.
*/
Type type() const {
@@ -90,10 +90,10 @@ public:
return fType;
}
- /**
+ /**
* Set this RR to the empty rectangle (0,0,0,0) with 0 x & y radii.
*/
- void setEmpty() {
+ void setEmpty() {
fRect.setEmpty();
memset(fRadii, 0, sizeof(fRadii));
fType = kEmpty_Type;
@@ -101,7 +101,7 @@ public:
SkDEBUGCODE(this->validate();)
}
- /**
+ /**
* Set this RR to match the supplied rect. All radii will be 0.
*/
void setRect(const SkRect& rect) {
@@ -117,7 +117,7 @@ public:
SkDEBUGCODE(this->validate();)
}
- /**
+ /**
* Set this RR to match the supplied oval. All x radii will equal half the
* width and all y radii will equal half the height.
*/
@@ -139,17 +139,17 @@ public:
SkDEBUGCODE(this->validate();)
}
- /**
+ /**
* Initialize the RR with the same radii for all four corners.
*/
void setRectXY(const SkRect& rect, SkScalar xRad, SkScalar yRad);
- /**
+ /**
* Initialize the RR with potentially different radii for all four corners.
*/
void setRectRadii(const SkRect& rect, const SkVector radii[4]);
- // The radii are stored in UL, UR, LR, LL order.
+ // The radii are stored in UL, UR, LR, LL order.
enum Corner {
kUpperLeft_Corner,
kUpperRight_Corner,
@@ -204,7 +204,7 @@ private:
SkRect fRect;
// Radii order is UL, UR, LR, LL. Use Corner enum to index into fRadii[]
- SkVector fRadii[4];
+ SkVector fRadii[4];
mutable Type fType;
// TODO: add padding so we can use memcpy for flattening and not copy
// uninitialized data