| Index: src/gpu/GrOvalRenderer.cpp
|
| diff --git a/src/gpu/GrOvalRenderer.cpp b/src/gpu/GrOvalRenderer.cpp
|
| index 77ad7c6e2d31debee48db9930a7e31c0b89b3b94..cb5113e90f67cea1a1a2b0d130fe29c992bd0ee1 100644
|
| --- a/src/gpu/GrOvalRenderer.cpp
|
| +++ b/src/gpu/GrOvalRenderer.cpp
|
| @@ -85,8 +85,6 @@ public:
|
|
|
| bool implementsDistanceVector() const override { return true; };
|
|
|
| - const SkMatrix& localMatrix() const { return fLocalMatrix; }
|
| -
|
| virtual ~CircleGeometryProcessor() {}
|
|
|
| const char* name() const override { return "CircleEdge"; }
|
| @@ -173,8 +171,8 @@ private:
|
| const GrGLSLProgramDataManager& pdman,
|
| int index,
|
| const SkTArray<const GrCoordTransform*, true>& transforms) override {
|
| - this->setTransformDataHelper<CircleGeometryProcessor>(primProc, pdman, index,
|
| - transforms);
|
| + this->setTransformDataHelper(primProc.cast<CircleGeometryProcessor>().fLocalMatrix,
|
| + pdman, index, transforms);
|
| }
|
|
|
| private:
|
| @@ -227,8 +225,6 @@ public:
|
|
|
| const char* name() const override { return "EllipseEdge"; }
|
|
|
| - const SkMatrix& localMatrix() const { return fLocalMatrix; }
|
| -
|
| void getGLSLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override {
|
| GLSLProcessor::GenKey(*this, caps, b);
|
| }
|
| @@ -320,8 +316,8 @@ private:
|
| const GrGLSLProgramDataManager& pdman,
|
| int index,
|
| const SkTArray<const GrCoordTransform*, true>& transforms) override {
|
| - this->setTransformDataHelper<EllipseGeometryProcessor>(primProc, pdman, index,
|
| - transforms);
|
| + this->setTransformDataHelper(primProc.cast<EllipseGeometryProcessor>().fLocalMatrix,
|
| + pdman, index, transforms);
|
| }
|
|
|
| private:
|
|
|