| Index: third_party/WebKit/Source/modules/mediastream/MediaStreamTrack.cpp
|
| diff --git a/third_party/WebKit/Source/modules/mediastream/MediaStreamTrack.cpp b/third_party/WebKit/Source/modules/mediastream/MediaStreamTrack.cpp
|
| index 3094c3175160ddc42a91cca5caf4da88d2f65335..dc539164fb490227299b6306716cba753158ee0a 100644
|
| --- a/third_party/WebKit/Source/modules/mediastream/MediaStreamTrack.cpp
|
| +++ b/third_party/WebKit/Source/modules/mediastream/MediaStreamTrack.cpp
|
| @@ -31,6 +31,7 @@
|
| #include "core/dom/ExecutionContext.h"
|
| #include "core/events/Event.h"
|
| #include "core/frame/Deprecation.h"
|
| +#include "modules/mediastream/MediaConstraintsImpl.h"
|
| #include "modules/mediastream/MediaStream.h"
|
| #include "modules/mediastream/MediaStreamTrackSourcesCallback.h"
|
| #include "modules/mediastream/MediaStreamTrackSourcesRequestImpl.h"
|
| @@ -55,6 +56,8 @@ MediaStreamTrack::MediaStreamTrack(ExecutionContext* context, MediaStreamCompone
|
| , m_isIteratingRegisteredMediaStreams(false)
|
| , m_stopped(false)
|
| , m_component(component)
|
| + // The source's constraints aren't yet initialized at creation time.
|
| + , m_constraints()
|
| {
|
| m_component->source()->addObserver(this);
|
| }
|
| @@ -170,6 +173,16 @@ MediaStreamTrack* MediaStreamTrack::clone(ExecutionContext* context)
|
| return clonedTrack;
|
| }
|
|
|
| +void MediaStreamTrack::getConstraints(MediaTrackConstraints& constraints)
|
| +{
|
| + MediaConstraintsImpl::convertConstraints(m_constraints, constraints);
|
| +}
|
| +
|
| +void MediaStreamTrack::setConstraints(const WebMediaConstraints& constraints)
|
| +{
|
| + m_constraints = constraints;
|
| +}
|
| +
|
| bool MediaStreamTrack::ended() const
|
| {
|
| return m_stopped || (m_readyState == MediaStreamSource::ReadyStateEnded);
|
|
|