content/renderer/media/webmediaplayer_ms.h - Issue 19882002: Revert 211956 "base: Change WeakPtr to use SequenceChecker inste..."

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: content/renderer/media/webmediaplayer_ms.h

Issue 19882002: Revert 211956 "base: Change WeakPtr to use SequenceChecker inste..." (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Fix patch and rebase Created 7 years, 5 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 | « chrome/browser/storage_monitor/storage_monitor.h ('k') | remoting/host/audio_capturer_win.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #ifndef CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_	5 #ifndef CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_

6 #define CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_	6 #define CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_

7	7

8 #include "base/memory/ref_counted.h"	8 #include "base/memory/ref_counted.h"

9 #include "base/memory/scoped_ptr.h"	9 #include "base/memory/scoped_ptr.h"

10 #include "base/memory/weak_ptr.h"	10 #include "base/memory/weak_ptr.h"

11 #include "base/synchronization/lock.h"	11 #include "base/synchronization/lock.h"

12 #include "base/threading/thread_checker.h"

13 #include "cc/layers/video_frame_provider.h"	12 #include "cc/layers/video_frame_provider.h"

14 #include "media/filters/skcanvas_video_renderer.h"	13 #include "media/filters/skcanvas_video_renderer.h"

15 #include "skia/ext/platform_canvas.h"	14 #include "skia/ext/platform_canvas.h"

16 #include "third_party/WebKit/public/web/WebMediaPlayer.h"	15 #include "third_party/WebKit/public/web/WebMediaPlayer.h"

17 #include "url/gurl.h"	16 #include "url/gurl.h"

18	17

19 namespace WebKit {	18 namespace WebKit {

20 class WebFrame;	19 class WebFrame;

21 class WebMediaPlayerClient;	20 class WebMediaPlayerClient;

22 }	21 }

(...skipping 162 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
185 scoped_refptr<MediaStreamAudioRenderer> audio_renderer_;	184 scoped_refptr<MediaStreamAudioRenderer> audio_renderer_;

186	185

187 scoped_refptr<media::MediaLog> media_log_;	186 scoped_refptr<media::MediaLog> media_log_;

188	187

189 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerMS);	188 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerMS);

190 };	189 };

191	190

192 } // namespace content	191 } // namespace content

193	192

194 #endif // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_	193 #endif // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_

OLD	NEW