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

Unified Diff: src/gpu/GrOvalRenderer.cpp

Issue 1228763005: small cleanups after fixing const of GrPipelineBuilder on DrawTarget (Closed) Base URL: https://skia.googlesource.com/skia.git@const-fix3
Patch Set: tweaks Created 5 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 | « src/gpu/GrDrawTarget.cpp ('k') | src/gpu/GrPipelineBuilder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/GrOvalRenderer.cpp
diff --git a/src/gpu/GrOvalRenderer.cpp b/src/gpu/GrOvalRenderer.cpp
index 89f6f5b15dee0d263a78adb6ed5713ee121e3d57..88b2f3eb77b5e70bf763a6a6ab85cc51a00f72c1 100644
--- a/src/gpu/GrOvalRenderer.cpp
+++ b/src/gpu/GrOvalRenderer.cpp
@@ -1390,7 +1390,7 @@ bool GrOvalRenderer::DrawDRRect(GrDrawTarget* target,
const SkRRect& origOuter,
const SkRRect& origInner) {
bool applyAA = useAA && !pipelineBuilder.getRenderTarget()->isUnifiedMultisampled();
- GrPipelineBuilder::AutoRestoreFragmentProcessors arfp;
+ GrPipelineBuilder::AutoRestoreFragmentProcessorState arfps;
if (!origInner.isEmpty()) {
SkTCopyOnFirstWrite<SkRRect> inner(origInner);
if (!viewMatrix.isIdentity()) {
@@ -1406,8 +1406,8 @@ bool GrOvalRenderer::DrawDRRect(GrDrawTarget* target,
if (NULL == fp) {
return false;
}
- arfp.set(&pipelineBuilder);
- arfp.addCoverageProcessor(fp)->unref();
+ arfps.set(&pipelineBuilder);
+ arfps.addCoverageProcessor(fp)->unref();
}
SkStrokeRec fillRec(SkStrokeRec::kFill_InitStyle);
@@ -1428,8 +1428,8 @@ bool GrOvalRenderer::DrawDRRect(GrDrawTarget* target,
if (NULL == effect) {
return false;
}
- if (!arfp.isSet()) {
- arfp.set(&pipelineBuilder);
+ if (!arfps.isSet()) {
+ arfps.set(&pipelineBuilder);
}
SkMatrix invert;
@@ -1437,7 +1437,7 @@ bool GrOvalRenderer::DrawDRRect(GrDrawTarget* target,
return false;
}
- arfp.addCoverageProcessor(effect)->unref();
+ arfps.addCoverageProcessor(effect)->unref();
SkRect bounds = outer->getBounds();
if (applyAA) {
bounds.outset(SK_ScalarHalf, SK_ScalarHalf);
« no previous file with comments | « src/gpu/GrDrawTarget.cpp ('k') | src/gpu/GrPipelineBuilder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698