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

Unified Diff: cc/delegated_renderer_layer_impl_unittest.cc

Issue 11232051: Remove static thread pointers from CC (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Apply code review comments Created 8 years, 1 month 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
« no previous file with comments | « cc/damage_tracker_unittest.cc ('k') | cc/font_atlas.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/delegated_renderer_layer_impl_unittest.cc
diff --git a/cc/delegated_renderer_layer_impl_unittest.cc b/cc/delegated_renderer_layer_impl_unittest.cc
index 7aee4b03b928bb930ab74f2cbc0fbf432bb0d1dd..2290cd3495b8bd6bf45b306914b540b8b64dce79 100644
--- a/cc/delegated_renderer_layer_impl_unittest.cc
+++ b/cc/delegated_renderer_layer_impl_unittest.cc
@@ -14,6 +14,7 @@
#include "cc/single_thread_proxy.h"
#include "cc/solid_color_draw_quad.h"
#include "cc/solid_color_layer_impl.h"
+#include "cc/test/fake_proxy.h"
#include "cc/test/fake_web_compositor_output_surface.h"
#include "cc/test/fake_web_graphics_context_3d.h"
#include "cc/test/geometry_test_utils.h"
@@ -34,11 +35,13 @@ namespace {
class DelegatedRendererLayerImplTest : public testing::Test, public LayerTreeHostImplClient {
public:
DelegatedRendererLayerImplTest()
+ : m_proxy(scoped_ptr<Thread>(NULL))
+ , m_alwaysImplThreadAndMainThreadBlocked(&m_proxy)
{
LayerTreeSettings settings;
settings.minimumOcclusionTrackingSize = gfx::Size();
- m_hostImpl = LayerTreeHostImpl::create(settings, this);
+ m_hostImpl = LayerTreeHostImpl::create(settings, this, &m_proxy);
m_hostImpl->initializeRenderer(createContext());
m_hostImpl->setViewportSize(gfx::Size(10, 10), gfx::Size(10, 10));
}
@@ -60,9 +63,8 @@ protected:
return FakeWebCompositorOutputSurface::create(scoped_ptr<WebKit::WebGraphicsContext3D>(new FakeWebGraphicsContext3D)).PassAs<GraphicsContext>();
}
- DebugScopedSetImplThread m_alwaysImplThread;
- DebugScopedSetMainThreadBlocked m_alwaysMainThreadBlocked;
-
+ FakeProxy m_proxy;
+ DebugScopedSetImplThreadAndMainThreadBlocked m_alwaysImplThreadAndMainThreadBlocked;
scoped_ptr<LayerTreeHostImpl> m_hostImpl;
};
« no previous file with comments | « cc/damage_tracker_unittest.cc ('k') | cc/font_atlas.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698