From b5632692db6b72d62639e26fe14b5b429f7d5375 Mon Sep 17 00:00:00 2001
From: "jbauman@chromium.org"
 <jbauman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Thu, 12 Jun 2014 19:30:25 +0000
Subject: Correctly set up LayerTreeSettings for cc::Display.

BUG=378549

Review URL: https://codereview.chromium.org/329833002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@276769 0039d316-1c4b-4281-b951-d872f2087c98
---
 cc/surfaces/display.cc | 5 ++---
 cc/surfaces/display.h  | 1 +
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'cc')

diff --git a/cc/surfaces/display.cc b/cc/surfaces/display.cc
index e2e4a43..85d28b1 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();
diff --git a/cc/surfaces/display.h b/cc/surfaces/display.h
index 1f8bf17..22bd074 100644
--- a/cc/surfaces/display.h
+++ b/cc/surfaces/display.h
@@ -74,6 +74,7 @@ class CC_SURFACES_EXPORT Display : public SurfaceClient,
   SurfaceManager* manager_;
   SurfaceAggregator aggregator_;
   SharedBitmapManager* bitmap_manager_;
+  LayerTreeSettings settings_;
   scoped_ptr<Surface> current_surface_;
   scoped_ptr<OutputSurface> output_surface_;
   scoped_ptr<ResourceProvider> resource_provider_;
-- 
cgit v1.1