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

Unified Diff: cc/surfaces/display.cc

Issue 329833002: Correctly set up LayerTreeSettings for cc::Display. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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
« no previous file with comments | « cc/surfaces/display.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/surfaces/display.cc
diff --git a/cc/surfaces/display.cc b/cc/surfaces/display.cc
index e2e4a436636d752952c85c0ed5f8285e4bcf39af..85d28b1e588d1e5370c6227c87ad68ed71d2e41c 100644
--- a/cc/surfaces/display.cc
+++ b/cc/surfaces/display.cc
@@ -69,12 +69,11 @@ void Display::InitializeOutputSurface() {
if (!resource_provider)
return;
- LayerTreeSettings settings;
if (output_surface->context_provider()) {
TextureMailboxDeleter* texture_mailbox_deleter = NULL;
scoped_ptr<GLRenderer> renderer =
GLRenderer::Create(this,
- &settings,
+ &settings_,
output_surface.get(),
resource_provider.get(),
texture_mailbox_deleter,
@@ -84,7 +83,7 @@ void Display::InitializeOutputSurface() {
renderer_ = renderer.Pass();
} else {
scoped_ptr<SoftwareRenderer> renderer = SoftwareRenderer::Create(
- this, &settings, output_surface.get(), resource_provider.get());
+ this, &settings_, output_surface.get(), resource_provider.get());
if (!renderer)
return;
renderer_ = renderer.Pass();
« no previous file with comments | « cc/surfaces/display.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698