summaryrefslogtreecommitdiffstats
path: root/remoting
diff options
context:
space:
mode:
authorerg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-01 21:23:00 +0000
committererg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-01 21:23:00 +0000
commit763f848ffbd28b22a6c2aa32bf28184d9c17b366 (patch)
treec6e662f3b95f1b52866c840a96d8ce02a75032cd /remoting
parent314feb0bc9a98d6ea9cfb576485bf82dd07ffe84 (diff)
downloadchromium_src-763f848ffbd28b22a6c2aa32bf28184d9c17b366.zip
chromium_src-763f848ffbd28b22a6c2aa32bf28184d9c17b366.tar.gz
chromium_src-763f848ffbd28b22a6c2aa32bf28184d9c17b366.tar.bz2
FBTF: Another big ctor/dtor cleanup found by automated tools.
(Shaves ~2MB off Linux Debug .a files) BUG=none TEST=compiles Review URL: http://codereview.chromium.org/3563004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61237 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
-rw-r--r--remoting/base/capture_data.cc26
-rw-r--r--remoting/base/capture_data.h15
-rw-r--r--remoting/base/decoder_verbatim.cc2
-rw-r--r--remoting/base/decoder_verbatim.h1
-rw-r--r--remoting/base/decoder_zlib.cc3
-rw-r--r--remoting/base/decoder_zlib.h1
-rw-r--r--remoting/base/protocol_decoder.cc2
-rw-r--r--remoting/base/protocol_decoder.h2
-rw-r--r--remoting/client/chromoting_view.cc1
-rw-r--r--remoting/client/chromoting_view.h2
-rw-r--r--remoting/jingle_glue/jingle_info_task.cc6
-rw-r--r--remoting/jingle_glue/jingle_info_task.h5
-rw-r--r--remoting/remoting.gyp1
13 files changed, 51 insertions, 16 deletions
diff --git a/remoting/base/capture_data.cc b/remoting/base/capture_data.cc
new file mode 100644
index 0000000..2d96441
--- /dev/null
+++ b/remoting/base/capture_data.cc
@@ -0,0 +1,26 @@
+// Copyright (c) 2010 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 "remoting/base/capture_data.h"
+
+namespace remoting {
+
+DataPlanes::DataPlanes() {
+ for (int i = 0; i < kPlaneCount; ++i) {
+ data[i] = NULL;
+ strides[i] = 0;
+ }
+}
+
+CaptureData::CaptureData(const DataPlanes &data_planes,
+ int width,
+ int height,
+ PixelFormat format) :
+ data_planes_(data_planes), dirty_rects_(),
+ width_(width), height_(height), pixel_format_(format) {
+}
+
+CaptureData::~CaptureData() {}
+
+} // namespace remoting
diff --git a/remoting/base/capture_data.h b/remoting/base/capture_data.h
index b06dfa4..e99aa38 100644
--- a/remoting/base/capture_data.h
+++ b/remoting/base/capture_data.h
@@ -15,16 +15,11 @@
namespace remoting {
struct DataPlanes {
+ DataPlanes();
+
static const int kPlaneCount = 3;
uint8* data[kPlaneCount];
int strides[kPlaneCount];
-
- DataPlanes() {
- for (int i = 0; i < kPlaneCount; ++i) {
- data[i] = NULL;
- strides[i] = 0;
- }
- }
};
// Stores the data and information of a capture to pass off to the
@@ -34,9 +29,7 @@ class CaptureData : public base::RefCountedThreadSafe<CaptureData> {
CaptureData(const DataPlanes &data_planes,
int width,
int height,
- PixelFormat format) :
- data_planes_(data_planes), dirty_rects_(),
- width_(width), height_(height), pixel_format_(format) { }
+ PixelFormat format);
// Get the data_planes data of the last capture.
const DataPlanes& data_planes() const { return data_planes_; }
@@ -65,7 +58,7 @@ class CaptureData : public base::RefCountedThreadSafe<CaptureData> {
PixelFormat pixel_format_;
friend class base::RefCountedThreadSafe<CaptureData>;
- ~CaptureData() {}
+ virtual ~CaptureData();
};
} // namespace remoting
diff --git a/remoting/base/decoder_verbatim.cc b/remoting/base/decoder_verbatim.cc
index fd0b3d1..1cb426d 100644
--- a/remoting/base/decoder_verbatim.cc
+++ b/remoting/base/decoder_verbatim.cc
@@ -20,6 +20,8 @@ DecoderVerbatim::DecoderVerbatim()
encoding_ = EncodingNone;
}
+DecoderVerbatim::~DecoderVerbatim() {}
+
bool DecoderVerbatim::BeginDecode(scoped_refptr<media::VideoFrame> frame,
UpdatedRects* updated_rects,
Task* partial_decode_done,
diff --git a/remoting/base/decoder_verbatim.h b/remoting/base/decoder_verbatim.h
index 67b6cfa..c924a09 100644
--- a/remoting/base/decoder_verbatim.h
+++ b/remoting/base/decoder_verbatim.h
@@ -12,6 +12,7 @@ namespace remoting {
class DecoderVerbatim : public Decoder {
public:
DecoderVerbatim();
+ virtual ~DecoderVerbatim();
// Decoder implementations.
virtual bool BeginDecode(scoped_refptr<media::VideoFrame> frame,
diff --git a/remoting/base/decoder_zlib.cc b/remoting/base/decoder_zlib.cc
index 8aabfbc..f7d7b3a 100644
--- a/remoting/base/decoder_zlib.cc
+++ b/remoting/base/decoder_zlib.cc
@@ -26,6 +26,9 @@ DecoderZlib::DecoderZlib()
encoding_ = EncodingZlib;
}
+DecoderZlib::~DecoderZlib() {
+}
+
bool DecoderZlib::BeginDecode(scoped_refptr<media::VideoFrame> frame,
UpdatedRects* updated_rects,
Task* partial_decode_done,
diff --git a/remoting/base/decoder_zlib.h b/remoting/base/decoder_zlib.h
index ee897ab..d665342 100644
--- a/remoting/base/decoder_zlib.h
+++ b/remoting/base/decoder_zlib.h
@@ -14,6 +14,7 @@ class DecompressorZlib;
class DecoderZlib : public Decoder {
public:
DecoderZlib();
+ virtual ~DecoderZlib();
// Decoder implementations.
virtual bool BeginDecode(scoped_refptr<media::VideoFrame> frame,
diff --git a/remoting/base/protocol_decoder.cc b/remoting/base/protocol_decoder.cc
index aa26e15..f0dcd83 100644
--- a/remoting/base/protocol_decoder.cc
+++ b/remoting/base/protocol_decoder.cc
@@ -17,6 +17,8 @@ ProtocolDecoder::ProtocolDecoder()
next_payload_known_(false) {
}
+ProtocolDecoder::~ProtocolDecoder() {}
+
void ProtocolDecoder::ParseClientMessages(scoped_refptr<media::DataBuffer> data,
ClientMessageList* messages) {
ParseMessages<ChromotingClientMessage>(data, messages);
diff --git a/remoting/base/protocol_decoder.h b/remoting/base/protocol_decoder.h
index b74da64..abd90ac 100644
--- a/remoting/base/protocol_decoder.h
+++ b/remoting/base/protocol_decoder.h
@@ -25,7 +25,7 @@ class ProtocolDecoder {
public:
ProtocolDecoder();
- virtual ~ProtocolDecoder() {}
+ virtual ~ProtocolDecoder();
// Parse data received from network into ClientMessages. Ownership of |data|
// is passed to this object and output is written to |messages|.
diff --git a/remoting/client/chromoting_view.cc b/remoting/client/chromoting_view.cc
index 95d2dfa..8f53e31 100644
--- a/remoting/client/chromoting_view.cc
+++ b/remoting/client/chromoting_view.cc
@@ -14,6 +14,7 @@ ChromotingView::ChromotingView()
frame_height_(0) {
}
+ChromotingView::~ChromotingView() {}
// TODO(garykac): This assumes a single screen. This will need to be adjusted
// to add support for mulitple monitors.
diff --git a/remoting/client/chromoting_view.h b/remoting/client/chromoting_view.h
index d785b29..a41a0da 100644
--- a/remoting/client/chromoting_view.h
+++ b/remoting/client/chromoting_view.h
@@ -16,7 +16,7 @@ namespace remoting {
class ChromotingView {
public:
ChromotingView();
- virtual ~ChromotingView() {}
+ virtual ~ChromotingView();
// Get screen dimensions.
// TODO(garykac): This will need to be extended to support multi-monitors.
diff --git a/remoting/jingle_glue/jingle_info_task.cc b/remoting/jingle_glue/jingle_info_task.cc
index ca10e6a..309caf0 100644
--- a/remoting/jingle_glue/jingle_info_task.cc
+++ b/remoting/jingle_glue/jingle_info_task.cc
@@ -62,6 +62,12 @@ class JingleInfoTask::JingleInfoGetTask : public XmppTask {
};
+JingleInfoTask::JingleInfoTask(talk_base::TaskParent* parent)
+ : XmppTask(parent, buzz::XmppEngine::HL_TYPE) {
+}
+
+JingleInfoTask::~JingleInfoTask() {}
+
void JingleInfoTask::RefreshJingleInfoNow() {
JingleInfoGetTask* get_task = new JingleInfoGetTask(this);
get_task->Start();
diff --git a/remoting/jingle_glue/jingle_info_task.h b/remoting/jingle_glue/jingle_info_task.h
index 361b27a..cfd8a5e 100644
--- a/remoting/jingle_glue/jingle_info_task.h
+++ b/remoting/jingle_glue/jingle_info_task.h
@@ -22,9 +22,8 @@ namespace remoting {
// This is a copy of googleclient/talk/app/jingleinfotask.h .
class JingleInfoTask : public buzz::XmppTask {
public:
- explicit JingleInfoTask(talk_base::TaskParent* parent)
- : XmppTask(parent, buzz::XmppEngine::HL_TYPE) {
- }
+ explicit JingleInfoTask(talk_base::TaskParent* parent);
+ virtual ~JingleInfoTask();
virtual int ProcessStart();
void RefreshJingleInfoNow();
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index 1d57e6e..6dd8b8c 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -128,6 +128,7 @@
# depend on chromotocol_proto_lib for headers.
'hard_dependency': 1,
'sources': [
+ 'base/capture_data.cc',
'base/capture_data.h',
'base/compressor.h',
'base/compressor_zlib.cc',