third_party/WebKit/Source/modules/mediastream/MediaStream.h - Issue 1362933003: Remove MediaStream label, ended attributes and stop() method

Side by Side Diff: third_party/WebKit/Source/modules/mediastream/MediaStream.h

Issue 1362933003: Remove MediaStream label, ended attributes and stop() method (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 2 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 unified diff | Download patch

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2011 Google Inc. All rights reserved.	2 * Copyright (C) 2011 Google Inc. All rights reserved.

3 * Copyright (C) 2011 Ericsson AB. All rights reserved.	3 * Copyright (C) 2011 Ericsson AB. All rights reserved.

4 *	4 *

5 * Redistribution and use in source and binary forms, with or without	5 * Redistribution and use in source and binary forms, with or without

6 * modification, are permitted provided that the following conditions	6 * modification, are permitted provided that the following conditions

7 * are met:	7 * are met:

8 * 1. Redistributions of source code must retain the above copyright	8 * 1. Redistributions of source code must retain the above copyright

9 * notice, this list of conditions and the following disclaimer.	9 * notice, this list of conditions and the following disclaimer.

10 * 2. Redistributions in binary form must reproduce the above copyright	10 * 2. Redistributions in binary form must reproduce the above copyright

(...skipping 35 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
46 REFCOUNTED_GARBAGE_COLLECTED_EVENT_TARGET(MediaStream);	46 REFCOUNTED_GARBAGE_COLLECTED_EVENT_TARGET(MediaStream);

47 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(MediaStream);	47 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(MediaStream);

48 DEFINE_WRAPPERTYPEINFO();	48 DEFINE_WRAPPERTYPEINFO();

49 public:	49 public:

50 static MediaStream* create(ExecutionContext*);	50 static MediaStream* create(ExecutionContext*);

51 static MediaStream* create(ExecutionContext, MediaStream);	51 static MediaStream* create(ExecutionContext, MediaStream);

52 static MediaStream* create(ExecutionContext*, const MediaStreamTrackVector&) ;	52 static MediaStream* create(ExecutionContext*, const MediaStreamTrackVector&) ;

53 static MediaStream* create(ExecutionContext*, PassRefPtr<MediaStreamDescript or>);	53 static MediaStream* create(ExecutionContext*, PassRefPtr<MediaStreamDescript or>);

54 ~MediaStream() override;	54 ~MediaStream() override;

55	55

56 // DEPRECATED

57 String label() const { return m_descriptor->id(); }

58

59 String id() const { return m_descriptor->id(); }	56 String id() const { return m_descriptor->id(); }

60	57

61 void addTrack(MediaStreamTrack*, ExceptionState&);	58 void addTrack(MediaStreamTrack*, ExceptionState&);

62 void removeTrack(MediaStreamTrack*, ExceptionState&);	59 void removeTrack(MediaStreamTrack*, ExceptionState&);

63 MediaStreamTrack* getTrackById(String);	60 MediaStreamTrack* getTrackById(String);

64 MediaStream* clone(ExecutionContext*);	61 MediaStream* clone(ExecutionContext*);

65	62

66 MediaStreamTrackVector getAudioTracks() const { return m_audioTracks; }	63 MediaStreamTrackVector getAudioTracks() const { return m_audioTracks; }

67 MediaStreamTrackVector getVideoTracks() const { return m_videoTracks; }	64 MediaStreamTrackVector getVideoTracks() const { return m_videoTracks; }

68 MediaStreamTrackVector getTracks();	65 MediaStreamTrackVector getTracks();

69	66

70 bool active() const { return m_descriptor->active(); }	67 bool active() const { return m_descriptor->active(); }

71 bool ended() const;

72 void stop();

73	68

74 DEFINE_ATTRIBUTE_EVENT_LISTENER(active);	69 DEFINE_ATTRIBUTE_EVENT_LISTENER(active);

75 DEFINE_ATTRIBUTE_EVENT_LISTENER(inactive);	70 DEFINE_ATTRIBUTE_EVENT_LISTENER(inactive);

76 DEFINE_ATTRIBUTE_EVENT_LISTENER(ended);	71 DEFINE_ATTRIBUTE_EVENT_LISTENER(ended);

77 DEFINE_ATTRIBUTE_EVENT_LISTENER(addtrack);	72 DEFINE_ATTRIBUTE_EVENT_LISTENER(addtrack);

78 DEFINE_ATTRIBUTE_EVENT_LISTENER(removetrack);	73 DEFINE_ATTRIBUTE_EVENT_LISTENER(removetrack);

79	74

80 void trackEnded();	75 void trackEnded();

81	76

82 // MediaStreamDescriptorClient	77 // MediaStreamDescriptorClient

(...skipping 36 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
119	114

120 Timer<MediaStream> m_scheduledEventTimer;	115 Timer<MediaStream> m_scheduledEventTimer;

121 WillBeHeapVector<RefPtrWillBeMember<Event>> m_scheduledEvents;	116 WillBeHeapVector<RefPtrWillBeMember<Event>> m_scheduledEvents;

122 };	117 };

123	118

124 typedef HeapVector<Member<MediaStream>> MediaStreamVector;	119 typedef HeapVector<Member<MediaStream>> MediaStreamVector;

125	120

126 } // namespace blink	121 } // namespace blink

127	122

128 #endif // MediaStream_h	123 #endif // MediaStream_h

OLD	NEW