third_party/WebKit/Source/modules/mediastream/MediaStreamTrack.h - Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide.

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: third_party/WebKit/Source/modules/mediastream/MediaStreamTrack.h

Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: clash-modules: rebase-fixes Created 4 years, 9 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 | « third_party/WebKit/Source/modules/mediastream/MediaStream.cpp ('k') | third_party/WebKit/Source/modules/mediastream/MediaStreamTrack.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2011 Google Inc. All rights reserved.	2 * Copyright (C) 2011 Google Inc. All rights reserved.

3 * Copyright (C) 2011 Ericsson AB. All rights reserved.	3 * Copyright (C) 2011 Ericsson AB. 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 * 1. Redistributions of source code must retain the above copyright	8 * 1. Redistributions of source code must retain the above copyright

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

10 * 2. Redistributions in binary form must reproduce the above copyright	10 * 2. Redistributions in binary form must reproduce the above copyright

(...skipping 63 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
74 DEFINE_ATTRIBUTE_EVENT_LISTENER(ended);	74 DEFINE_ATTRIBUTE_EVENT_LISTENER(ended);

75	75

76 MediaStreamComponent* component() { return m_component; }	76 MediaStreamComponent* component() { return m_component; }

77 bool ended() const;	77 bool ended() const;

78	78

79 void registerMediaStream(MediaStream*);	79 void registerMediaStream(MediaStream*);

80 void unregisterMediaStream(MediaStream*);	80 void unregisterMediaStream(MediaStream*);

81	81

82 // EventTarget	82 // EventTarget

83 const AtomicString& interfaceName() const override;	83 const AtomicString& interfaceName() const override;

84 ExecutionContext* executionContext() const override;	84 ExecutionContext* getExecutionContext() const override;

85	85

86 // ActiveDOMObject	86 // ActiveDOMObject

87 bool hasPendingActivity() const override;	87 bool hasPendingActivity() const override;

88 void stop() override;	88 void stop() override;

89	89

90 PassOwnPtr<AudioSourceProvider> createWebAudioSource();	90 PassOwnPtr<AudioSourceProvider> createWebAudioSource();

91	91

92 DECLARE_VIRTUAL_TRACE();	92 DECLARE_VIRTUAL_TRACE();

93	93

94 private:	94 private:

(...skipping 11 matching lines...) Expand all Loading...
106 bool m_isIteratingRegisteredMediaStreams;	106 bool m_isIteratingRegisteredMediaStreams;

107 bool m_stopped;	107 bool m_stopped;

108 Member<MediaStreamComponent> m_component;	108 Member<MediaStreamComponent> m_component;

109 };	109 };

110	110

111 typedef HeapVector<Member<MediaStreamTrack>> MediaStreamTrackVector;	111 typedef HeapVector<Member<MediaStreamTrack>> MediaStreamTrackVector;

112	112

113 } // namespace blink	113 } // namespace blink

114	114

115 #endif // MediaStreamTrack_h	115 #endif // MediaStreamTrack_h

OLD	NEW