content/renderer/media/media_stream_track.h - Issue 976233002: MediaStreamVideo*/VideoTrackAdapter and RTCVideoRenderer (small) cleanup

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

Unified Diff: content/renderer/media/media_stream_track.h

Issue 976233002: MediaStreamVideo*/VideoTrackAdapter and RTCVideoRenderer (small) cleanup (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: tommi@ comments Created 5 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/public/renderer/media_stream_video_sink.h ('k') | content/renderer/media/media_stream_video_capture_source_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/media_stream_track.h

diff --git a/content/renderer/media/media_stream_track.h b/content/renderer/media/media_stream_track.h

index 14b991aeb8845c51a49750d6e43f3e5ec61fecf4..951880a622394ff560149fe41de5b3b45fc3cb03 100644

--- a/content/renderer/media/media_stream_track.h

+++ b/content/renderer/media/media_stream_track.h

@@ -14,7 +14,6 @@

namespace webrtc {

class AudioTrackInterface;

-class MediaStreamTrackInterface;

} // namespace webrtc

namespace content {

@@ -28,8 +27,7 @@ class CONTENT_EXPORT MediaStreamTrack

explicit MediaStreamTrack(bool is_local_track);

virtual ~MediaStreamTrack();

- static MediaStreamTrack* GetTrack(

- const blink::WebMediaStreamTrack& track);

+ static MediaStreamTrack* GetTrack(const blink::WebMediaStreamTrack& track);

virtual void SetEnabled(bool enabled) = 0;

@@ -43,7 +41,8 @@ class CONTENT_EXPORT MediaStreamTrack

protected:

const bool is_local_track_;

- base::ThreadChecker thread_checker_;

+ // Used to DCHECK that we are called on Render main Thread.

+ base::ThreadChecker main_render_thread_checker_;

DISALLOW_COPY_AND_ASSIGN(MediaStreamTrack);

};