Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(111)

Side by Side Diff: src/effects/gradients/SkTwoPointConicalGradient.cpp

Issue 372053003: Revert of Make GrDrawState and GrPaint take GrEffect* instead of GrEffectRef*. (Closed) Base URL: https://skia.googlesource.com/skia.git@no_ref
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright 2012 Google Inc. 2 * Copyright 2012 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "SkTwoPointConicalGradient.h" 8 #include "SkTwoPointConicalGradient.h"
9 #include "SkTwoPointConicalGradient_gpu.h" 9 #include "SkTwoPointConicalGradient_gpu.h"
10 10
(...skipping 378 matching lines...) Expand 10 before | Expand all | Expand 10 after
389 389
390 *grEffect = Gr2PtConicalGradientEffect::Create(context, *this, fTileMode, lo calMatrix); 390 *grEffect = Gr2PtConicalGradientEffect::Create(context, *this, fTileMode, lo calMatrix);
391 *grColor = SkColor2GrColorJustAlpha(paint.getColor()); 391 *grColor = SkColor2GrColorJustAlpha(paint.getColor());
392 return true; 392 return true;
393 } 393 }
394 394
395 #else 395 #else
396 396
397 bool SkTwoPointConicalGradient::asNewEffect(GrContext* context, const SkPaint& p aint, 397 bool SkTwoPointConicalGradient::asNewEffect(GrContext* context, const SkPaint& p aint,
398 const SkMatrix* localMatrix, GrColor * grColor, 398 const SkMatrix* localMatrix, GrColor * grColor,
399 GrEffect** grEffect) const { 399 GrEffectRef** grEffect) const {
400 SkDEBUGFAIL("Should not call in GPU-less build"); 400 SkDEBUGFAIL("Should not call in GPU-less build");
401 return false; 401 return false;
402 } 402 }
403 403
404 #endif 404 #endif
405 405
406 #ifndef SK_IGNORE_TO_STRING 406 #ifndef SK_IGNORE_TO_STRING
407 void SkTwoPointConicalGradient::toString(SkString* str) const { 407 void SkTwoPointConicalGradient::toString(SkString* str) const {
408 str->append("SkTwoPointConicalGradient: ("); 408 str->append("SkTwoPointConicalGradient: (");
409 409
(...skipping 11 matching lines...) Expand all
421 str->appendScalar(fCenter2.fY); 421 str->appendScalar(fCenter2.fY);
422 str->append(") radius2: "); 422 str->append(") radius2: ");
423 str->appendScalar(fRadius2); 423 str->appendScalar(fRadius2);
424 str->append(" "); 424 str->append(" ");
425 425
426 this->INHERITED::toString(str); 426 this->INHERITED::toString(str);
427 427
428 str->append(")"); 428 str->append(")");
429 } 429 }
430 #endif 430 #endif
OLDNEW
« no previous file with comments | « src/effects/gradients/SkTwoPointConicalGradient.h ('k') | src/effects/gradients/SkTwoPointConicalGradient_gpu.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698