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

Unified Diff: cc/output/renderer_unittest.cc

Issue 754433003: Update from https://crrev.com/305340 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 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/output/renderer_settings.cc ('k') | cc/output/software_renderer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/output/renderer_unittest.cc
diff --git a/cc/output/renderer_unittest.cc b/cc/output/renderer_unittest.cc
index 6e43cc0e0a0959d3512457e76a129ff80567ecff..a8f09ff94748002f7a031a2f8d65ba21ccab88da 100644
--- a/cc/output/renderer_unittest.cc
+++ b/cc/output/renderer_unittest.cc
@@ -50,14 +50,14 @@ class MockContextProvider : public TestContextProvider {
template <class T>
scoped_ptr<Renderer> CreateRenderer(RendererClient* client,
- const LayerTreeSettings* settings,
+ const RendererSettings* settings,
OutputSurface* output_surface,
ResourceProvider* resource_provider);
template <>
scoped_ptr<Renderer> CreateRenderer<DelegatingRenderer>(
RendererClient* client,
- const LayerTreeSettings* settings,
+ const RendererSettings* settings,
OutputSurface* output_surface,
ResourceProvider* resource_provider) {
return DelegatingRenderer::Create(
@@ -67,7 +67,7 @@ scoped_ptr<Renderer> CreateRenderer<DelegatingRenderer>(
template <>
scoped_ptr<Renderer> CreateRenderer<GLRenderer>(
RendererClient* client,
- const LayerTreeSettings* settings,
+ const RendererSettings* settings,
OutputSurface* output_surface,
ResourceProvider* resource_provider) {
return GLRenderer::Create(
@@ -91,7 +91,7 @@ class RendererTest : public ::testing::Test {
}
FakeRendererClient renderer_client_;
- LayerTreeSettings tree_settings_;
+ RendererSettings tree_settings_;
FakeOutputSurfaceClient output_surface_client_;
scoped_refptr<MockContextProvider> context_provider_;
scoped_ptr<OutputSurface> output_surface_;
« no previous file with comments | « cc/output/renderer_settings.cc ('k') | cc/output/software_renderer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698