From d0af7203fccbb273cd4ee112b12ca93c18441efa Mon Sep 17 00:00:00 2001
From: "erg@google.com" <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Fri, 1 Oct 2010 22:05:28 +0000
Subject: Revert "FBTF: Another big ctor/dtor cleanup found by automated
tools."
This reverts commit 27ea47d65cf8767f350113d5ad9e25170efde811 (r61237).
BUG=none
TEST=compiles
Review URL: http://codereview.chromium.org/3609005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61240 0039d316-1c4b-4281-b951-d872f2087c98
---
remoting/base/capture_data.cc | 26 --------------------------
remoting/base/capture_data.h | 15 +++++++++++----
remoting/base/decoder_verbatim.cc | 2 --
remoting/base/decoder_verbatim.h | 1 -
remoting/base/decoder_zlib.cc | 3 ---
remoting/base/decoder_zlib.h | 1 -
remoting/base/protocol_decoder.cc | 2 --
remoting/base/protocol_decoder.h | 2 +-
8 files changed, 12 insertions(+), 40 deletions(-)
delete mode 100644 remoting/base/capture_data.cc
(limited to 'remoting/base')
diff --git a/remoting/base/capture_data.cc b/remoting/base/capture_data.cc
deleted file mode 100644
index 2d96441..0000000
--- a/remoting/base/capture_data.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-// 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 e99aa38..b06dfa4 100644
--- a/remoting/base/capture_data.h
+++ b/remoting/base/capture_data.h
@@ -15,11 +15,16 @@
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
@@ -29,7 +34,9 @@ class CaptureData : public base::RefCountedThreadSafe<CaptureData> {
CaptureData(const DataPlanes &data_planes,
int width,
int height,
- PixelFormat format);
+ PixelFormat format) :
+ data_planes_(data_planes), dirty_rects_(),
+ width_(width), height_(height), pixel_format_(format) { }
// Get the data_planes data of the last capture.
const DataPlanes& data_planes() const { return data_planes_; }
@@ -58,7 +65,7 @@ class CaptureData : public base::RefCountedThreadSafe<CaptureData> {
PixelFormat pixel_format_;
friend class base::RefCountedThreadSafe<CaptureData>;
- virtual ~CaptureData();
+ ~CaptureData() {}
};
} // namespace remoting
diff --git a/remoting/base/decoder_verbatim.cc b/remoting/base/decoder_verbatim.cc
index 1cb426d..fd0b3d1 100644
--- a/remoting/base/decoder_verbatim.cc
+++ b/remoting/base/decoder_verbatim.cc
@@ -20,8 +20,6 @@ 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 c924a09..67b6cfa 100644
--- a/remoting/base/decoder_verbatim.h
+++ b/remoting/base/decoder_verbatim.h
@@ -12,7 +12,6 @@ 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 f7d7b3a..8aabfbc 100644
--- a/remoting/base/decoder_zlib.cc
+++ b/remoting/base/decoder_zlib.cc
@@ -26,9 +26,6 @@ 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 d665342..ee897ab 100644
--- a/remoting/base/decoder_zlib.h
+++ b/remoting/base/decoder_zlib.h
@@ -14,7 +14,6 @@ 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 f0dcd83..aa26e15 100644
--- a/remoting/base/protocol_decoder.cc
+++ b/remoting/base/protocol_decoder.cc
@@ -17,8 +17,6 @@ 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 abd90ac..b74da64 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|.
--
cgit v1.1