| Index: src/gpu/gl/GrGpuGL_program.cpp
|
| diff --git a/src/gpu/gl/GrGpuGL_program.cpp b/src/gpu/gl/GrGpuGL_program.cpp
|
| index a1259c9bf8bc240f842828aade7bbb1e4e8deb8f..15751c446b9c5507e2e4c75a384a9fa3d84df0f0 100644
|
| --- a/src/gpu/gl/GrGpuGL_program.cpp
|
| +++ b/src/gpu/gl/GrGpuGL_program.cpp
|
| @@ -204,7 +204,7 @@ GrGLProgram* GrGpuGL::ProgramCache::getProgram(const GrOptDrawState& optState,
|
| #define GL_CALL(X) GR_GL_CALL(this->glInterface(), X)
|
|
|
| bool GrGpuGL::flushGraphicsState(DrawType type,
|
| - const ScissorState& scissorState,
|
| + const GrClipMaskManager::ScissorState& scissorState,
|
| const GrDeviceCoordTexture* dstCopy) {
|
| SkAutoTUnref<GrOptDrawState> optState(GrOptDrawState::Create(this->getDrawState(),
|
| *this->caps(),
|
|
|