aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-12-18 16:57:03 +0000
committerGravatar reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-12-18 16:57:03 +0000
commitfdba4041c350b72791a1844ff0bc0af28cbb4199 (patch)
treec60b9b0b5162bc9655838526069e5c672b3acd9d
parent548a1f321011292359ef163f78c8a1d4871b3b7f (diff)
change all interfaces for SkRasterizer to const, in preparation for marking it
as immutable/re-entrant safe. Review URL: https://codereview.appspot.com/6936064 git-svn-id: http://skia.googlecode.com/svn/trunk@6878 2bbb7eff-a529-9590-31e7-b0007b416f81
-rw-r--r--include/core/SkRasterizer.h4
-rw-r--r--include/effects/SkLayerRasterizer.h2
-rw-r--r--src/core/SkRasterizer.cpp4
-rw-r--r--src/effects/SkLayerRasterizer.cpp2
4 files changed, 6 insertions, 6 deletions
diff --git a/include/core/SkRasterizer.h b/include/core/SkRasterizer.h
index 5f71d3fd5c..3e662ab2c1 100644
--- a/include/core/SkRasterizer.h
+++ b/include/core/SkRasterizer.h
@@ -28,14 +28,14 @@ public:
*/
bool rasterize(const SkPath& path, const SkMatrix& matrix,
const SkIRect* clipBounds, SkMaskFilter* filter,
- SkMask* mask, SkMask::CreateMode mode);
+ SkMask* mask, SkMask::CreateMode mode) const;
protected:
SkRasterizer(SkFlattenableReadBuffer& buffer) : INHERITED(buffer) {}
virtual bool onRasterize(const SkPath& path, const SkMatrix& matrix,
const SkIRect* clipBounds,
- SkMask* mask, SkMask::CreateMode mode);
+ SkMask* mask, SkMask::CreateMode mode) const;
private:
typedef SkFlattenable INHERITED;
diff --git a/include/effects/SkLayerRasterizer.h b/include/effects/SkLayerRasterizer.h
index 7a1ef74ac2..65d1be0bc1 100644
--- a/include/effects/SkLayerRasterizer.h
+++ b/include/effects/SkLayerRasterizer.h
@@ -41,7 +41,7 @@ protected:
// override from SkRasterizer
virtual bool onRasterize(const SkPath& path, const SkMatrix& matrix,
const SkIRect* clipBounds,
- SkMask* mask, SkMask::CreateMode mode);
+ SkMask* mask, SkMask::CreateMode mode) const;
private:
SkDeque fLayers;
diff --git a/src/core/SkRasterizer.cpp b/src/core/SkRasterizer.cpp
index c6ddc086ca..23a749fd4b 100644
--- a/src/core/SkRasterizer.cpp
+++ b/src/core/SkRasterizer.cpp
@@ -16,7 +16,7 @@ SK_DEFINE_INST_COUNT(SkRasterizer)
bool SkRasterizer::rasterize(const SkPath& fillPath, const SkMatrix& matrix,
const SkIRect* clipBounds, SkMaskFilter* filter,
- SkMask* mask, SkMask::CreateMode mode) {
+ SkMask* mask, SkMask::CreateMode mode) const {
SkIRect storage;
if (clipBounds && filter && SkMask::kJustRenderImage_CreateMode != mode) {
@@ -41,7 +41,7 @@ bool SkRasterizer::rasterize(const SkPath& fillPath, const SkMatrix& matrix,
*/
bool SkRasterizer::onRasterize(const SkPath& fillPath, const SkMatrix& matrix,
const SkIRect* clipBounds,
- SkMask* mask, SkMask::CreateMode mode) {
+ SkMask* mask, SkMask::CreateMode mode) const {
SkPath devPath;
fillPath.transform(matrix, &devPath);
diff --git a/src/effects/SkLayerRasterizer.cpp b/src/effects/SkLayerRasterizer.cpp
index 7365e12137..ea5808c2b4 100644
--- a/src/effects/SkLayerRasterizer.cpp
+++ b/src/effects/SkLayerRasterizer.cpp
@@ -87,7 +87,7 @@ static bool compute_bounds(const SkDeque& layers, const SkPath& path,
bool SkLayerRasterizer::onRasterize(const SkPath& path, const SkMatrix& matrix,
const SkIRect* clipBounds,
- SkMask* mask, SkMask::CreateMode mode) {
+ SkMask* mask, SkMask::CreateMode mode) const {
if (fLayers.empty()) {
return false;
}