| Index: cc/gl_renderer.cc
|
| diff --git a/cc/gl_renderer.cc b/cc/gl_renderer.cc
|
| index 241bcfe246709b8d72ae27e9233dd55eaab4ac8e..ecbbfc0fa926267a01ab655c6f6e7a3bfeb741fe 100644
|
| --- a/cc/gl_renderer.cc
|
| +++ b/cc/gl_renderer.cc
|
| @@ -239,6 +239,7 @@ void GLRenderer::beginDrawingFrame(DrawingFrame& frame)
|
|
|
| GLC(m_context, m_context->disable(GL_DEPTH_TEST));
|
| GLC(m_context, m_context->disable(GL_CULL_FACE));
|
| + GLC(m_context, m_context->enable(GL_SCISSOR_TEST));
|
| GLC(m_context, m_context->colorMask(true, true, true, true));
|
| GLC(m_context, m_context->enable(GL_BLEND));
|
| GLC(m_context, m_context->blendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA));
|
| @@ -1022,7 +1023,6 @@ void GLRenderer::finishDrawingFrame(DrawingFrame& frame)
|
| m_currentFramebufferLock.reset();
|
| m_swapBufferRect.Union(gfx::ToEnclosingRect(frame.rootDamageRect));
|
|
|
| - GLC(m_context, m_context->disable(GL_SCISSOR_TEST));
|
| GLC(m_context, m_context->disable(GL_BLEND));
|
| }
|
|
|
| @@ -1350,17 +1350,11 @@ bool GLRenderer::bindFramebufferToTexture(DrawingFrame& frame, const ScopedTextu
|
| return true;
|
| }
|
|
|
| -void GLRenderer::enableScissorTestRect(const gfx::Rect& scissorRect)
|
| +void GLRenderer::setScissorTestRect(const gfx::Rect& scissorRect)
|
| {
|
| - GLC(m_context, m_context->enable(GL_SCISSOR_TEST));
|
| GLC(m_context, m_context->scissor(scissorRect.x(), scissorRect.y(), scissorRect.width(), scissorRect.height()));
|
| }
|
|
|
| -void GLRenderer::disableScissorTest()
|
| -{
|
| - GLC(m_context, m_context->disable(GL_SCISSOR_TEST));
|
| -}
|
| -
|
| void GLRenderer::setDrawViewportSize(const gfx::Size& viewportSize)
|
| {
|
| GLC(m_context, m_context->viewport(0, 0, viewportSize.width(), viewportSize.height()));
|
|
|