webkit/glue/webmediaplayer_impl.cc - Issue 387020: Upstreaming WebKit.gyp

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: webkit/glue/webmediaplayer_impl.cc

Issue 387020: Upstreaming WebKit.gyp (Closed)

Patch Set: Created 11 years, 1 month 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

OLD	NEW
1 // Copyright (c) 2008-2009 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2008-2009 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 #include "webkit/glue/webmediaplayer_impl.h"	5 #include "webkit/glue/webmediaplayer_impl.h"

6	6

7 #include "media/base/media_format.h"	7 #include "media/base/media_format.h"

8 #include "media/filters/ffmpeg_audio_decoder.h"	8 #include "media/filters/ffmpeg_audio_decoder.h"

9 #include "media/filters/ffmpeg_demuxer.h"	9 #include "media/filters/ffmpeg_demuxer.h"

10 #include "media/filters/ffmpeg_video_decoder.h"	10 #include "media/filters/ffmpeg_video_decoder.h"

11 #include "media/filters/null_audio_renderer.h"	11 #include "media/filters/null_audio_renderer.h"

12 #include "skia/ext/platform_canvas.h"	12 #include "skia/ext/platform_canvas.h"

13 #include "webkit/api/public/WebRect.h"	13 #include "third_party/WebKit/WebKit/chromium/public/WebRect.h"

14 #include "webkit/api/public/WebSize.h"	14 #include "third_party/WebKit/WebKit/chromium/public/WebSize.h"

15 #include "webkit/api/public/WebURL.h"	15 #include "third_party/WebKit/WebKit/chromium/public/WebURL.h"

16 #include "webkit/glue/media/video_renderer_impl.h"	16 #include "webkit/glue/media/video_renderer_impl.h"

17	17

18 using WebKit::WebCanvas;	18 using WebKit::WebCanvas;

19 using WebKit::WebRect;	19 using WebKit::WebRect;

20 using WebKit::WebSize;	20 using WebKit::WebSize;

21	21

22 namespace {	22 namespace {

23	23

24 // Limits the maximum outstanding repaints posted on render thread.	24 // Limits the maximum outstanding repaints posted on render thread.

25 // This number of 50 is a guess, it does not take too much memory on the task	25 // This number of 50 is a guess, it does not take too much memory on the task

(...skipping 635 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
661 }	661 }

662 }	662 }

663	663

664 WebKit::WebMediaPlayerClient* WebMediaPlayerImpl::GetClient() {	664 WebKit::WebMediaPlayerClient* WebMediaPlayerImpl::GetClient() {

665 DCHECK(MessageLoop::current() == main_loop_);	665 DCHECK(MessageLoop::current() == main_loop_);

666 DCHECK(client_);	666 DCHECK(client_);

667 return client_;	667 return client_;

668 }	668 }

669	669

670 } // namespace webkit_glue	670 } // namespace webkit_glue

OLD	NEW

« no previous file with comments | « webkit/glue/webmediaplayer_impl.h ('k') | webkit/glue/webmenuitem.h » ('j') | no next file with comments »