Correctly set up LayerTreeSettings for cc::Display.

cc/surfaces/display.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/surfaces/display.h"
 
 #include "base/message_loop/message_loop.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/direct_renderer.h"
 #include "cc/output/gl_renderer.h"
@@ skipping 51 matching lines @@
   scoped_ptr<ResourceProvider> resource_provider =
       ResourceProvider::Create(output_surface.get(),
                                bitmap_manager_,
                                highp_threshold_min,
                                use_rgba_4444_texture_format,
                                id_allocation_chunk_size,
                                use_distance_field_text);
   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,
                            highp_threshold_min);
     if (!renderer)
       return;
     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();
   }
 
   output_surface_ = output_surface.Pass();
   resource_provider_ = resource_provider.Pass();
   child_id_ = resource_provider_->CreateChild(
       base::Bind(&Display::ReturnResources, base::Unretained(this)));
 }
@@ skipping 57 matching lines @@
 }
 
 int Display::CurrentSurfaceID() {
   return current_surface_ ? current_surface_->surface_id() : 0;
 }
 
 void Display::ReturnResources(const ReturnedResourceArray& resources) {
 }
 
 }  // namespace cc