| Index: src/effects/gradients/SkTwoPointConicalGradient.cpp
|
| diff --git a/src/effects/gradients/SkTwoPointConicalGradient.cpp b/src/effects/gradients/SkTwoPointConicalGradient.cpp
|
| index 9d1f8f1a821441b96d0e9bf16a856e3dfcac0755..e9c2efe32d3edb3f70a5da97a39194a2cb00ee57 100644
|
| --- a/src/effects/gradients/SkTwoPointConicalGradient.cpp
|
| +++ b/src/effects/gradients/SkTwoPointConicalGradient.cpp
|
| @@ -221,21 +221,18 @@ size_t SkTwoPointConicalGradient::contextSize() const {
|
| return sizeof(TwoPointConicalGradientContext);
|
| }
|
|
|
| -SkShader::Context* SkTwoPointConicalGradient::createContext(
|
| - const SkBitmap& device, const SkPaint& paint,
|
| - const SkMatrix& matrix, void* storage) const {
|
| - if (!this->validContext(device, paint, matrix)) {
|
| +SkShader::Context* SkTwoPointConicalGradient::createContext(const ContextRec& rec,
|
| + void* storage) const {
|
| + if (!this->validContext(rec)) {
|
| return NULL;
|
| }
|
|
|
| - return SkNEW_PLACEMENT_ARGS(storage, TwoPointConicalGradientContext,
|
| - (*this, device, paint, matrix));
|
| + return SkNEW_PLACEMENT_ARGS(storage, TwoPointConicalGradientContext, (*this, rec));
|
| }
|
|
|
| SkTwoPointConicalGradient::TwoPointConicalGradientContext::TwoPointConicalGradientContext(
|
| - const SkTwoPointConicalGradient& shader, const SkBitmap& device,
|
| - const SkPaint& paint, const SkMatrix& matrix)
|
| - : INHERITED(shader, device, paint, matrix)
|
| + const SkTwoPointConicalGradient& shader, const ContextRec& rec)
|
| + : INHERITED(shader, rec)
|
| {
|
| // we don't have a span16 proc
|
| fFlags &= ~kHasSpan16_Flag;
|
|
|