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

Unified Diff: Source/WebCore/Modules/mediastream/MediaStreamTrack.h

Issue 13776002: MediaStream should fire ended event when all tracks are ended (Closed) Base URL: https://chromium.googlesource.com/chromium/blink@master
Patch Set: MediaStream should fire ended event when all tracks are ended Created 7 years, 8 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: Source/WebCore/Modules/mediastream/MediaStreamTrack.h
diff --git a/Source/WebCore/Modules/mediastream/MediaStreamTrack.h b/Source/WebCore/Modules/mediastream/MediaStreamTrack.h
index e7fd13e65b2f6752d6eb175cce5478c1070374be..fbf113b0863c2b6dd4daebf7ce4a8f3632527e0a 100644
--- a/Source/WebCore/Modules/mediastream/MediaStreamTrack.h
+++ b/Source/WebCore/Modules/mediastream/MediaStreamTrack.h
@@ -39,11 +39,12 @@
namespace WebCore {
+class MediaStream;
class MediaStreamComponent;
class MediaStreamTrack : public RefCounted<MediaStreamTrack>, public ActiveDOMObject, public EventTarget, public MediaStreamSource::Observer {
public:
- static PassRefPtr<MediaStreamTrack> create(ScriptExecutionContext*, MediaStreamComponent*);
+ static PassRefPtr<MediaStreamTrack> create(ScriptExecutionContext*, MediaStreamComponent*, MediaStream*);
virtual ~MediaStreamTrack();
String kind() const;
@@ -53,6 +54,8 @@ public:
bool enabled() const;
void setEnabled(bool);
+ void setStream(MediaStream* stream) { m_stream = stream; }
abarth-chromium 2013/04/08 16:58:41 I'd probably have used "clearStream" here rather t
+
String readyState() const;
DEFINE_ATTRIBUTE_EVENT_LISTENER(mute);
@@ -73,7 +76,7 @@ public:
using RefCounted<MediaStreamTrack>::deref;
private:
- MediaStreamTrack(ScriptExecutionContext*, MediaStreamComponent*);
+ MediaStreamTrack(ScriptExecutionContext*, MediaStreamComponent*, MediaStream*);
// EventTarget
virtual EventTargetData* eventTargetData() OVERRIDE;
@@ -87,6 +90,7 @@ private:
bool m_stopped;
RefPtr<MediaStreamComponent> m_component;
+ MediaStream* m_stream;
};
typedef Vector<RefPtr<MediaStreamTrack> > MediaStreamTrackVector;

Powered by Google App Engine
This is Rietveld 408576698