Index: cc/gl_renderer_unittest.cc |
diff --git a/cc/gl_renderer_unittest.cc b/cc/gl_renderer_unittest.cc |
index e20dd25f731224f22172784f86d2ed4cd501ba20..60b86992009d89984df80d3cc7d725ad19506e1d 100644 |
--- a/cc/gl_renderer_unittest.cc |
+++ b/cc/gl_renderer_unittest.cc |
@@ -43,9 +43,8 @@ public: |
int frameCount() { return m_frame; } |
void setMemoryAllocation(WebGraphicsMemoryAllocation allocation) |
{ |
- DCHECK(Proxy::isImplThread()); |
// In single threaded mode we expect this callback on main thread. |
- DebugScopedSetMainThread main; |
+// DebugScopedSetMainThread main; // TODO: eviction |
danakj
2012/10/25 05:06:06
Left a comment in here by mistake?
|
m_memoryAllocationChangedCallback->onMemoryAllocationChanged(allocation); |
} |
@@ -88,7 +87,6 @@ public: |
private: |
int m_setFullRootLayerDamageCount; |
- DebugScopedSetImplThread m_implThread; |
scoped_ptr<LayerImpl> m_rootLayer; |
RenderPassList m_renderPassesInDrawOrder; |
RenderPassIdHashMap m_renderPasses; |
@@ -97,7 +95,7 @@ private: |
class FakeRendererGL : public GLRenderer { |
public: |
- FakeRendererGL(RendererClient* client, ResourceProvider* resourceProvider) : GLRenderer(client, resourceProvider) { } |
+ FakeRendererGL(RendererClient* client, ResourceProvider* resourceProvider) : GLRenderer(client, resourceProvider, false) { } |
// GLRenderer methods. |