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

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

Issue 2140133005: Remove MediaStream ended event from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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
OLDNEW
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 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 MediaStream* clone(ExecutionContext*); 60 MediaStream* clone(ExecutionContext*);
61 61
62 MediaStreamTrackVector getAudioTracks() const { return m_audioTracks; } 62 MediaStreamTrackVector getAudioTracks() const { return m_audioTracks; }
63 MediaStreamTrackVector getVideoTracks() const { return m_videoTracks; } 63 MediaStreamTrackVector getVideoTracks() const { return m_videoTracks; }
64 MediaStreamTrackVector getTracks(); 64 MediaStreamTrackVector getTracks();
65 65
66 bool active() const { return m_descriptor->active(); } 66 bool active() const { return m_descriptor->active(); }
67 67
68 DEFINE_ATTRIBUTE_EVENT_LISTENER(active); 68 DEFINE_ATTRIBUTE_EVENT_LISTENER(active);
69 DEFINE_ATTRIBUTE_EVENT_LISTENER(inactive); 69 DEFINE_ATTRIBUTE_EVENT_LISTENER(inactive);
70 DEFINE_ATTRIBUTE_EVENT_LISTENER(ended);
71 DEFINE_ATTRIBUTE_EVENT_LISTENER(addtrack); 70 DEFINE_ATTRIBUTE_EVENT_LISTENER(addtrack);
72 DEFINE_ATTRIBUTE_EVENT_LISTENER(removetrack); 71 DEFINE_ATTRIBUTE_EVENT_LISTENER(removetrack);
73 72
74 void trackEnded(); 73 void trackEnded();
75 74
76 // MediaStreamDescriptorClient 75 // MediaStreamDescriptorClient
77 void streamEnded() override; 76 void streamEnded() override;
78 77
79 MediaStreamDescriptor* descriptor() const { return m_descriptor; } 78 MediaStreamDescriptor* descriptor() const { return m_descriptor; }
80 79
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 HeapVector<Member<Event>> m_scheduledEvents; 115 HeapVector<Member<Event>> m_scheduledEvents;
117 }; 116 };
118 117
119 typedef HeapVector<Member<MediaStream>> MediaStreamVector; 118 typedef HeapVector<Member<MediaStream>> MediaStreamVector;
120 119
121 MediaStream* toMediaStream(MediaStreamDescriptor*); 120 MediaStream* toMediaStream(MediaStreamDescriptor*);
122 121
123 } // namespace blink 122 } // namespace blink
124 123
125 #endif // MediaStream_h 124 #endif // MediaStream_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/UseCounter.h ('k') | third_party/WebKit/Source/modules/mediastream/MediaStream.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698