aboutsummaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/core/SkClipStack.h10
-rw-r--r--include/gpu/GrClip.h2
2 files changed, 6 insertions, 6 deletions
diff --git a/include/core/SkClipStack.h b/include/core/SkClipStack.h
index 60ed9edf3b..c0fadb1ab1 100644
--- a/include/core/SkClipStack.h
+++ b/include/core/SkClipStack.h
@@ -51,13 +51,13 @@ public:
/**
* getBounds places the current finite bound in its first parameter. In its
* second, it indicates which kind of bound is being returned. If
- * 'finiteBound' is a normal bounding box then it encloses all writeable
- * pixels. If 'finiteBound' is an inside out bounding box then it
+ * 'canvFiniteBound' is a normal bounding box then it encloses all writeable
+ * pixels. If 'canvFiniteBound' is an inside out bounding box then it
* encloses all the un-writeable pixels and the true/normal bound is the
* infinite plane. isIntersectionOfRects is an optional parameter
- * that is true if 'finiteBound' resulted from an intersection of rects.
+ * that is true if 'canvFiniteBound' resulted from an intersection of rects.
*/
- void getBounds(SkRect* finiteBound,
+ void getBounds(SkRect* canvFiniteBound,
BoundsType* boundType,
bool* isIntersectionOfRects = NULL) const;
@@ -188,7 +188,7 @@ public:
int offsetY,
int maxWidth,
int maxHeight,
- SkRect* bounds,
+ SkRect* devBounds,
bool* isIntersectionOfRects = NULL) const;
private:
diff --git a/include/gpu/GrClip.h b/include/gpu/GrClip.h
index bb07c28de1..cf646a1282 100644
--- a/include/gpu/GrClip.h
+++ b/include/gpu/GrClip.h
@@ -237,7 +237,7 @@ public:
}
void getConservativeBounds(const GrSurface* surface,
- GrIRect* result,
+ GrIRect* devResult,
bool* isIntersectionOfRects = NULL) const;
};