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

Unified Diff: services/media/factory_service/media_timeline_controller_impl.cc

Issue 2069873003: Motown: Define MediaRenderer and make it the way we identify renderers. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Fix build break...audio_track_controller.* gone for good. Created 4 years, 6 months 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
Index: services/media/factory_service/media_timeline_controller_impl.cc
diff --git a/services/media/factory_service/media_timeline_controller_impl.cc b/services/media/factory_service/media_timeline_controller_impl.cc
index 54bb564ee9fb75eee287ab02d60ea4854219122b..b758960569d36a71157ed3842114b8b2387382fa 100644
--- a/services/media/factory_service/media_timeline_controller_impl.cc
+++ b/services/media/factory_service/media_timeline_controller_impl.cc
@@ -44,9 +44,10 @@ MediaTimelineControllerImpl::~MediaTimelineControllerImpl() {
void MediaTimelineControllerImpl::AddControlSite(
InterfaceHandle<MediaTimelineControlSite> control_site) {
- site_states_.emplace_back(
- this, MediaTimelineControlSitePtr::Create(std::move(control_site)));
- site_states_.back().HandleStatusUpdates();
+ site_states_.push_back(std::unique_ptr<SiteState>(new SiteState(
+ this, MediaTimelineControlSitePtr::Create(std::move(control_site)))));
+
+ site_states_.back()->HandleStatusUpdates();
}
void MediaTimelineControllerImpl::GetControlSite(
@@ -170,8 +171,8 @@ void MediaTimelineControllerImpl::SetTimelineTransform(
pending_transition_ = transition;
// Initiate the transition for each site.
- for (const SiteState& site_state : site_states_) {
- site_state.consumer_->SetTimelineTransform(
+ for (const std::unique_ptr<SiteState>& site_state : site_states_) {
+ site_state->consumer_->SetTimelineTransform(
subject_time, reference_delta, subject_delta, effective_reference_time,
effective_subject_time, transition->NewCallback());
}
@@ -186,8 +187,8 @@ void MediaTimelineControllerImpl::SetTimelineTransform(
void MediaTimelineControllerImpl::HandleSiteEndOfStreamChange() {
bool end_of_stream = true;
- for (const SiteState& site_state : site_states_) {
- if (!site_state.end_of_stream_) {
+ for (const std::unique_ptr<SiteState>& site_state : site_states_) {
+ if (!site_state->end_of_stream_) {
end_of_stream = false;
break;
}
@@ -206,11 +207,6 @@ MediaTimelineControllerImpl::SiteState::SiteState(
site_->GetTimelineConsumer(GetProxy(&consumer_));
}
-MediaTimelineControllerImpl::SiteState::SiteState(SiteState&& other)
- : parent_(other.parent_),
- site_(other.site_.Pass()),
- consumer_(other.consumer_.Pass()) {}
-
MediaTimelineControllerImpl::SiteState::~SiteState() {}
void MediaTimelineControllerImpl::SiteState::HandleStatusUpdates(

Powered by Google App Engine
This is Rietveld 408576698