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

Side by Side Diff: third_party/WebKit/public/platform/WebMediaStreamSource.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
« no previous file with comments | « third_party/WebKit/Source/platform/mediastream/MediaStreamSource.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * 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 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 81
82 WebMediaStreamSource& operator=(const WebMediaStreamSource& other) { 82 WebMediaStreamSource& operator=(const WebMediaStreamSource& other) {
83 assign(other); 83 assign(other);
84 return *this; 84 return *this;
85 } 85 }
86 86
87 BLINK_PLATFORM_EXPORT void assign(const WebMediaStreamSource&); 87 BLINK_PLATFORM_EXPORT void assign(const WebMediaStreamSource&);
88 88
89 BLINK_PLATFORM_EXPORT void initialize(const WebString& id, 89 BLINK_PLATFORM_EXPORT void initialize(const WebString& id,
90 Type, 90 Type,
91 const WebString& name); 91 const WebString& name); // DEPRECATED
92 BLINK_PLATFORM_EXPORT void initialize(const WebString& id,
93 Type,
94 const WebString& name,
95 bool remote);
92 BLINK_PLATFORM_EXPORT void reset(); 96 BLINK_PLATFORM_EXPORT void reset();
93 bool isNull() const { return m_private.isNull(); } 97 bool isNull() const { return m_private.isNull(); }
94 98
95 BLINK_PLATFORM_EXPORT WebString id() const; 99 BLINK_PLATFORM_EXPORT WebString id() const;
96 BLINK_PLATFORM_EXPORT Type getType() const; 100 BLINK_PLATFORM_EXPORT Type getType() const;
97 BLINK_PLATFORM_EXPORT WebString name() const; 101 BLINK_PLATFORM_EXPORT WebString name() const;
102 BLINK_PLATFORM_EXPORT bool remote() const;
98 103
99 BLINK_PLATFORM_EXPORT void setReadyState(ReadyState); 104 BLINK_PLATFORM_EXPORT void setReadyState(ReadyState);
100 BLINK_PLATFORM_EXPORT ReadyState getReadyState() const; 105 BLINK_PLATFORM_EXPORT ReadyState getReadyState() const;
101 106
102 // Extra data associated with this object. 107 // Extra data associated with this object.
103 // If non-null, the extra data pointer will be deleted when the object is 108 // If non-null, the extra data pointer will be deleted when the object is
104 // destroyed. Setting the extra data pointer will cause any existing non-null 109 // destroyed. Setting the extra data pointer will cause any existing non-null
105 // extra data pointer to be deleted. 110 // extra data pointer to be deleted.
106 BLINK_PLATFORM_EXPORT ExtraData* getExtraData() const; 111 BLINK_PLATFORM_EXPORT ExtraData* getExtraData() const;
107 BLINK_PLATFORM_EXPORT void setExtraData(ExtraData*); 112 BLINK_PLATFORM_EXPORT void setExtraData(ExtraData*);
(...skipping 14 matching lines...) Expand all
122 BLINK_PLATFORM_EXPORT operator MediaStreamSource*() const; 127 BLINK_PLATFORM_EXPORT operator MediaStreamSource*() const;
123 #endif 128 #endif
124 129
125 private: 130 private:
126 WebPrivatePtr<MediaStreamSource> m_private; 131 WebPrivatePtr<MediaStreamSource> m_private;
127 }; 132 };
128 133
129 } // namespace blink 134 } // namespace blink
130 135
131 #endif // WebMediaStreamSource_h 136 #endif // WebMediaStreamSource_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/platform/mediastream/MediaStreamSource.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698