Pass Client pointer in Initialize() for VDA/VEA

content/common/gpu/client/gpu_video_decode_accelerator_host.cc

 // Copyright (c) 2012 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 "content/common/gpu/client/gpu_video_decode_accelerator_host.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "content/common/gpu/client/gpu_channel_host.h"
 #include "content/common/gpu/gpu_messages.h"
 #include "content/common/view_messages.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_message_utils.h"
 
 #if defined(OS_WIN)
 #include "content/public/common/sandbox_init.h"
 #endif  // OS_WIN
 
 using media::VideoDecodeAccelerator;
 namespace content {
 
 GpuVideoDecodeAcceleratorHost::GpuVideoDecodeAcceleratorHost(
     GpuChannelHost* channel,
     int32 decoder_route_id,
-    VideoDecodeAccelerator::Client* client,
     CommandBufferProxyImpl* impl)
     : channel_(channel),
       decoder_route_id_(decoder_route_id),
-      client_(client),
+      client_(NULL),
       impl_(impl) {
   DCHECK(channel_);
-  DCHECK(client_);
   channel_->AddRoute(decoder_route_id, base::AsWeakPtr(this));
   impl_->AddDeletionObserver(this);
 }
 
 void GpuVideoDecodeAcceleratorHost::OnChannelError() {
   DLOG(ERROR) << "GpuVideoDecodeAcceleratorHost::OnChannelError()";
   if (channel_) {
     channel_->RemoveRoute(decoder_route_id_);
     channel_ = NULL;
   }
@@ skipping 21 matching lines @@
     IPC_MESSAGE_HANDLER(AcceleratedVideoDecoderHostMsg_DismissPictureBuffer,
                         OnDismissPictureBuffer)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   DCHECK(handled);
   // See OnErrorNotification for why |this| mustn't be used after
   // OnErrorNotification might have been called above.
   return handled;
 }
 
-bool GpuVideoDecodeAcceleratorHost::Initialize(
-    media::VideoCodecProfile profile) {
-  NOTREACHED();
+bool GpuVideoDecodeAcceleratorHost::Initialize(media::VideoCodecProfile profile,
+                                               Client* client) {
+  client_ = client;
   return true;
 }
 
 void GpuVideoDecodeAcceleratorHost::Decode(
     const media::BitstreamBuffer& bitstream_buffer) {
   DCHECK(CalledOnValidThread());
   // Can happen if a decode task was posted before an error was delivered.
   if (!channel_)
     return;
 
@@ skipping 54 matching lines @@
 
 void GpuVideoDecodeAcceleratorHost::OnWillDeleteImpl() {
   impl_ = NULL;
 
   // The CommandBufferProxyImpl is going away; error out this VDA.
   OnChannelError();
 }
 
 GpuVideoDecodeAcceleratorHost::~GpuVideoDecodeAcceleratorHost() {
   DCHECK(CalledOnValidThread());
-  DCHECK(!client_) << "destructor called without Destroy being called!";
 
   if (channel_)
     channel_->RemoveRoute(decoder_route_id_);
   if (impl_)
     impl_->RemoveDeletionObserver(this);
 }
 
 void GpuVideoDecodeAcceleratorHost::Send(IPC::Message* message) {
   // After OnChannelError is called, the client should no longer send
   // messages to the gpu channel through this object.  But queued posted tasks
@@ skipping 68 matching lines @@
 
   // Client::NotifyError() may Destroy() |this|, so calling it needs to be the
   // last thing done on this stack!
   media::VideoDecodeAccelerator::Client* client = NULL;
   std::swap(client, client_);
   client->NotifyError(
       static_cast<media::VideoDecodeAccelerator::Error>(error));
 }
 
 }  // namespace content