Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(401)

Unified Diff: media/formats/webm/cluster_builder.cc

Issue 1544313002: Convert Pass()→std::move() in //media (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/filters/video_frame_stream_unittest.cc ('k') | media/formats/webm/opus_packet_builder.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/formats/webm/cluster_builder.cc
diff --git a/media/formats/webm/cluster_builder.cc b/media/formats/webm/cluster_builder.cc
index b28b03b7ba355ae3818773558dd937f475d2e481..b3ecc9803ca112881e4fbc482e90f98196598904 100644
--- a/media/formats/webm/cluster_builder.cc
+++ b/media/formats/webm/cluster_builder.cc
@@ -4,6 +4,8 @@
#include "media/formats/webm/cluster_builder.h"
+#include <utility>
+
#include "base/logging.h"
#include "media/base/data_buffer.h"
#include "media/formats/webm/webm_constants.h"
@@ -55,7 +57,7 @@ enum {
};
Cluster::Cluster(scoped_ptr<uint8_t[]> data, int size)
- : data_(data.Pass()), size_(size) {}
+ : data_(std::move(data)), size_(size) {}
Cluster::~Cluster() {}
ClusterBuilder::ClusterBuilder() { Reset(); }
@@ -189,9 +191,9 @@ scoped_ptr<Cluster> ClusterBuilder::Finish() {
UpdateUInt64(kClusterSizeOffset, bytes_used_ - (kClusterSizeOffset + 8));
- scoped_ptr<Cluster> ret(new Cluster(buffer_.Pass(), bytes_used_));
+ scoped_ptr<Cluster> ret(new Cluster(std::move(buffer_), bytes_used_));
Reset();
- return ret.Pass();
+ return ret;
}
scoped_ptr<Cluster> ClusterBuilder::FinishWithUnknownSize() {
@@ -199,9 +201,9 @@ scoped_ptr<Cluster> ClusterBuilder::FinishWithUnknownSize() {
UpdateUInt64(kClusterSizeOffset, kWebMUnknownSize);
- scoped_ptr<Cluster> ret(new Cluster(buffer_.Pass(), bytes_used_));
+ scoped_ptr<Cluster> ret(new Cluster(std::move(buffer_), bytes_used_));
Reset();
- return ret.Pass();
+ return ret;
}
void ClusterBuilder::Reset() {
« no previous file with comments | « media/filters/video_frame_stream_unittest.cc ('k') | media/formats/webm/opus_packet_builder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698