Add TextureMailboxDeleter to 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/debug/trace_event.h"
 #include "base/message_loop/message_loop.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/compositor_frame_ack.h"
 #include "cc/output/direct_renderer.h"
 #include "cc/output/gl_renderer.h"
 #include "cc/output/software_renderer.h"
+#include "cc/resources/texture_mailbox_deleter.h"
 #include "cc/surfaces/display_client.h"
 #include "cc/surfaces/surface.h"
 #include "cc/surfaces/surface_aggregator.h"
 #include "cc/surfaces/surface_manager.h"
 #include "cc/trees/blocking_task_runner.h"
 
 namespace cc {
 
 Display::Display(DisplayClient* client,
                  SurfaceManager* manager,
                  SharedBitmapManager* bitmap_manager)
     : client_(client),
       manager_(manager),
       bitmap_manager_(bitmap_manager),
       blocking_main_thread_task_runner_(
-          BlockingTaskRunner::Create(base::MessageLoopProxy::current())) {
+          BlockingTaskRunner::Create(base::MessageLoopProxy::current())),
+      texture_mailbox_deleter_(
+          new TextureMailboxDeleter(base::MessageLoopProxy::current())) {
   manager_->AddObserver(this);
 }
 
 Display::~Display() {
   manager_->RemoveObserver(this);
 }
 
 void Display::Resize(SurfaceId id, const gfx::Size& size) {
   current_surface_id_ = id;
   current_surface_size_ = size;
@@ skipping 16 matching lines @@
                                bitmap_manager_,
                                blocking_main_thread_task_runner_.get(),
                                highp_threshold_min,
                                use_rgba_4444_texture_format,
                                id_allocation_chunk_size,
                                use_distance_field_text);
   if (!resource_provider)
     return;
 
   if (output_surface->context_provider()) {
-    TextureMailboxDeleter* texture_mailbox_deleter = NULL;
     scoped_ptr<GLRenderer> renderer =
         GLRenderer::Create(this,
                            &settings_,
                            output_surface.get(),
                            resource_provider.get(),
-                           texture_mailbox_deleter,
+                           texture_mailbox_deleter_.get(),
                            highp_threshold_min);
     if (!renderer)
       return;
     renderer_ = renderer.Pass();
   } else {
     scoped_ptr<SoftwareRenderer> renderer = SoftwareRenderer::Create(
         this, &settings_, output_surface.get(), resource_provider.get());
     if (!renderer)
       return;
     renderer_ = renderer.Pass();
@@ skipping 52 matching lines @@
 void Display::OnSurfaceDamaged(SurfaceId surface) {
   if (aggregator_ && aggregator_->previous_contained_surfaces().count(surface))
     client_->DisplayDamaged();
 }
 
 SurfaceId Display::CurrentSurfaceId() {
   return current_surface_id_;
 }
 
 }  // namespace cc