Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2619)

Unified Diff: cc/gl_renderer_unittest.cc

Issue 11232051: Remove static thread pointers from CC (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Address code review comments and fix all cc_unittests Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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.

Powered by Google App Engine
This is Rietveld 408576698