| Index: src/gpu/GrClipMaskManager.cpp
|
| diff --git a/src/gpu/GrClipMaskManager.cpp b/src/gpu/GrClipMaskManager.cpp
|
| index 2f6f635d043eebe3ea6f14d5c30bf35fa6902645..6bf4ff6cc7360ee7ad63033332a15474b236c013 100644
|
| --- a/src/gpu/GrClipMaskManager.cpp
|
| +++ b/src/gpu/GrClipMaskManager.cpp
|
| @@ -14,7 +14,7 @@
|
| #include "GrPathRenderer.h"
|
| #include "GrRenderTarget.h"
|
| #include "GrRenderTargetPriv.h"
|
| -#include "GrStencilBuffer.h"
|
| +#include "GrStencilAttachment.h"
|
| #include "GrSWMaskHelper.h"
|
| #include "SkRasterClip.h"
|
| #include "SkStrokeRec.h"
|
| @@ -706,7 +706,7 @@ bool GrClipMaskManager::createStencilClipMask(GrRenderTarget* rt,
|
| SkASSERT(kNone_ClipMaskType == fCurrClipMaskType);
|
| SkASSERT(rt);
|
|
|
| - GrStencilBuffer* stencilBuffer = rt->renderTargetPriv().attachStencilBuffer();
|
| + GrStencilAttachment* stencilBuffer = rt->renderTargetPriv().attachStencilBuffer();
|
| if (NULL == stencilBuffer) {
|
| return false;
|
| }
|
| @@ -952,7 +952,7 @@ void GrClipMaskManager::setPipelineBuilderStencil(GrPipelineBuilder* pipelineBui
|
|
|
| int stencilBits = 0;
|
| GrRenderTarget* rt = pipelineBuilder->getRenderTarget();
|
| - GrStencilBuffer* stencilBuffer = rt->renderTargetPriv().attachStencilBuffer();
|
| + GrStencilAttachment* stencilBuffer = rt->renderTargetPriv().attachStencilBuffer();
|
| if (stencilBuffer) {
|
| stencilBits = stencilBuffer->bits();
|
| }
|
| @@ -1127,7 +1127,7 @@ void GrClipMaskManager::setClipTarget(GrClipTarget* clipTarget) {
|
| fAACache.setContext(clipTarget->getContext());
|
| }
|
|
|
| -void GrClipMaskManager::adjustPathStencilParams(const GrStencilBuffer* stencilBuffer,
|
| +void GrClipMaskManager::adjustPathStencilParams(const GrStencilAttachment* stencilBuffer,
|
| GrStencilSettings* settings) {
|
| if (stencilBuffer) {
|
| int stencilBits = stencilBuffer->bits();
|
|
|