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

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

Issue 2767963002: Revert of Remove |remote| and |readonly| members of MediaStreamTrack. (Closed)
Patch Set: rebase 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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 USING_GARBAGE_COLLECTED_MIXIN(MediaStreamTrack); 56 USING_GARBAGE_COLLECTED_MIXIN(MediaStreamTrack);
57 DEFINE_WRAPPERTYPEINFO(); 57 DEFINE_WRAPPERTYPEINFO();
58 58
59 public: 59 public:
60 static MediaStreamTrack* create(ExecutionContext*, MediaStreamComponent*); 60 static MediaStreamTrack* create(ExecutionContext*, MediaStreamComponent*);
61 ~MediaStreamTrack() override; 61 ~MediaStreamTrack() override;
62 62
63 String kind() const; 63 String kind() const;
64 String id() const; 64 String id() const;
65 String label() const; 65 String label() const;
66 bool remote() const;
66 67
67 bool enabled() const; 68 bool enabled() const;
68 void setEnabled(bool); 69 void setEnabled(bool);
69 70
70 bool muted() const; 71 bool muted() const;
71 72
72 String contentHint() const; 73 String contentHint() const;
73 void setContentHint(const String&); 74 void setContentHint(const String&);
74 75
75 String readyState() const; 76 String readyState() const;
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 Member<MediaStreamComponent> m_component; 128 Member<MediaStreamComponent> m_component;
128 WebMediaConstraints m_constraints; 129 WebMediaConstraints m_constraints;
129 Member<ImageCapture> m_imageCapture; 130 Member<ImageCapture> m_imageCapture;
130 }; 131 };
131 132
132 typedef HeapVector<Member<MediaStreamTrack>> MediaStreamTrackVector; 133 typedef HeapVector<Member<MediaStreamTrack>> MediaStreamTrackVector;
133 134
134 } // namespace blink 135 } // namespace blink
135 136
136 #endif // MediaStreamTrack_h 137 #endif // MediaStreamTrack_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698