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

Unified Diff: src/gpu/GrClipMaskManager.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
« no previous file with comments | « no previous file | src/gpu/GrDrawContext.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/GrClipMaskManager.cpp
diff --git a/src/gpu/GrClipMaskManager.cpp b/src/gpu/GrClipMaskManager.cpp
index e5f13309864ebf05862c6c46099e7bee6f054bde..b3cb0607cdcc136fafd53f4d50f529d2e6281795 100644
--- a/src/gpu/GrClipMaskManager.cpp
+++ b/src/gpu/GrClipMaskManager.cpp
@@ -661,6 +661,7 @@ bool GrClipMaskManager::CreateStencilClipMask(GrContext* context,
GrShape shape(clipPath, GrStyle::SimpleFill());
if (canRenderDirectToStencil) {
GrPaint paint;
+ paint.setColor4f(GrColor4f(1.0f, 1.0f, 1.0f, 1.0f));
bsalomon 2016/07/07 13:53:22 Should we have a constant for white GrColor4f? Als
robertphillips 2016/07/07 14:10:55 Done - removed unnecessary setColor calls.
paint.setXPFactory(GrDisableColorXPFactory::Make());
paint.setAntiAlias(element->isAA());
@@ -670,7 +671,6 @@ bool GrClipMaskManager::CreateStencilClipMask(GrContext* context,
args.fUserStencilSettings = &kDrawToStencil;
args.fDrawContext = drawContext;
args.fClip = &clip;
- args.fColor = GrColor_WHITE;
args.fViewMatrix = &viewMatrix;
args.fShape = &shape;
args.fAntiAlias = false;
@@ -702,6 +702,7 @@ bool GrClipMaskManager::CreateStencilClipMask(GrContext* context,
} else {
GrShape shape(clipPath, GrStyle::SimpleFill());
GrPaint paint;
+ paint.setColor4f(GrColor4f(1.0f, 1.0f, 1.0f, 1.0f));
paint.setXPFactory(GrDisableColorXPFactory::Make());
paint.setAntiAlias(element->isAA());
GrPathRenderer::DrawPathArgs args;
@@ -710,7 +711,6 @@ bool GrClipMaskManager::CreateStencilClipMask(GrContext* context,
args.fUserStencilSettings = *pass;
args.fDrawContext = drawContext;
args.fClip = &clip;
- args.fColor = GrColor_WHITE;
args.fViewMatrix = &viewMatrix;
args.fShape = &shape;
args.fAntiAlias = false;
« no previous file with comments | « no previous file | src/gpu/GrDrawContext.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698