simplify GrPathRenderer interface
Review URL: http://codereview.appspot.com/5706053/
git-svn-id: http://skia.googlecode.com/svn/trunk@3312 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp
index d6ebada..2a12399 100644
--- a/src/gpu/GrContext.cpp
+++ b/src/gpu/GrContext.cpp
@@ -1381,7 +1381,7 @@
GrPathRenderer* pr = NULL;
if (prAA) {
- pr = this->getPathRenderer(path, fill, true);
+ pr = this->getPathRenderer(path, fill, target, true);
if (NULL == pr) {
GrAutoScratchTexture ast;
GrIRect pathBounds, clipBounds;
@@ -1422,7 +1422,7 @@
}
}
} else {
- pr = this->getPathRenderer(path, fill, false);
+ pr = this->getPathRenderer(path, fill, target, false);
}
if (NULL == pr) {
@@ -1432,9 +1432,7 @@
return;
}
- GrPathRenderer::AutoClearPath arp(pr, target, &path, fill, prAA, translate);
-
- pr->drawPath(stageMask);
+ pr->drawPath(path, fill, translate, target, stageMask, prAA);
}
////////////////////////////////////////////////////////////////////////////////
@@ -1884,13 +1882,13 @@
GrPathRenderer* GrContext::getPathRenderer(const GrPath& path,
GrPathFill fill,
+ const GrDrawTarget* target,
bool antiAlias) {
if (NULL == fPathRendererChain) {
fPathRendererChain =
new GrPathRendererChain(this, GrPathRendererChain::kNone_UsageFlag);
}
- return fPathRendererChain->getPathRenderer(fGpu->getCaps(), path,
- fill, antiAlias);
+ return fPathRendererChain->getPathRenderer(path, fill, target, antiAlias);
}
////////////////////////////////////////////////////////////////////////////////