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

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

Issue 457353002: Cleanup namespace usage in public/platform/Web[A-M]*.h. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « public/platform/WebLayerTreeView.h ('k') | public/platform/WebMediaStreamCenter.h » ('j') | 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) 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 13 matching lines...) Expand all
24 24
25 #ifndef WebMediaStream_h 25 #ifndef WebMediaStream_h
26 #define WebMediaStream_h 26 #define WebMediaStream_h
27 27
28 #include "WebCommon.h" 28 #include "WebCommon.h"
29 #include "WebNonCopyable.h" 29 #include "WebNonCopyable.h"
30 #include "WebPrivatePtr.h" 30 #include "WebPrivatePtr.h"
31 #include "WebVector.h" 31 #include "WebVector.h"
32 32
33 namespace blink { 33 namespace blink {
34
34 class MediaStreamDescriptor; 35 class MediaStreamDescriptor;
35 }
36
37 namespace blink {
38
39 class WebMediaStreamSource; 36 class WebMediaStreamSource;
40 class WebMediaStreamTrack; 37 class WebMediaStreamTrack;
41 class WebString; 38 class WebString;
42 39
43 class WebMediaStream { 40 class WebMediaStream {
44 public: 41 public:
45 class ExtraData { 42 class ExtraData {
46 public: 43 public:
47 virtual ~ExtraData() { } 44 virtual ~ExtraData() { }
48 }; 45 };
(...skipping 25 matching lines...) Expand all
74 BLINK_PLATFORM_EXPORT void removeTrack(const WebMediaStreamTrack&); 71 BLINK_PLATFORM_EXPORT void removeTrack(const WebMediaStreamTrack&);
75 72
76 // Extra data associated with this WebMediaStream. 73 // Extra data associated with this WebMediaStream.
77 // If non-null, the extra data pointer will be deleted when the object is de stroyed. 74 // If non-null, the extra data pointer will be deleted when the object is de stroyed.
78 // Setting the extra data pointer will cause any existing non-null 75 // Setting the extra data pointer will cause any existing non-null
79 // extra data pointer to be deleted. 76 // extra data pointer to be deleted.
80 BLINK_PLATFORM_EXPORT ExtraData* extraData() const; 77 BLINK_PLATFORM_EXPORT ExtraData* extraData() const;
81 BLINK_PLATFORM_EXPORT void setExtraData(ExtraData*); 78 BLINK_PLATFORM_EXPORT void setExtraData(ExtraData*);
82 79
83 #if INSIDE_BLINK 80 #if INSIDE_BLINK
84 BLINK_PLATFORM_EXPORT WebMediaStream(blink::MediaStreamDescriptor*); 81 BLINK_PLATFORM_EXPORT WebMediaStream(MediaStreamDescriptor*);
85 BLINK_PLATFORM_EXPORT WebMediaStream(const WTF::PassRefPtr<blink::MediaStrea mDescriptor>&); 82 BLINK_PLATFORM_EXPORT WebMediaStream(const WTF::PassRefPtr<MediaStreamDescri ptor>&);
86 BLINK_PLATFORM_EXPORT operator WTF::PassRefPtr<blink::MediaStreamDescriptor> () const; 83 BLINK_PLATFORM_EXPORT operator WTF::PassRefPtr<MediaStreamDescriptor>() cons t;
87 BLINK_PLATFORM_EXPORT operator blink::MediaStreamDescriptor*() const; 84 BLINK_PLATFORM_EXPORT operator MediaStreamDescriptor*() const;
88 BLINK_PLATFORM_EXPORT WebMediaStream& operator=(const WTF::PassRefPtr<blink: :MediaStreamDescriptor>&); 85 BLINK_PLATFORM_EXPORT WebMediaStream& operator=(const WTF::PassRefPtr<MediaS treamDescriptor>&);
89 #endif 86 #endif
90 87
91 private: 88 private:
92 WebPrivatePtr<blink::MediaStreamDescriptor> m_private; 89 WebPrivatePtr<MediaStreamDescriptor> m_private;
93 }; 90 };
94 91
95 } // namespace blink 92 } // namespace blink
96 93
97 #endif // WebMediaStream_h 94 #endif // WebMediaStream_h
OLDNEW
« no previous file with comments | « public/platform/WebLayerTreeView.h ('k') | public/platform/WebMediaStreamCenter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698