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

Unified Diff: src/gpu/GrDrawContext.cpp

Issue 2126083002: Remove fColor from PathRenderer DrawPathArgs struct (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 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 side-by-side diff with in-line comments
Download patch
Index: src/gpu/GrDrawContext.cpp
diff --git a/src/gpu/GrDrawContext.cpp b/src/gpu/GrDrawContext.cpp
index 5474707191178bd7fda41fd19a91ac714574dc6e..045b19e3d7019b907ba80d855a00377ff31862f4 100644
--- a/src/gpu/GrDrawContext.cpp
+++ b/src/gpu/GrDrawContext.cpp
@@ -960,6 +960,7 @@ bool GrDrawContextPriv::drawAndStencilPath(const GrFixedClip& clip,
}
GrPaint paint;
+ paint.setColor4f(GrColor4f(1.0f, 1.0f, 1.0f, 1.0f));
paint.setCoverageSetOpXPFactory(op, invert);
GrPathRenderer::DrawPathArgs args;
@@ -968,7 +969,6 @@ bool GrDrawContextPriv::drawAndStencilPath(const GrFixedClip& clip,
args.fUserStencilSettings = ss;
args.fDrawContext = fDrawContext;
args.fClip = &clip;
- args.fColor = GrColor_WHITE;
args.fViewMatrix = &viewMatrix;
args.fShape = &shape;
args.fAntiAlias = useCoverageAA;
@@ -1042,7 +1042,6 @@ void GrDrawContext::internalDrawPath(const GrClip& clip,
args.fUserStencilSettings = &GrUserStencilSettings::kUnused;
args.fDrawContext = this;
args.fClip = &clip;
- args.fColor = paint.getColor();
args.fViewMatrix = &viewMatrix;
args.fShape = canDrawArgs.fShape;
args.fAntiAlias = useCoverageAA;

Powered by Google App Engine
This is Rietveld 408576698