Initialize the members and avoid inlining the constructors.

BUG=None
TEST=None
CID=12377, 12379, 12380, 12381

Review URL: http://codereview.chromium.org/3176004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55863 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 29 insertions, 13 deletions

diff --git a/chrome/gpu/gpu_video_decoder.cc b/chrome/gpu/gpu_video_decoder.cc
index fa478bf..42a7383 100644
--- a/chrome/gpu/gpu_video_decoder.cc
+++ b/chrome/gpu/gpu_video_decoder.cc
@@ -35,7 +35,10 @@ GpuVideoDecoder::GpuVideoDecoder(
     GpuChannel* channel,
     base::ProcessHandle handle)
     : decoder_host_route_id_(param->decoder_host_route_id_),
-      channel_(channel), renderer_handle_(handle) {
+      channel_(channel),
+      renderer_handle_(handle) {
+  memset(&init_param_, 0, sizeof(init_param_));
+  memset(&done_param_, 0, sizeof(done_param_));
 }
 
 void GpuVideoDecoder::OnInitialize(const GpuVideoDecoderInitParam& param) {
diff --git a/chrome/renderer/gpu_video_decoder_host.cc b/chrome/renderer/gpu_video_decoder_host.cc
index 5e0f727..16b818a 100644
--- a/chrome/renderer/gpu_video_decoder_host.cc
+++ b/chrome/renderer/gpu_video_decoder_host.cc
@@ -8,6 +8,21 @@
 #include "chrome/renderer/gpu_video_service_host.h"
 #include "chrome/renderer/render_thread.h"
 
+GpuVideoDecoderHost::GpuVideoDecoderHost(GpuVideoServiceHost* service_host,
+                                         GpuChannelHost* channel_host,
+                                         EventHandler* event_handler,
+                                         GpuVideoDecoderInfoParam decoder_info)
+    : gpu_video_service_host_(service_host),
+      channel_host_(channel_host),
+      event_handler_(event_handler),
+      decoder_info_(decoder_info),
+      buffer_id_serial_(0),
+      state_(kStateUninitialized),
+      input_buffer_busy_(false) {
+  memset(&init_param_, 0, sizeof(init_param_));
+  memset(&done_param_, 0, sizeof(done_param_));
+}
+
 void GpuVideoDecoderHost::OnChannelError() {
   channel_host_.release();
 }
diff --git a/chrome/renderer/gpu_video_decoder_host.h b/chrome/renderer/gpu_video_decoder_host.h
index 2bd2f5b..dccafff 100644
--- a/chrome/renderer/gpu_video_decoder_host.h
+++ b/chrome/renderer/gpu_video_decoder_host.h
@@ -63,14 +63,8 @@ class GpuVideoDecoderHost
   GpuVideoDecoderHost(GpuVideoServiceHost* service_host,
                       GpuChannelHost* channel_host,
                       EventHandler* event_handler,
-                      GpuVideoDecoderInfoParam decoder_info)
-      : gpu_video_service_host_(service_host),
-        channel_host_(channel_host),
-        event_handler_(event_handler),
-        decoder_info_(decoder_info),
-        buffer_id_serial_(0),
-        state_(kStateUninitialized),
-        input_buffer_busy_(false) {}
+                      GpuVideoDecoderInfoParam decoder_info);
+
   friend class GpuVideoServiceHost;
 
   // Input message handler.
diff --git a/chrome/renderer/gpu_video_service_host.cc b/chrome/renderer/gpu_video_service_host.cc
index de5e9a0..61a2dcd 100644
--- a/chrome/renderer/gpu_video_service_host.cc
+++ b/chrome/renderer/gpu_video_service_host.cc
@@ -8,6 +8,12 @@
 #include "chrome/renderer/gpu_video_decoder_host.h"
 #include "chrome/renderer/render_thread.h"
 
+GpuVideoServiceHost::GpuVideoServiceHost()
+    : router_(NULL),
+      message_loop_(NULL) {
+  memset(&service_info_, 0, sizeof(service_info_));
+}
+
 void GpuVideoServiceHost::OnChannelError() {
   LOG(ERROR) << "GpuVideoServiceHost::OnChannelError";
   channel_host_.release();
diff --git a/chrome/renderer/gpu_video_service_host.h b/chrome/renderer/gpu_video_service_host.h
index 7b9fb65..de31971 100644
--- a/chrome/renderer/gpu_video_service_host.h
+++ b/chrome/renderer/gpu_video_service_host.h
@@ -34,9 +34,7 @@ class GpuVideoServiceHost : public IPC::Channel::Listener,
   void DestroyVideoDecoder(scoped_refptr<GpuVideoDecoderHost>);
 
  private:
-  GpuVideoServiceHost() : message_loop_(NULL) {
-    service_info_.service_available_ = 0;
-  }
+  GpuVideoServiceHost();
 
   scoped_refptr<GpuChannelHost> channel_host_;
   MessageRouter* router_;
diff --git a/chrome/renderer/media/ipc_video_decoder.cc b/chrome/renderer/media/ipc_video_decoder.cc
index 9d47260..2965ac5 100644
--- a/chrome/renderer/media/ipc_video_decoder.cc
+++ b/chrome/renderer/media/ipc_video_decoder.cc
@@ -63,7 +63,7 @@ void IpcVideoDecoder::Initialize(DemuxerStream* demuxer_stream,
   gpu_video_decoder_host_ = gpu_video_service_host->CreateVideoDecoder(this);
 
   // Initialize hardware decoder.
-  GpuVideoDecoderInitParam param;
+  GpuVideoDecoderInitParam param = {0};
   param.width_ = width_;
   param.height_ = height_;
   if (!gpu_video_decoder_host_->Initialize(param)) {