| Index: Source/modules/mediastream/MediaStream.h
|
| diff --git a/Source/modules/mediastream/MediaStream.h b/Source/modules/mediastream/MediaStream.h
|
| index c47cfbd83077c685fbbbbeeac5bb73fa76b47517..a5e2e92febcea4bd270ddf0d6c3c0887613d4571 100644
|
| --- a/Source/modules/mediastream/MediaStream.h
|
| +++ b/Source/modules/mediastream/MediaStream.h
|
| @@ -47,9 +47,6 @@ public:
|
| static PassRefPtr<MediaStream> create(ScriptExecutionContext*, PassRefPtr<MediaStreamDescriptor>);
|
| virtual ~MediaStream();
|
|
|
| - // DEPRECATED
|
| - String label() const { return m_descriptor->id(); }
|
| -
|
| String id() const { return m_descriptor->id(); }
|
|
|
| void addTrack(PassRefPtr<MediaStreamTrack>, ExceptionCode&);
|
| @@ -60,6 +57,7 @@ public:
|
| MediaStreamTrackVector getVideoTracks() const { return m_videoTracks; }
|
|
|
| bool ended() const;
|
| + void stop();
|
|
|
| DEFINE_ATTRIBUTE_EVENT_LISTENER(ended);
|
| DEFINE_ATTRIBUTE_EVENT_LISTENER(addtrack);
|
| @@ -69,8 +67,6 @@ public:
|
| virtual void trackEnded() OVERRIDE;
|
| virtual void streamEnded() OVERRIDE;
|
|
|
| - virtual bool isLocal() const { return false; }
|
| -
|
| MediaStreamDescriptor* descriptor() const { return m_descriptor.get(); }
|
|
|
| // EventTarget
|
|
|