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

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

Issue 2481263004: Revert of 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"
33 #include "platform/mediastream/MediaStreamDescriptor.h" 34 #include "platform/mediastream/MediaStreamDescriptor.h"
34 #include "platform/mediastream/MediaStreamSource.h" 35 #include "platform/mediastream/MediaStreamSource.h"
35 #include "public/platform/WebMediaConstraints.h" 36 #include "public/platform/WebMediaConstraints.h"
36 #include "wtf/Forward.h" 37 #include "wtf/Forward.h"
37 #include <memory> 38 #include <memory>
38 39
39 namespace blink { 40 namespace blink {
40 41
41 class AudioSourceProvider; 42 class AudioSourceProvider;
42 class ExceptionState; 43 class ExceptionState;
(...skipping 17 matching lines...) Expand all
60 String label() const; 61 String label() const;
61 bool remote() const; 62 bool remote() const;
62 63
63 bool enabled() const; 64 bool enabled() const;
64 void setEnabled(bool); 65 void setEnabled(bool);
65 66
66 bool muted() const; 67 bool muted() const;
67 68
68 String readyState() const; 69 String readyState() const;
69 70
71 static void getSources(ExecutionContext*,
72 MediaStreamTrackSourcesCallback*,
73 ExceptionState&);
70 void stopTrack(ExceptionState&); 74 void stopTrack(ExceptionState&);
71 virtual MediaStreamTrack* clone(ExecutionContext*); 75 virtual MediaStreamTrack* clone(ExecutionContext*);
72 76
73 void getConstraints(MediaTrackConstraints&); 77 void getConstraints(MediaTrackConstraints&);
74 78
75 // This function is called when constrains have been successfully applied. 79 // This function is called when constrains have been successfully applied.
76 // Called from UserMediaRequest when it succeeds. It is not IDL-exposed. 80 // Called from UserMediaRequest when it succeeds. It is not IDL-exposed.
77 void setConstraints(const WebMediaConstraints&); 81 void setConstraints(const WebMediaConstraints&);
78 82
79 void getSettings(MediaTrackSettings&); 83 void getSettings(MediaTrackSettings&);
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 bool m_stopped; 122 bool m_stopped;
119 Member<MediaStreamComponent> m_component; 123 Member<MediaStreamComponent> m_component;
120 WebMediaConstraints m_constraints; 124 WebMediaConstraints m_constraints;
121 }; 125 };
122 126
123 typedef HeapVector<Member<MediaStreamTrack>> MediaStreamTrackVector; 127 typedef HeapVector<Member<MediaStreamTrack>> MediaStreamTrackVector;
124 128
125 } // namespace blink 129 } // namespace blink
126 130
127 #endif // MediaStreamTrack_h 131 #endif // MediaStreamTrack_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698