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

Side by Side Diff: public/platform/WebMediaStreamTrack.h

Issue 569613002: Add the possibility to specify MediaStreamTrack::remote when creating a track. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 3 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) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 ~WebMediaStreamTrack() { reset(); } 59 ~WebMediaStreamTrack() { reset(); }
60 60
61 WebMediaStreamTrack& operator=(const WebMediaStreamTrack& other) 61 WebMediaStreamTrack& operator=(const WebMediaStreamTrack& other)
62 { 62 {
63 assign(other); 63 assign(other);
64 return *this; 64 return *this;
65 } 65 }
66 BLINK_PLATFORM_EXPORT void assign(const WebMediaStreamTrack&); 66 BLINK_PLATFORM_EXPORT void assign(const WebMediaStreamTrack&);
67 67
68 BLINK_PLATFORM_EXPORT void initialize(const WebMediaStreamSource&); 68 BLINK_PLATFORM_EXPORT void initialize(const WebMediaStreamSource&);
69 BLINK_PLATFORM_EXPORT void initialize(const WebString& id, const WebMediaStr eamSource&); 69 BLINK_PLATFORM_EXPORT void initialize(const WebString& id, const WebMediaStr eamSource&); // DEPRECATED
70 BLINK_PLATFORM_EXPORT void initialize(const WebString& id, const WebMediaStr eamSource&, bool remote);
70 71
71 BLINK_PLATFORM_EXPORT void reset(); 72 BLINK_PLATFORM_EXPORT void reset();
72 bool isNull() const { return m_private.isNull(); } 73 bool isNull() const { return m_private.isNull(); }
73 74
74 BLINK_PLATFORM_EXPORT WebString id() const; 75 BLINK_PLATFORM_EXPORT WebString id() const;
75 76
76 BLINK_PLATFORM_EXPORT WebMediaStreamSource source() const; 77 BLINK_PLATFORM_EXPORT WebMediaStreamSource source() const;
77 BLINK_PLATFORM_EXPORT bool isEnabled() const; 78 BLINK_PLATFORM_EXPORT bool isEnabled() const;
78 79
79 // Extra data associated with this WebMediaStream. 80 // Extra data associated with this WebMediaStream.
(...skipping 16 matching lines...) Expand all
96 BLINK_PLATFORM_EXPORT operator MediaStreamComponent*() const; 97 BLINK_PLATFORM_EXPORT operator MediaStreamComponent*() const;
97 #endif 98 #endif
98 99
99 private: 100 private:
100 WebPrivatePtr<MediaStreamComponent> m_private; 101 WebPrivatePtr<MediaStreamComponent> m_private;
101 }; 102 };
102 103
103 } // namespace blink 104 } // namespace blink
104 105
105 #endif // WebMediaStreamTrack_h 106 #endif // WebMediaStreamTrack_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698