Chromium Code Reviews

Side by Side Diff: third_party/WebKit/public/platform/WebMediaStream.h

Issue 1774943003: blink: Rename platform/ methods to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clash-platform: rebase-yayyyyyyyy Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff |
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 55 matching lines...)
66 BLINK_PLATFORM_EXPORT void audioTracks(WebVector<WebMediaStreamTrack>&) cons t; 66 BLINK_PLATFORM_EXPORT void audioTracks(WebVector<WebMediaStreamTrack>&) cons t;
67 BLINK_PLATFORM_EXPORT void videoTracks(WebVector<WebMediaStreamTrack>&) cons t; 67 BLINK_PLATFORM_EXPORT void videoTracks(WebVector<WebMediaStreamTrack>&) cons t;
68 68
69 BLINK_PLATFORM_EXPORT void addTrack(const WebMediaStreamTrack&); 69 BLINK_PLATFORM_EXPORT void addTrack(const WebMediaStreamTrack&);
70 BLINK_PLATFORM_EXPORT void removeTrack(const WebMediaStreamTrack&); 70 BLINK_PLATFORM_EXPORT void removeTrack(const WebMediaStreamTrack&);
71 71
72 // Extra data associated with this WebMediaStream. 72 // Extra data associated with this WebMediaStream.
73 // If non-null, the extra data pointer will be deleted when the object is de stroyed. 73 // If non-null, the extra data pointer will be deleted when the object is de stroyed.
74 // Setting the extra data pointer will cause any existing non-null 74 // Setting the extra data pointer will cause any existing non-null
75 // extra data pointer to be deleted. 75 // extra data pointer to be deleted.
76 BLINK_PLATFORM_EXPORT ExtraData* extraData() const; 76 BLINK_PLATFORM_EXPORT ExtraData* getExtraData() const;
77 BLINK_PLATFORM_EXPORT void setExtraData(ExtraData*); 77 BLINK_PLATFORM_EXPORT void setExtraData(ExtraData*);
78 78
79 #if INSIDE_BLINK 79 #if INSIDE_BLINK
80 BLINK_PLATFORM_EXPORT WebMediaStream(MediaStreamDescriptor*); 80 BLINK_PLATFORM_EXPORT WebMediaStream(MediaStreamDescriptor*);
81 BLINK_PLATFORM_EXPORT operator MediaStreamDescriptor*() const; 81 BLINK_PLATFORM_EXPORT operator MediaStreamDescriptor*() const;
82 BLINK_PLATFORM_EXPORT WebMediaStream& operator=(MediaStreamDescriptor*); 82 BLINK_PLATFORM_EXPORT WebMediaStream& operator=(MediaStreamDescriptor*);
83 #endif 83 #endif
84 84
85 private: 85 private:
86 WebPrivatePtr<MediaStreamDescriptor> m_private; 86 WebPrivatePtr<MediaStreamDescriptor> m_private;
87 }; 87 };
88 88
89 } // namespace blink 89 } // namespace blink
90 90
91 #endif // WebMediaStream_h 91 #endif // WebMediaStream_h
OLDNEW
« no previous file with comments | « third_party/WebKit/public/platform/WebFont.h ('k') | third_party/WebKit/public/platform/WebMediaStreamTrack.h » ('j') | no next file with comments »

Powered by Google App Engine