summaryrefslogtreecommitdiffstats
path: root/remoting/client/software_video_renderer.cc
diff options
context:
space:
mode:
authorsergeyu <sergeyu@chromium.org>2015-12-23 16:20:51 -0800
committerCommit bot <commit-bot@chromium.org>2015-12-24 00:22:13 +0000
commit42ad7c02c6aacbd7e8427cc062de5b6c4d596e5a (patch)
tree5d69f8f65e9c3b096bb03f0256b155c745925bed /remoting/client/software_video_renderer.cc
parent2e53cb5448df90f11940a2e55ef6c74bd74ac3e7 (diff)
downloadchromium_src-42ad7c02c6aacbd7e8427cc062de5b6c4d596e5a.zip
chromium_src-42ad7c02c6aacbd7e8427cc062de5b6c4d596e5a.tar.gz
chromium_src-42ad7c02c6aacbd7e8427cc062de5b6c4d596e5a.tar.bz2
Use std::move() instead of .Pass() in remoting/*
Now there is a presubmit check that doesn't allow Pass() anymore. See https://www.chromium.org/rvalue-references for information about std::move in chromium. Review URL: https://codereview.chromium.org/1545723002 Cr-Commit-Position: refs/heads/master@{#366778}
Diffstat (limited to 'remoting/client/software_video_renderer.cc')
-rw-r--r--remoting/client/software_video_renderer.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/remoting/client/software_video_renderer.cc b/remoting/client/software_video_renderer.cc
index 8172369..9726cd5 100644
--- a/remoting/client/software_video_renderer.cc
+++ b/remoting/client/software_video_renderer.cc
@@ -4,6 +4,8 @@
#include "remoting/client/software_video_renderer.h"
+#include <utility>
+
#include "base/bind.h"
#include "base/callback.h"
#include "base/callback_helpers.h"
@@ -35,8 +37,7 @@ namespace {
class RgbToBgrVideoDecoderFilter : public VideoDecoder {
public:
RgbToBgrVideoDecoderFilter(scoped_ptr<VideoDecoder> parent)
- : parent_(parent.Pass()) {
- }
+ : parent_(std::move(parent)) {}
bool DecodePacket(const VideoPacket& packet,
webrtc::DesktopFrame* frame) override {
@@ -64,7 +65,7 @@ scoped_ptr<webrtc::DesktopFrame> DoDecodeFrame(
scoped_ptr<webrtc::DesktopFrame> frame) {
if (!decoder->DecodePacket(*packet, frame.get()))
frame.reset();
- return frame.Pass();
+ return frame;
}
} // namespace
@@ -100,9 +101,8 @@ void SoftwareVideoRenderer::OnSessionConfig(
}
if (consumer_->GetPixelFormat() == FrameConsumer::FORMAT_RGBA) {
- scoped_ptr<VideoDecoder> wrapper(
- new RgbToBgrVideoDecoderFilter(decoder_.Pass()));
- decoder_ = wrapper.Pass();
+ decoder_ =
+ make_scoped_ptr(new RgbToBgrVideoDecoderFilter(std::move(decoder_)));
}
}
@@ -173,7 +173,7 @@ void SoftwareVideoRenderer::RenderFrame(
return;
}
- consumer_->DrawFrame(frame.Pass(),
+ consumer_->DrawFrame(std::move(frame),
base::Bind(&SoftwareVideoRenderer::OnFrameRendered,
weak_factory_.GetWeakPtr(), frame_id, done));
}