| Index: src/gpu/GrDrawTarget.h
|
| diff --git a/src/gpu/GrDrawTarget.h b/src/gpu/GrDrawTarget.h
|
| index 26de8675d5bf3228f706c09932dbf1dc71cfb74f..64cbc8781eba2048ead8e786bd9e87b3e6a1b883 100644
|
| --- a/src/gpu/GrDrawTarget.h
|
| +++ b/src/gpu/GrDrawTarget.h
|
| @@ -702,7 +702,7 @@ private:
|
| virtual void onDraw(const GrDrawState&,
|
| const GrGeometryProcessor*,
|
| const DrawInfo&,
|
| - const GrClipMaskManager::ScissorState&,
|
| + const GrScissorState&,
|
| const GrDeviceCoordTexture* dstCopy) = 0;
|
| // TODO copy in order drawbuffer onDrawRect to here
|
| virtual void onDrawRect(GrDrawState*,
|
| @@ -714,12 +714,12 @@ private:
|
| virtual void onStencilPath(const GrDrawState&,
|
| const GrPathProcessor*,
|
| const GrPath*,
|
| - const GrClipMaskManager::ScissorState&,
|
| + const GrScissorState&,
|
| const GrStencilSettings&) = 0;
|
| virtual void onDrawPath(const GrDrawState&,
|
| const GrPathProcessor*,
|
| const GrPath*,
|
| - const GrClipMaskManager::ScissorState&,
|
| + const GrScissorState&,
|
| const GrStencilSettings&,
|
| const GrDeviceCoordTexture* dstCopy) = 0;
|
| virtual void onDrawPaths(const GrDrawState&,
|
| @@ -730,7 +730,7 @@ private:
|
| const float transformValues[],
|
| PathTransformType,
|
| int count,
|
| - const GrClipMaskManager::ScissorState&,
|
| + const GrScissorState&,
|
| const GrStencilSettings&,
|
| const GrDeviceCoordTexture*) = 0;
|
|
|
| @@ -790,7 +790,7 @@ private:
|
| GrDrawState::AutoRestoreEffects* are,
|
| GrDrawState::AutoRestoreStencil* ars,
|
| GrDrawState*,
|
| - GrClipMaskManager::ScissorState* scissorState) = 0;
|
| + GrScissorState* scissorState) = 0;
|
|
|
| enum {
|
| kPreallocGeoSrcStateStackCnt = 4,
|
| @@ -850,7 +850,7 @@ private:
|
| GrDrawState::AutoRestoreEffects* are,
|
| GrDrawState::AutoRestoreStencil* ars,
|
| GrDrawState*,
|
| - GrClipMaskManager::ScissorState* scissorState) SK_OVERRIDE;
|
| + GrScissorState* scissorState) SK_OVERRIDE;
|
|
|
| typedef GrDrawTarget INHERITED;
|
| };
|
|
|