Source/platform/mediastream/MediaStreamDescriptor.h - Issue 858663002: Fix template angle bracket syntax in platform

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: Source/platform/mediastream/MediaStreamDescriptor.h

Issue 858663002: Fix template angle bracket syntax in platform (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Rebase Created 5 years, 11 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 | « Source/platform/mediastream/MediaStreamComponent.h ('k') | Source/platform/mediastream/MediaStreamSource.h » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2011 Ericsson AB. All rights reserved.	2 * Copyright (C) 2011 Ericsson AB. All rights reserved.

3 * Copyright (C) 2012 Google Inc. All rights reserved.	3 * Copyright (C) 2012 Google Inc. All rights reserved.

4 *	4 *

5 * Redistribution and use in source and binary forms, with or without	5 * Redistribution and use in source and binary forms, with or without

6 * modification, are permitted provided that the following conditions	6 * modification, are permitted provided that the following conditions

7 * are met:	7 * are met:

8 *	8 *

9 * 1. Redistributions of source code must retain the above copyright	9 * 1. Redistributions of source code must retain the above copyright

10 * notice, this list of conditions and the following disclaimer.	10 * notice, this list of conditions and the following disclaimer.

(...skipping 74 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
85	85

86 ExtraData* extraData() const { return m_extraData.get(); }	86 ExtraData* extraData() const { return m_extraData.get(); }

87 void setExtraData(PassOwnPtr<ExtraData> extraData) { m_extraData = extraData ; }	87 void setExtraData(PassOwnPtr<ExtraData> extraData) { m_extraData = extraData ; }

88	88

89 private:	89 private:

90 MediaStreamDescriptor(const String& id, const MediaStreamSourceVector& audio Sources, const MediaStreamSourceVector& videoSources);	90 MediaStreamDescriptor(const String& id, const MediaStreamSourceVector& audio Sources, const MediaStreamSourceVector& videoSources);

91 MediaStreamDescriptor(const String& id, const MediaStreamComponentVector& au dioComponents, const MediaStreamComponentVector& videoComponents);	91 MediaStreamDescriptor(const String& id, const MediaStreamComponentVector& au dioComponents, const MediaStreamComponentVector& videoComponents);

92	92

93 MediaStreamDescriptorClient* m_client;	93 MediaStreamDescriptorClient* m_client;

94 String m_id;	94 String m_id;

95 Vector<RefPtr<MediaStreamComponent> > m_audioComponents;	95 Vector<RefPtr<MediaStreamComponent>> m_audioComponents;

96 Vector<RefPtr<MediaStreamComponent> > m_videoComponents;	96 Vector<RefPtr<MediaStreamComponent>> m_videoComponents;

97 bool m_ended;	97 bool m_ended;

98	98

99 OwnPtr<ExtraData> m_extraData;	99 OwnPtr<ExtraData> m_extraData;

100 };	100 };

101	101

102 typedef Vector<RefPtr<MediaStreamDescriptor> > MediaStreamDescriptorVector;	102 typedef Vector<RefPtr<MediaStreamDescriptor>> MediaStreamDescriptorVector;

103	103

104 } // namespace blink	104 } // namespace blink

105	105

106 #endif // MediaStreamDescriptor_h	106 #endif // MediaStreamDescriptor_h

OLD	NEW