| Index: src/gpu/GrInOrderDrawBuffer.cpp
|
| diff --git a/src/gpu/GrInOrderDrawBuffer.cpp b/src/gpu/GrInOrderDrawBuffer.cpp
|
| index 141541d48df990a5bf569f994d54bff4b7db7fd8..5f07296ab2a92318fc5fa4777cf488e02be29d4a 100644
|
| --- a/src/gpu/GrInOrderDrawBuffer.cpp
|
| +++ b/src/gpu/GrInOrderDrawBuffer.cpp
|
| @@ -385,7 +385,7 @@ void GrInOrderDrawBuffer::onDraw(const DrawInfo& info) {
|
| }
|
|
|
| GrInOrderDrawBuffer::StencilPath::StencilPath() : fStroke(SkStrokeRec::kFill_InitStyle) {}
|
| -GrInOrderDrawBuffer::FillPath::FillPath() : fStroke(SkStrokeRec::kFill_InitStyle) {}
|
| +GrInOrderDrawBuffer::DrawPath::DrawPath() : fStroke(SkStrokeRec::kFill_InitStyle) {}
|
|
|
| void GrInOrderDrawBuffer::onStencilPath(const GrPath* path, const SkStrokeRec& stroke,
|
| SkPath::FillType fill) {
|
| @@ -403,7 +403,7 @@ void GrInOrderDrawBuffer::onStencilPath(const GrPath* path, const SkStrokeRec& s
|
| sp->fStroke = stroke;
|
| }
|
|
|
| -void GrInOrderDrawBuffer::onFillPath(const GrPath* path, const SkStrokeRec& stroke,
|
| +void GrInOrderDrawBuffer::onDrawPath(const GrPath* path, const SkStrokeRec& stroke,
|
| SkPath::FillType fill) {
|
| if (this->needsNewClip()) {
|
| this->recordClip();
|
| @@ -412,7 +412,7 @@ void GrInOrderDrawBuffer::onFillPath(const GrPath* path, const SkStrokeRec& stro
|
| if (this->needsNewState()) {
|
| this->recordState();
|
| }
|
| - FillPath* cp = this->recordFillPath();
|
| + DrawPath* cp = this->recordDrawPath();
|
| cp->fPath.reset(path);
|
| path->ref();
|
| cp->fFill = fill;
|
| @@ -453,7 +453,7 @@ void GrInOrderDrawBuffer::reset() {
|
| fCmds.reset();
|
| fDraws.reset();
|
| fStencilPaths.reset();
|
| - fFillPaths.reset();
|
| + fDrawPaths.reset();
|
| fStates.reset();
|
| fClears.reset();
|
| fVertexPool.reset();
|
| @@ -498,7 +498,7 @@ void GrInOrderDrawBuffer::flush() {
|
| int currClear = 0;
|
| int currDraw = 0;
|
| int currStencilPath = 0;
|
| - int currFillPath = 0;
|
| + int currDrawPath = 0;
|
| int currCopySurface = 0;
|
|
|
| for (int c = 0; c < numCmds; ++c) {
|
| @@ -520,10 +520,10 @@ void GrInOrderDrawBuffer::flush() {
|
| ++currStencilPath;
|
| break;
|
| }
|
| - case kFillPath_Cmd: {
|
| - const FillPath& cp = fFillPaths[currFillPath];
|
| - fDstGpu->fillPath(cp.fPath.get(), cp.fStroke, cp.fFill);
|
| - ++currFillPath;
|
| + case kDrawPath_Cmd: {
|
| + const DrawPath& cp = fDrawPaths[currDrawPath];
|
| + fDstGpu->drawPath(cp.fPath.get(), cp.fStroke, cp.fFill);
|
| + ++currDrawPath;
|
| break;
|
| }
|
| case kSetState_Cmd:
|
| @@ -836,9 +836,9 @@ GrInOrderDrawBuffer::StencilPath* GrInOrderDrawBuffer::recordStencilPath() {
|
| return &fStencilPaths.push_back();
|
| }
|
|
|
| -GrInOrderDrawBuffer::FillPath* GrInOrderDrawBuffer::recordFillPath() {
|
| - fCmds.push_back(kFillPath_Cmd);
|
| - return &fFillPaths.push_back();
|
| +GrInOrderDrawBuffer::DrawPath* GrInOrderDrawBuffer::recordDrawPath() {
|
| + fCmds.push_back(kDrawPath_Cmd);
|
| + return &fDrawPaths.push_back();
|
| }
|
|
|
| GrInOrderDrawBuffer::Clear* GrInOrderDrawBuffer::recordClear() {
|
|
|