| Index: src/gpu/GrClipMaskManager.cpp
|
| diff --git a/src/gpu/GrClipMaskManager.cpp b/src/gpu/GrClipMaskManager.cpp
|
| index bc20c2542fcd19cce8c3945259b46c4fdde82694..faeac27c9458619f69047f5a0d599c9ec2813318 100644
|
| --- a/src/gpu/GrClipMaskManager.cpp
|
| +++ b/src/gpu/GrClipMaskManager.cpp
|
| @@ -33,7 +33,7 @@ namespace {
|
| // stage matrix this also alters the vertex layout
|
| void setup_drawstate_aaclip(GrGpu* gpu,
|
| GrTexture* result,
|
| - const GrIRect &devBound) {
|
| + const SkIRect &devBound) {
|
| GrDrawState* drawState = gpu->drawState();
|
| GrAssert(drawState);
|
|
|
| @@ -345,8 +345,8 @@ bool GrClipMaskManager::canStencilAndDrawElement(GrTexture* target,
|
| void GrClipMaskManager::mergeMask(GrTexture* dstMask,
|
| GrTexture* srcMask,
|
| SkRegion::Op op,
|
| - const GrIRect& dstBound,
|
| - const GrIRect& srcBound) {
|
| + const SkIRect& dstBound,
|
| + const SkIRect& srcBound) {
|
| GrDrawState::AutoViewMatrixRestore avmr;
|
| GrDrawState* drawState = fGpu->drawState();
|
| SkAssertResult(avmr.setIdentity(drawState));
|
| @@ -482,13 +482,13 @@ GrTexture* GrClipMaskManager::createAlphaClipMask(int32_t clipStackGenID,
|
| // mask buffer can be substantially larger than the actually clip stack element. We
|
| // touch the minimum number of pixels necessary and use decal mode to combine it with
|
| // the accumulator.
|
| - GrIRect maskSpaceElementIBounds;
|
| + SkIRect maskSpaceElementIBounds;
|
|
|
| if (useTemp) {
|
| if (invert) {
|
| maskSpaceElementIBounds = maskSpaceIBounds;
|
| } else {
|
| - GrRect elementBounds = element->getBounds();
|
| + SkRect elementBounds = element->getBounds();
|
| elementBounds.offset(clipToMaskOffset);
|
| elementBounds.roundOut(&maskSpaceElementIBounds);
|
| }
|
|
|