Index: cc/gl_renderer.h |
diff --git a/cc/gl_renderer.h b/cc/gl_renderer.h |
index e68e9442fd0f2b23757dfcd6018f0c67c811ed9c..972a50a0bbfd383212a87ea66543f81f9c3f4ab6 100644 |
--- a/cc/gl_renderer.h |
+++ b/cc/gl_renderer.h |
@@ -33,7 +33,7 @@ class GLRenderer : public DirectRenderer, |
public WebKit::WebGraphicsContext3D::WebGraphicsMemoryAllocationChangedCallbackCHROMIUM , |
public WebKit::WebGraphicsContext3D::WebGraphicsContextLostCallback { |
public: |
- static scoped_ptr<GLRenderer> create(RendererClient*, ResourceProvider*); |
+ static scoped_ptr<GLRenderer> create(RendererClient*, ResourceProvider*, bool hasImplThread); |
enne (OOO)
2012/10/25 17:28:24
Could you put hasImplThread in the RendererClient
|
virtual ~GLRenderer(); |
@@ -57,7 +57,7 @@ public: |
virtual void setVisible(bool) OVERRIDE; |
protected: |
- GLRenderer(RendererClient*, ResourceProvider*); |
+ GLRenderer(RendererClient*, ResourceProvider*, bool hasImplThread); |
static void debugGLCall(WebKit::WebGraphicsContext3D*, const char* command, const char* file, int line); |
@@ -113,7 +113,6 @@ private: |
// WebKit::WebGraphicsContext3D::WebGraphicsMemoryAllocationChangedCallbackCHROMIUM implementation. |
virtual void onMemoryAllocationChanged(WebKit::WebGraphicsMemoryAllocation) OVERRIDE; |
- void onMemoryAllocationChangedOnImplThread(WebKit::WebGraphicsMemoryAllocation); |
void discardFramebuffer(); |
void ensureFramebuffer(); |
void enforceMemoryPolicy(); |
@@ -179,6 +178,8 @@ private: |
const SolidColorProgram* solidColorProgram(); |
+ bool m_hasImplThread; |
+ |
scoped_ptr<TileProgram> m_tileProgram; |
scoped_ptr<TileProgramOpaque> m_tileProgramOpaque; |
scoped_ptr<TileProgramAA> m_tileProgramAA; |