Delete GpuVideoService and move GpuVideoDecodeAccelerator ownership to stubs

content/common/gpu/gpu_command_buffer_stub.h

 // Copyright (c) 2011 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.
 
 #ifndef CONTENT_COMMON_GPU_GPU_COMMAND_BUFFER_STUB_H_
 #define CONTENT_COMMON_GPU_GPU_COMMAND_BUFFER_STUB_H_
 #pragma once
 
 #if defined(ENABLE_GPU)
 
 #include <queue>
 #include <string>
 #include <vector>
 
 #include "base/memory/weak_ptr.h"
 #include "base/process.h"
 #include "base/task.h"
+#include "content/common/gpu/media/gpu_video_decode_accelerator.h"
 #include "gpu/command_buffer/service/command_buffer_service.h"
 #include "gpu/command_buffer/service/gpu_scheduler.h"
 #include "ipc/ipc_channel.h"
 #include "ipc/ipc_message.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/size.h"
 
 class GpuChannel;
 class GpuWatchdog;
 
@@ skipping 60 matching lines @@
 
   // Called when the command buffer was destroyed, and the stub should now
   // unblock itself and handle pending messages.
   void CommandBufferWasDestroyed();
 
   // Register a callback to be Run() whenever the underlying scheduler receives
   // a set_token() call.  The callback will be Run() with the just-set token as
   // its only parameter.  Multiple callbacks may be registered.
   void AddSetTokenCallback(const base::Callback<void(int32)>& callback);
 
+  void set_video_decoder(GpuVideoDecodeAccelerator* video_decoder) {
+    DCHECK(!video_decoder_.get());
+    video_decoder_.reset(video_decoder);
+  }
+
+  void DestroyVideoDecoder() {

[Ami GONE FROM CHROMIUM, 2011/06/30 22:20:39]

Destroy* implies to me that this class should have a Create* method.
WDYT of release_video_decoder() ?

[vrk (LEFT CHROMIUM), 2011/07/01 18:12:14]

Destroying is now done directly in GpuCommandBufferStub, so no need! yay

+    video_decoder_.reset();
+  }
+
  private:
   // Message handlers:
   void OnInitialize(base::SharedMemoryHandle ring_buffer,
                     int32 size,
                     IPC::Message* reply_message);
   void OnSetParent(int32 parent_route_id,
                    uint32 parent_texture_id,
                    IPC::Message* reply_message);
   void OnGetState(IPC::Message* reply_message);
   void OnFlush(int32 put_offset,
@@ skipping 56 matching lines @@
   std::vector<base::Callback<void(int32)> > set_token_callbacks_;
 
   // SetParent may be called before Initialize, in which case we need to keep
   // around the parent stub, so that Initialize can set the parent correctly.
   base::WeakPtr<GpuCommandBufferStub> parent_stub_for_initialization_;
   uint32 parent_texture_for_initialization_;
 
   GpuWatchdog* watchdog_;
   ScopedRunnableMethodFactory<GpuCommandBufferStub> task_factory_;
 
+  // The video decoder associated with this stub, if any.
+  scoped_ptr<GpuVideoDecodeAccelerator> video_decoder_;
+
   DISALLOW_COPY_AND_ASSIGN(GpuCommandBufferStub);
 };
 
 #endif  // defined(ENABLE_GPU)
 
 #endif  // CONTENT_COMMON_GPU_GPU_COMMAND_BUFFER_STUB_H_