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

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

Issue 2493823002: Revert of Revert "Remove MediaStreamTrack.getSources()." (Closed)
Patch Set: Created 4 years, 1 month 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 12 matching lines...) Expand all
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #ifndef MediaStreamTrack_h 26 #ifndef MediaStreamTrack_h
27 #define MediaStreamTrack_h 27 #define MediaStreamTrack_h
28 28
29 #include "bindings/core/v8/ActiveScriptWrappable.h" 29 #include "bindings/core/v8/ActiveScriptWrappable.h"
30 #include "core/dom/ActiveDOMObject.h" 30 #include "core/dom/ActiveDOMObject.h"
31 #include "modules/EventTargetModules.h" 31 #include "modules/EventTargetModules.h"
32 #include "modules/ModulesExport.h" 32 #include "modules/ModulesExport.h"
33 #include "modules/mediastream/SourceInfo.h"
34 #include "platform/mediastream/MediaStreamDescriptor.h" 33 #include "platform/mediastream/MediaStreamDescriptor.h"
35 #include "platform/mediastream/MediaStreamSource.h" 34 #include "platform/mediastream/MediaStreamSource.h"
36 #include "public/platform/WebMediaConstraints.h" 35 #include "public/platform/WebMediaConstraints.h"
37 #include "wtf/Forward.h" 36 #include "wtf/Forward.h"
38 #include <memory> 37 #include <memory>
39 38
40 namespace blink { 39 namespace blink {
41 40
42 class AudioSourceProvider; 41 class AudioSourceProvider;
43 class ExceptionState; 42 class ExceptionState;
(...skipping 18 matching lines...) Expand all
62 String label() const; 61 String label() const;
63 bool remote() const; 62 bool remote() const;
64 63
65 bool enabled() const; 64 bool enabled() const;
66 void setEnabled(bool); 65 void setEnabled(bool);
67 66
68 bool muted() const; 67 bool muted() const;
69 68
70 String readyState() const; 69 String readyState() const;
71 70
72 static void getSources(ExecutionContext*,
73 MediaStreamTrackSourcesCallback*,
74 ExceptionState&);
75 void stopTrack(ExceptionState&); 71 void stopTrack(ExceptionState&);
76 virtual MediaStreamTrack* clone(ExecutionContext*); 72 virtual MediaStreamTrack* clone(ExecutionContext*);
77 73
78 void getConstraints(MediaTrackConstraints&); 74 void getConstraints(MediaTrackConstraints&);
79 75
80 // This function is called when constrains have been successfully applied. 76 // This function is called when constrains have been successfully applied.
81 // Called from UserMediaRequest when it succeeds. It is not IDL-exposed. 77 // Called from UserMediaRequest when it succeeds. It is not IDL-exposed.
82 void setConstraints(const WebMediaConstraints&); 78 void setConstraints(const WebMediaConstraints&);
83 79
84 void getSettings(MediaTrackSettings&); 80 void getSettings(MediaTrackSettings&);
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 bool m_stopped; 119 bool m_stopped;
124 Member<MediaStreamComponent> m_component; 120 Member<MediaStreamComponent> m_component;
125 WebMediaConstraints m_constraints; 121 WebMediaConstraints m_constraints;
126 }; 122 };
127 123
128 typedef HeapVector<Member<MediaStreamTrack>> MediaStreamTrackVector; 124 typedef HeapVector<Member<MediaStreamTrack>> MediaStreamTrackVector;
129 125
130 } // namespace blink 126 } // namespace blink
131 127
132 #endif // MediaStreamTrack_h 128 #endif // MediaStreamTrack_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698