diff options
author | vmpstr <vmpstr@chromium.org> | 2016-02-26 12:49:07 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-02-26 20:50:19 +0000 |
commit | 9750c9d9a4b7c8b84716facbf16c735ae9b355bf (patch) | |
tree | 9393c9ba347b5499b403c87eaed31e02b91bd673 | |
parent | 60c10a4ce69ac02dd77c3616e95d2d4f99bd6a29 (diff) | |
download | chromium_src-9750c9d9a4b7c8b84716facbf16c735ae9b355bf.zip chromium_src-9750c9d9a4b7c8b84716facbf16c735ae9b355bf.tar.gz chromium_src-9750c9d9a4b7c8b84716facbf16c735ae9b355bf.tar.bz2 |
media: Add out-of-line copy ctors for complex classes.
This patch adds out of line copy constructors for classes that our
clang-plugin considers heavy. This is an effort to enable copy
constructor checks by default.
BUG=436357
R=dalecurtis@chromium.org, dcheng@chromium.org, thakis@chromium.org
Review URL: https://codereview.chromium.org/1731403002
Cr-Commit-Position: refs/heads/master@{#377967}
38 files changed, 74 insertions, 0 deletions
diff --git a/media/base/audio_decoder_config.cc b/media/base/audio_decoder_config.cc index 9d3f672..3f279f2 100644 --- a/media/base/audio_decoder_config.cc +++ b/media/base/audio_decoder_config.cc @@ -70,6 +70,9 @@ AudioDecoderConfig::AudioDecoderConfig(AudioCodec codec, extra_data, is_encrypted, base::TimeDelta(), 0); } +AudioDecoderConfig::AudioDecoderConfig(const AudioDecoderConfig& other) = + default; + void AudioDecoderConfig::Initialize(AudioCodec codec, SampleFormat sample_format, ChannelLayout channel_layout, diff --git a/media/base/audio_decoder_config.h b/media/base/audio_decoder_config.h index a0e262f..c3489cc 100644 --- a/media/base/audio_decoder_config.h +++ b/media/base/audio_decoder_config.h @@ -68,6 +68,8 @@ class MEDIA_EXPORT AudioDecoderConfig { const std::vector<uint8_t>& extra_data, bool is_encrypted); + AudioDecoderConfig(const AudioDecoderConfig& other); + ~AudioDecoderConfig(); // Resets the internal state of this object. |codec_delay| is in frames. diff --git a/media/base/audio_shifter.cc b/media/base/audio_shifter.cc index c88af3a..6a268d3 100644 --- a/media/base/audio_shifter.cc +++ b/media/base/audio_shifter.cc @@ -82,6 +82,9 @@ AudioShifter::AudioQueueEntry::AudioQueueEntry( audio(audio_.release()) { } +AudioShifter::AudioQueueEntry::AudioQueueEntry(const AudioQueueEntry& other) = + default; + AudioShifter::AudioQueueEntry::~AudioQueueEntry() {} AudioShifter::AudioShifter(base::TimeDelta max_buffer_size, diff --git a/media/base/audio_shifter.h b/media/base/audio_shifter.h index 0156269..3429a2f 100644 --- a/media/base/audio_shifter.h +++ b/media/base/audio_shifter.h @@ -89,6 +89,7 @@ private: struct AudioQueueEntry { AudioQueueEntry(base::TimeTicks target_playout_time_, scoped_ptr<AudioBus> audio_); + AudioQueueEntry(const AudioQueueEntry& other); ~AudioQueueEntry(); base::TimeTicks target_playout_time; linked_ptr<AudioBus> audio; diff --git a/media/base/audio_video_metadata_extractor.cc b/media/base/audio_video_metadata_extractor.cc index 0ba36e1..5b92c15 100644 --- a/media/base/audio_video_metadata_extractor.cc +++ b/media/base/audio_video_metadata_extractor.cc @@ -54,6 +54,9 @@ const int kAttachedImageSizeLimit = 4 * 1024 * 1024; AudioVideoMetadataExtractor::StreamInfo::StreamInfo() {} +AudioVideoMetadataExtractor::StreamInfo::StreamInfo(const StreamInfo& other) = + default; + AudioVideoMetadataExtractor::StreamInfo::~StreamInfo() {} AudioVideoMetadataExtractor::AudioVideoMetadataExtractor() diff --git a/media/base/audio_video_metadata_extractor.h b/media/base/audio_video_metadata_extractor.h index 97f7a5b..4e5906d 100644 --- a/media/base/audio_video_metadata_extractor.h +++ b/media/base/audio_video_metadata_extractor.h @@ -26,6 +26,7 @@ class MEDIA_EXPORT AudioVideoMetadataExtractor { struct StreamInfo { StreamInfo(); + StreamInfo(const StreamInfo& other); ~StreamInfo(); std::string type; TagDictionary tags; diff --git a/media/base/bitstream_buffer.cc b/media/base/bitstream_buffer.cc index 49caf5b..5732981 100644 --- a/media/base/bitstream_buffer.cc +++ b/media/base/bitstream_buffer.cc @@ -23,6 +23,8 @@ BitstreamBuffer::BitstreamBuffer(int32_t id, size_(size), presentation_timestamp_(presentation_timestamp) {} +BitstreamBuffer::BitstreamBuffer(const BitstreamBuffer& other) = default; + BitstreamBuffer::~BitstreamBuffer() {} void BitstreamBuffer::SetDecryptConfig(const DecryptConfig& decrypt_config) { diff --git a/media/base/bitstream_buffer.h b/media/base/bitstream_buffer.h index fe3c8da3..9ceeaf89 100644 --- a/media/base/bitstream_buffer.h +++ b/media/base/bitstream_buffer.h @@ -28,6 +28,8 @@ class MEDIA_EXPORT BitstreamBuffer { size_t size, base::TimeDelta presentation_timestamp); + BitstreamBuffer(const BitstreamBuffer& other); + ~BitstreamBuffer(); void SetDecryptConfig(const DecryptConfig& decrypt_config); diff --git a/media/base/cdm_key_information.cc b/media/base/cdm_key_information.cc index 70d4464..efaed61 100644 --- a/media/base/cdm_key_information.cc +++ b/media/base/cdm_key_information.cc @@ -32,6 +32,8 @@ CdmKeyInformation::CdmKeyInformation(const uint8_t* key_id_data, status(status), system_code(system_code) {} +CdmKeyInformation::CdmKeyInformation(const CdmKeyInformation& other) = default; + CdmKeyInformation::~CdmKeyInformation() { } diff --git a/media/base/cdm_key_information.h b/media/base/cdm_key_information.h index 89c8112..7ed8eff 100644 --- a/media/base/cdm_key_information.h +++ b/media/base/cdm_key_information.h @@ -40,6 +40,7 @@ struct MEDIA_EXPORT CdmKeyInformation { size_t key_id_length, KeyStatus status, uint32_t system_code); + CdmKeyInformation(const CdmKeyInformation& other); ~CdmKeyInformation(); std::vector<uint8_t> key_id; diff --git a/media/base/key_system_info.cc b/media/base/key_system_info.cc index f36104a..da3586d 100644 --- a/media/base/key_system_info.cc +++ b/media/base/key_system_info.cc @@ -9,6 +9,8 @@ namespace media { KeySystemInfo::KeySystemInfo() { } +KeySystemInfo::KeySystemInfo(const KeySystemInfo& other) = default; + KeySystemInfo::~KeySystemInfo() { } diff --git a/media/base/key_system_info.h b/media/base/key_system_info.h index 0a9ba67..fe4dae7 100644 --- a/media/base/key_system_info.h +++ b/media/base/key_system_info.h @@ -28,6 +28,7 @@ namespace media { // the corresponding CDM. struct MEDIA_EXPORT KeySystemInfo { KeySystemInfo(); + KeySystemInfo(const KeySystemInfo& other); ~KeySystemInfo(); std::string key_system; diff --git a/media/base/serial_runner.cc b/media/base/serial_runner.cc index 2e085e3..6cb89cb 100644 --- a/media/base/serial_runner.cc +++ b/media/base/serial_runner.cc @@ -40,6 +40,7 @@ static void RunOnTaskRunner( } SerialRunner::Queue::Queue() {} +SerialRunner::Queue::Queue(const Queue& other) = default; SerialRunner::Queue::~Queue() {} void SerialRunner::Queue::Push(const base::Closure& closure) { diff --git a/media/base/serial_runner.h b/media/base/serial_runner.h index 4847e4c..3adfd64 100644 --- a/media/base/serial_runner.h +++ b/media/base/serial_runner.h @@ -34,6 +34,7 @@ class MEDIA_EXPORT SerialRunner { class MEDIA_EXPORT Queue { public: Queue(); + Queue(const Queue& other); ~Queue(); void Push(const base::Closure& closure); diff --git a/media/base/text_track_config.cc b/media/base/text_track_config.cc index 0d4b11f6..dbd2b2d 100644 --- a/media/base/text_track_config.cc +++ b/media/base/text_track_config.cc @@ -20,6 +20,8 @@ TextTrackConfig::TextTrackConfig(TextKind kind, id_(id) { } +TextTrackConfig::TextTrackConfig(const TextTrackConfig& other) = default; + bool TextTrackConfig::Matches(const TextTrackConfig& config) const { return config.kind() == kind_ && config.label() == label_ && diff --git a/media/base/text_track_config.h b/media/base/text_track_config.h index 58efba4..33128df 100644 --- a/media/base/text_track_config.h +++ b/media/base/text_track_config.h @@ -23,6 +23,7 @@ enum TextKind { class MEDIA_EXPORT TextTrackConfig { public: TextTrackConfig(); + TextTrackConfig(const TextTrackConfig& other); TextTrackConfig(TextKind kind, const std::string& label, const std::string& language, diff --git a/media/base/video_decoder_config.cc b/media/base/video_decoder_config.cc index dfe7254..930ffd9 100644 --- a/media/base/video_decoder_config.cc +++ b/media/base/video_decoder_config.cc @@ -55,6 +55,9 @@ VideoDecoderConfig::VideoDecoderConfig(VideoCodec codec, natural_size, extra_data, is_encrypted); } +VideoDecoderConfig::VideoDecoderConfig(const VideoDecoderConfig& other) = + default; + VideoDecoderConfig::~VideoDecoderConfig() {} void VideoDecoderConfig::Initialize(VideoCodec codec, diff --git a/media/base/video_decoder_config.h b/media/base/video_decoder_config.h index ae9340a..4a192d6 100644 --- a/media/base/video_decoder_config.h +++ b/media/base/video_decoder_config.h @@ -40,6 +40,8 @@ class MEDIA_EXPORT VideoDecoderConfig { const std::vector<uint8_t>& extra_data, bool is_encrypted); + VideoDecoderConfig(const VideoDecoderConfig& other); + ~VideoDecoderConfig(); // Resets the internal state of this object. diff --git a/media/capture/video/video_capture_device_info.cc b/media/capture/video/video_capture_device_info.cc index 3bb4df2..230c16b 100644 --- a/media/capture/video/video_capture_device_info.cc +++ b/media/capture/video/video_capture_device_info.cc @@ -15,6 +15,9 @@ VideoCaptureDeviceInfo::VideoCaptureDeviceInfo( : name(name), supported_formats(supported_formats) { } +VideoCaptureDeviceInfo::VideoCaptureDeviceInfo( + const VideoCaptureDeviceInfo& other) = default; + VideoCaptureDeviceInfo::~VideoCaptureDeviceInfo() { } diff --git a/media/capture/video/video_capture_device_info.h b/media/capture/video/video_capture_device_info.h index 3cdb1b5..c34b279 100644 --- a/media/capture/video/video_capture_device_info.h +++ b/media/capture/video/video_capture_device_info.h @@ -15,6 +15,7 @@ struct MEDIA_EXPORT VideoCaptureDeviceInfo { VideoCaptureDeviceInfo(); VideoCaptureDeviceInfo(const VideoCaptureDevice::Name& name, const VideoCaptureFormats& supported_formats); + VideoCaptureDeviceInfo(const VideoCaptureDeviceInfo& other); ~VideoCaptureDeviceInfo(); VideoCaptureDevice::Name name; diff --git a/media/cast/cast_config.cc b/media/cast/cast_config.cc index f3b1612..1a619fd 100644 --- a/media/cast/cast_config.cc +++ b/media/cast/cast_config.cc @@ -58,6 +58,8 @@ VideoSenderConfig::VideoSenderConfig() codec(CODEC_VIDEO_VP8), number_of_encode_threads(1) {} +VideoSenderConfig::VideoSenderConfig(const VideoSenderConfig& other) = default; + VideoSenderConfig::~VideoSenderConfig() {} AudioSenderConfig::AudioSenderConfig() @@ -72,6 +74,8 @@ AudioSenderConfig::AudioSenderConfig() bitrate(kDefaultAudioEncoderBitrate), codec(CODEC_AUDIO_OPUS) {} +AudioSenderConfig::AudioSenderConfig(const AudioSenderConfig& other) = default; + AudioSenderConfig::~AudioSenderConfig() {} FrameReceiverConfig::FrameReceiverConfig() @@ -84,6 +88,9 @@ FrameReceiverConfig::FrameReceiverConfig() target_frame_rate(0), codec(CODEC_UNKNOWN) {} +FrameReceiverConfig::FrameReceiverConfig(const FrameReceiverConfig& other) = + default; + FrameReceiverConfig::~FrameReceiverConfig() {} } // namespace cast diff --git a/media/cast/cast_config.h b/media/cast/cast_config.h index e6a0a62..465f924 100644 --- a/media/cast/cast_config.h +++ b/media/cast/cast_config.h @@ -59,6 +59,7 @@ enum SuggestedDefaults { // http://crbug.com/530839 struct AudioSenderConfig { AudioSenderConfig(); + AudioSenderConfig(const AudioSenderConfig& other); ~AudioSenderConfig(); // Identifier referring to the sender, used by the receiver. @@ -97,6 +98,7 @@ struct AudioSenderConfig { struct VideoSenderConfig { VideoSenderConfig(); + VideoSenderConfig(const VideoSenderConfig& other); ~VideoSenderConfig(); // Identifier referring to the sender, used by the receiver. @@ -163,6 +165,7 @@ struct VideoSenderConfig { // TODO(miu): Naming and minor type changes are badly needed in a later CL. struct FrameReceiverConfig { FrameReceiverConfig(); + FrameReceiverConfig(const FrameReceiverConfig& other); ~FrameReceiverConfig(); // The receiver's SSRC identifier. diff --git a/media/cast/logging/logging_defines.cc b/media/cast/logging/logging_defines.cc index c3c872a..22f326a 100644 --- a/media/cast/logging/logging_defines.cc +++ b/media/cast/logging/logging_defines.cc @@ -43,6 +43,7 @@ FrameEvent::FrameEvent() target_bitrate(0), encoder_cpu_utilization(-1.0), idealized_bitrate_utilization(-1.0) {} +FrameEvent::FrameEvent(const FrameEvent& other) = default; FrameEvent::~FrameEvent() {} PacketEvent::PacketEvent() diff --git a/media/cast/logging/logging_defines.h b/media/cast/logging/logging_defines.h index 00425be..257652d 100644 --- a/media/cast/logging/logging_defines.h +++ b/media/cast/logging/logging_defines.h @@ -54,6 +54,7 @@ enum EventMediaType { struct FrameEvent { FrameEvent(); + FrameEvent(const FrameEvent& other); ~FrameEvent(); RtpTimeTicks rtp_timestamp; diff --git a/media/cast/net/rtcp/rtcp_defines.cc b/media/cast/net/rtcp/rtcp_defines.cc index b4f363e..f7a1a6c 100644 --- a/media/cast/net/rtcp/rtcp_defines.cc +++ b/media/cast/net/rtcp/rtcp_defines.cc @@ -21,6 +21,8 @@ RtcpReceiverEventLogMessage::~RtcpReceiverEventLogMessage() {} RtcpReceiverFrameLogMessage::RtcpReceiverFrameLogMessage(RtpTimeTicks timestamp) : rtp_timestamp_(timestamp) {} +RtcpReceiverFrameLogMessage::RtcpReceiverFrameLogMessage( + const RtcpReceiverFrameLogMessage& other) = default; RtcpReceiverFrameLogMessage::~RtcpReceiverFrameLogMessage() {} RtcpReceiverReferenceTimeReport::RtcpReceiverReferenceTimeReport() diff --git a/media/cast/net/rtcp/rtcp_defines.h b/media/cast/net/rtcp/rtcp_defines.h index 69a81bf..98d69bb 100644 --- a/media/cast/net/rtcp/rtcp_defines.h +++ b/media/cast/net/rtcp/rtcp_defines.h @@ -69,6 +69,7 @@ typedef std::list<RtcpReceiverEventLogMessage> RtcpReceiverEventLogMessages; struct RtcpReceiverFrameLogMessage { explicit RtcpReceiverFrameLogMessage(RtpTimeTicks rtp_timestamp); + RtcpReceiverFrameLogMessage(const RtcpReceiverFrameLogMessage& other); ~RtcpReceiverFrameLogMessage(); const RtpTimeTicks rtp_timestamp_; diff --git a/media/cdm/player_tracker_impl.cc b/media/cdm/player_tracker_impl.cc index 98f2050..7d5cda3 100644 --- a/media/cdm/player_tracker_impl.cc +++ b/media/cdm/player_tracker_impl.cc @@ -15,6 +15,9 @@ PlayerTrackerImpl::PlayerCallbacks::PlayerCallbacks( const base::Closure& cdm_unset_cb) : new_key_cb(new_key_cb), cdm_unset_cb(cdm_unset_cb) {} +PlayerTrackerImpl::PlayerCallbacks::PlayerCallbacks( + const PlayerCallbacks& other) = default; + PlayerTrackerImpl::PlayerCallbacks::~PlayerCallbacks() { } diff --git a/media/cdm/player_tracker_impl.h b/media/cdm/player_tracker_impl.h index e2dc4a5..299593d 100644 --- a/media/cdm/player_tracker_impl.h +++ b/media/cdm/player_tracker_impl.h @@ -35,6 +35,7 @@ class MEDIA_EXPORT PlayerTrackerImpl : public PlayerTracker { struct PlayerCallbacks { PlayerCallbacks(const base::Closure& new_key_cb, const base::Closure& cdm_unset_cb); + PlayerCallbacks(const PlayerCallbacks& other); ~PlayerCallbacks(); base::Closure new_key_cb; diff --git a/media/filters/gpu_video_decoder.cc b/media/filters/gpu_video_decoder.cc index 6801aaf..260bfaa 100644 --- a/media/filters/gpu_video_decoder.cc +++ b/media/filters/gpu_video_decoder.cc @@ -53,6 +53,9 @@ GpuVideoDecoder::PendingDecoderBuffer::PendingDecoderBuffer( : shm_buffer(s), buffer(b), done_cb(done_cb) { } +GpuVideoDecoder::PendingDecoderBuffer::PendingDecoderBuffer( + const PendingDecoderBuffer& other) = default; + GpuVideoDecoder::PendingDecoderBuffer::~PendingDecoderBuffer() {} GpuVideoDecoder::BufferData::BufferData(int32_t bbid, diff --git a/media/filters/gpu_video_decoder.h b/media/filters/gpu_video_decoder.h index eb82db6..c615684 100644 --- a/media/filters/gpu_video_decoder.h +++ b/media/filters/gpu_video_decoder.h @@ -102,6 +102,7 @@ class MEDIA_EXPORT GpuVideoDecoder PendingDecoderBuffer(SHMBuffer* s, const scoped_refptr<DecoderBuffer>& b, const DecodeCB& done_cb); + PendingDecoderBuffer(const PendingDecoderBuffer& other); ~PendingDecoderBuffer(); SHMBuffer* shm_buffer; scoped_refptr<DecoderBuffer> buffer; diff --git a/media/filters/video_renderer_algorithm.cc b/media/filters/video_renderer_algorithm.cc index 230c464..2a98367 100644 --- a/media/filters/video_renderer_algorithm.cc +++ b/media/filters/video_renderer_algorithm.cc @@ -22,6 +22,9 @@ VideoRendererAlgorithm::ReadyFrame::ReadyFrame( drop_count(0) { } +VideoRendererAlgorithm::ReadyFrame::ReadyFrame(const ReadyFrame& other) = + default; + VideoRendererAlgorithm::ReadyFrame::~ReadyFrame() { } diff --git a/media/filters/video_renderer_algorithm.h b/media/filters/video_renderer_algorithm.h index 3eea86b..5d1169f 100644 --- a/media/filters/video_renderer_algorithm.h +++ b/media/filters/video_renderer_algorithm.h @@ -159,6 +159,7 @@ class MEDIA_EXPORT VideoRendererAlgorithm { // Metadata container for enqueued frames. See |frame_queue_| below. struct ReadyFrame { ReadyFrame(const scoped_refptr<VideoFrame>& frame); + ReadyFrame(const ReadyFrame& other); ~ReadyFrame(); // For use with std::lower_bound. diff --git a/media/formats/webm/tracks_builder.cc b/media/formats/webm/tracks_builder.cc index 6b2aaea..458f522 100644 --- a/media/formats/webm/tracks_builder.cc +++ b/media/formats/webm/tracks_builder.cc @@ -294,6 +294,8 @@ TracksBuilder::Track::Track(int track_num, } } +TracksBuilder::Track::Track(const Track& other) = default; + int TracksBuilder::Track::GetSize() const { return MasterElementSize(kWebMIdTrackEntry, GetPayloadSize()); } diff --git a/media/formats/webm/tracks_builder.h b/media/formats/webm/tracks_builder.h index dc0283e..41d0938 100644 --- a/media/formats/webm/tracks_builder.h +++ b/media/formats/webm/tracks_builder.h @@ -83,6 +83,7 @@ class TracksBuilder { int audio_channels, double audio_sampling_frequency, bool allow_invalid_values); + Track(const Track& other); int GetSize() const; void Write(uint8_t** buf, int* buf_size) const; diff --git a/media/formats/webm/webm_cluster_parser.cc b/media/formats/webm/webm_cluster_parser.cc index e4fb5bb..21c1895 100644 --- a/media/formats/webm/webm_cluster_parser.cc +++ b/media/formats/webm/webm_cluster_parser.cc @@ -598,6 +598,8 @@ WebMClusterParser::Track::Track(int track_num, default_duration_ > base::TimeDelta()); } +WebMClusterParser::Track::Track(const Track& other) = default; + WebMClusterParser::Track::~Track() {} DecodeTimestamp WebMClusterParser::Track::GetReadyUpperBound() { diff --git a/media/formats/webm/webm_cluster_parser.h b/media/formats/webm/webm_cluster_parser.h index 3976cfa..c719515 100644 --- a/media/formats/webm/webm_cluster_parser.h +++ b/media/formats/webm/webm_cluster_parser.h @@ -55,6 +55,7 @@ class MEDIA_EXPORT WebMClusterParser : public WebMParserClient { bool is_video, base::TimeDelta default_duration, const scoped_refptr<MediaLog>& media_log); + Track(const Track& other); ~Track(); int track_num() const { return track_num_; } diff --git a/media/video/video_decode_accelerator.cc b/media/video/video_decode_accelerator.cc index 0d3887d..4275d5f 100644 --- a/media/video/video_decode_accelerator.cc +++ b/media/video/video_decode_accelerator.cc @@ -51,6 +51,9 @@ VideoDecodeAccelerator::SupportedProfile::~SupportedProfile() {} VideoDecodeAccelerator::Capabilities::Capabilities() : flags(NO_FLAGS) {} +VideoDecodeAccelerator::Capabilities::Capabilities(const Capabilities& other) = + default; + VideoDecodeAccelerator::Capabilities::~Capabilities() {} std::string VideoDecodeAccelerator::Capabilities::AsHumanReadableString() diff --git a/media/video/video_decode_accelerator.h b/media/video/video_decode_accelerator.h index 2b5f211..c0f6b1e 100644 --- a/media/video/video_decode_accelerator.h +++ b/media/video/video_decode_accelerator.h @@ -38,6 +38,7 @@ class MEDIA_EXPORT VideoDecodeAccelerator { struct MEDIA_EXPORT Capabilities { Capabilities(); + Capabilities(const Capabilities& other); ~Capabilities(); std::string AsHumanReadableString() const; |