public/platform/WebMediaStream.h - Issue 534473002: Revert of Oilpan: Move MediaStreamSource, MediaStreamComponent and MediaStreamDescriptor

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 534473002: Revert of Oilpan: Move MediaStreamSource, MediaStreamComponent and MediaStreamDescriptor (Closed) Base URL: svn://svn.chromium.org/blink/trunk

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 | Annotate | Revision Log

OLD	NEW
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 61 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
72	72

73 // Extra data associated with this WebMediaStream.	73 // Extra data associated with this WebMediaStream.

74 // 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.

75 // Setting the extra data pointer will cause any existing non-null	75 // Setting the extra data pointer will cause any existing non-null

76 // extra data pointer to be deleted.	76 // extra data pointer to be deleted.

77 BLINK_PLATFORM_EXPORT ExtraData* extraData() const;	77 BLINK_PLATFORM_EXPORT ExtraData* extraData() const;

78 BLINK_PLATFORM_EXPORT void setExtraData(ExtraData*);	78 BLINK_PLATFORM_EXPORT void setExtraData(ExtraData*);

79	79

80 #if INSIDE_BLINK	80 #if INSIDE_BLINK

81 BLINK_PLATFORM_EXPORT WebMediaStream(MediaStreamDescriptor*);	81 BLINK_PLATFORM_EXPORT WebMediaStream(MediaStreamDescriptor*);

	82 BLINK_PLATFORM_EXPORT WebMediaStream(const WTF::PassRefPtr<MediaStreamDescri ptor>&);

	83 BLINK_PLATFORM_EXPORT operator WTF::PassRefPtr<MediaStreamDescriptor>() cons t;

82 BLINK_PLATFORM_EXPORT operator MediaStreamDescriptor*() const;	84 BLINK_PLATFORM_EXPORT operator MediaStreamDescriptor*() const;

83 BLINK_PLATFORM_EXPORT WebMediaStream& operator=(MediaStreamDescriptor*);	85 BLINK_PLATFORM_EXPORT WebMediaStream& operator=(const WTF::PassRefPtr<MediaS treamDescriptor>&);

84 #endif	86 #endif

85	87

86 private:	88 private:

87 WebPrivatePtr<MediaStreamDescriptor> m_private;	89 WebPrivatePtr<MediaStreamDescriptor> m_private;

88 };	90 };

89	91

90 } // namespace blink	92 } // namespace blink

91	93

92 #endif // WebMediaStream_h	94 #endif // WebMediaStream_h

OLD	NEW

« no previous file with comments | « Source/platform/mediastream/MediaStreamSource.cpp ('k') | public/platform/WebMediaStreamSource.h » ('j') | no next file with comments »