Index: cc/gl_renderer.h |
diff --git a/cc/gl_renderer.h b/cc/gl_renderer.h |
index f8381ecc3feab149045fa132c10c6c5fd4b95d44..c6835eab69bac59de1e0d8565be949bf878650a7 100644 |
--- a/cc/gl_renderer.h |
+++ b/cc/gl_renderer.h |
@@ -85,6 +85,7 @@ protected: |
virtual bool flippedFramebuffer() const OVERRIDE; |
virtual void ensureScissorTestEnabled() OVERRIDE; |
virtual void ensureScissorTestDisabled() OVERRIDE; |
+ virtual void finishDrawingQuadList() OVERRIDE; |
private: |
static void toGLMatrix(float*, const gfx::Transform&); |
@@ -100,6 +101,8 @@ private: |
void drawSolidColorQuad(const DrawingFrame&, const SolidColorDrawQuad*); |
void drawStreamVideoQuad(const DrawingFrame&, const StreamVideoDrawQuad*); |
void drawTextureQuad(const DrawingFrame&, const TextureDrawQuad*); |
+ void drawTextureQuadPush(const DrawingFrame&, const TextureDrawQuad*); |
+ void drawTextureQuadFlush(); |
void drawIOSurfaceQuad(const DrawingFrame&, const IOSurfaceDrawQuad*); |
void drawTileQuad(const DrawingFrame&, const TileDrawQuad*); |
void drawYUVVideoQuad(const DrawingFrame&, const YUVVideoDrawQuad*); |
@@ -107,6 +110,8 @@ private: |
void setShaderOpacity(float opacity, int alphaLocation); |
void setShaderQuadF(const gfx::QuadF&, int quadLocation); |
void drawQuadGeometry(const DrawingFrame&, const gfx::Transform& drawTransform, const gfx::RectF& quadRect, int matrixLocation); |
+ void setBlendEnabled(bool enabled); |
+ void setUseProgram(unsigned program); |
void copyTextureToFramebuffer(const DrawingFrame&, int textureId, const gfx::Rect&, const gfx::Transform& drawMatrix); |
@@ -219,6 +224,9 @@ private: |
bool m_isUsingBindUniform; |
bool m_visible; |
bool m_isScissorEnabled; |
+ bool m_blendShadow; |
+ unsigned m_programShadow; |
+ scoped_ptr<struct TexturedQuadDrawCache> m_drawCache; |
scoped_ptr<ResourceProvider::ScopedWriteLockGL> m_currentFramebufferLock; |