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

@@ -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();

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_;