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

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

Issue 2710213005: Revert of Remove |remote| and |readonly| members of MediaStreamTrack (Closed)
Patch Set: Created 3 years, 9 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 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 USING_GARBAGE_COLLECTED_MIXIN(MediaStreamTrack); 52 USING_GARBAGE_COLLECTED_MIXIN(MediaStreamTrack);
53 DEFINE_WRAPPERTYPEINFO(); 53 DEFINE_WRAPPERTYPEINFO();
54 54
55 public: 55 public:
56 static MediaStreamTrack* create(ExecutionContext*, MediaStreamComponent*); 56 static MediaStreamTrack* create(ExecutionContext*, MediaStreamComponent*);
57 ~MediaStreamTrack() override; 57 ~MediaStreamTrack() override;
58 58
59 String kind() const; 59 String kind() const;
60 String id() const; 60 String id() const;
61 String label() const; 61 String label() 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 contentHint() const; 69 String contentHint() const;
69 void setContentHint(const String&); 70 void setContentHint(const String&);
70 71
71 String readyState() const; 72 String readyState() const;
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 bool m_stopped; 122 bool m_stopped;
122 Member<MediaStreamComponent> m_component; 123 Member<MediaStreamComponent> m_component;
123 WebMediaConstraints m_constraints; 124 WebMediaConstraints m_constraints;
124 }; 125 };
125 126
126 typedef HeapVector<Member<MediaStreamTrack>> MediaStreamTrackVector; 127 typedef HeapVector<Member<MediaStreamTrack>> MediaStreamTrackVector;
127 128
128 } // namespace blink 129 } // namespace blink
129 130
130 #endif // MediaStreamTrack_h 131 #endif // MediaStreamTrack_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698