| Index: src/gpu/GrOvalRenderer.cpp
|
| diff --git a/src/gpu/GrOvalRenderer.cpp b/src/gpu/GrOvalRenderer.cpp
|
| index c66e12575c83309916403e0111eb756e835112eb..37a5d5042b4f6ff4a81fd17eb10a2e565d215afa 100644
|
| --- a/src/gpu/GrOvalRenderer.cpp
|
| +++ b/src/gpu/GrOvalRenderer.cpp
|
| @@ -692,7 +692,7 @@ private:
|
| fBatch.fCoverageIgnored = !opt.readsCoverage();
|
| }
|
|
|
| - void onPrepareDraws(Target* target) override {
|
| + void onPrepareDraws(Target* target) const override {
|
| SkMatrix invert;
|
| if (!this->viewMatrix().invert(&invert)) {
|
| return;
|
| @@ -717,7 +717,7 @@ private:
|
| }
|
|
|
| for (int i = 0; i < instanceCount; i++) {
|
| - Geometry& geom = fGeoData[i];
|
| + const Geometry& geom = fGeoData[i];
|
|
|
| SkScalar innerRadius = geom.fInnerRadius;
|
| SkScalar outerRadius = geom.fOuterRadius;
|
| @@ -911,7 +911,7 @@ private:
|
| fBatch.fCoverageIgnored = !opt.readsCoverage();
|
| }
|
|
|
| - void onPrepareDraws(Target* target) override {
|
| + void onPrepareDraws(Target* target) const override {
|
| SkMatrix invert;
|
| if (!this->viewMatrix().invert(&invert)) {
|
| return;
|
| @@ -936,7 +936,7 @@ private:
|
| }
|
|
|
| for (int i = 0; i < instanceCount; i++) {
|
| - Geometry& geom = fGeoData[i];
|
| + const Geometry& geom = fGeoData[i];
|
|
|
| SkScalar xRadius = geom.fXRadius;
|
| SkScalar yRadius = geom.fYRadius;
|
| @@ -1183,7 +1183,7 @@ private:
|
| fBatch.fCoverageIgnored = !opt.readsCoverage();
|
| }
|
|
|
| - void onPrepareDraws(Target* target) override {
|
| + void onPrepareDraws(Target* target) const override {
|
| // Setup geometry processor
|
| SkAutoTUnref<GrGeometryProcessor> gp(DIEllipseEdgeEffect::Create(this->color(),
|
| this->viewMatrix(),
|
| @@ -1203,7 +1203,7 @@ private:
|
| }
|
|
|
| for (int i = 0; i < instanceCount; i++) {
|
| - Geometry& geom = fGeoData[i];
|
| + const Geometry& geom = fGeoData[i];
|
|
|
| SkScalar xRadius = geom.fXRadius;
|
| SkScalar yRadius = geom.fYRadius;
|
| @@ -1537,7 +1537,7 @@ private:
|
| fBatch.fCoverageIgnored = !opt.readsCoverage();
|
| }
|
|
|
| - void onPrepareDraws(Target* target) override {
|
| + void onPrepareDraws(Target* target) const override {
|
| // reset to device coordinates
|
| SkMatrix invert;
|
| if (!this->viewMatrix().invert(&invert)) {
|
| @@ -1572,7 +1572,7 @@ private:
|
| }
|
|
|
| for (int i = 0; i < instanceCount; i++) {
|
| - Geometry& args = fGeoData[i];
|
| + const Geometry& args = fGeoData[i];
|
|
|
| SkScalar outerRadius = args.fOuterRadius;
|
|
|
| @@ -1716,7 +1716,7 @@ private:
|
| fBatch.fCoverageIgnored = !opt.readsCoverage();
|
| }
|
|
|
| - void onPrepareDraws(Target* target) override {
|
| + void onPrepareDraws(Target* target) const override {
|
| // reset to device coordinates
|
| SkMatrix invert;
|
| if (!this->viewMatrix().invert(&invert)) {
|
| @@ -1751,7 +1751,7 @@ private:
|
| }
|
|
|
| for (int i = 0; i < instanceCount; i++) {
|
| - Geometry& args = fGeoData[i];
|
| + const Geometry& args = fGeoData[i];
|
|
|
| // Compute the reciprocals of the radii here to save time in the shader
|
| SkScalar xRadRecip = SkScalarInvert(args.fXRadius);
|
|
|