Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(143)

Side by Side Diff: webkit/glue/webmediaplayer_impl.cc

Issue 5756004: Separate BufferedDataSource and BufferedResourceLoader into two files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: inlining + removing Is...Protocol methods and getting rid of GetBufferedFirstBytePosition Created 10 years 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
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 <limits> 7 #include <limits>
8 8
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "media/base/filter_collection.h" 11 #include "media/base/filter_collection.h"
12 #include "media/base/limits.h" 12 #include "media/base/limits.h"
13 #include "media/base/media_format.h" 13 #include "media/base/media_format.h"
14 #include "media/base/media_switches.h" 14 #include "media/base/media_switches.h"
15 #include "media/base/pipeline_impl.h" 15 #include "media/base/pipeline_impl.h"
16 #include "media/base/video_frame.h" 16 #include "media/base/video_frame.h"
17 #include "media/filters/ffmpeg_audio_decoder.h" 17 #include "media/filters/ffmpeg_audio_decoder.h"
18 #include "media/filters/ffmpeg_demuxer.h" 18 #include "media/filters/ffmpeg_demuxer.h"
19 #include "media/filters/ffmpeg_video_decoder.h" 19 #include "media/filters/ffmpeg_video_decoder.h"
20 #include "media/filters/null_audio_renderer.h" 20 #include "media/filters/null_audio_renderer.h"
21 #include "skia/ext/platform_canvas.h" 21 #include "skia/ext/platform_canvas.h"
22 #include "third_party/WebKit/WebKit/chromium/public/WebRect.h" 22 #include "third_party/WebKit/WebKit/chromium/public/WebRect.h"
23 #include "third_party/WebKit/WebKit/chromium/public/WebSize.h" 23 #include "third_party/WebKit/WebKit/chromium/public/WebSize.h"
24 #include "third_party/WebKit/WebKit/chromium/public/WebURL.h" 24 #include "third_party/WebKit/WebKit/chromium/public/WebURL.h"
25 #include "third_party/WebKit/WebKit/chromium/public/WebVideoFrame.h" 25 #include "third_party/WebKit/WebKit/chromium/public/WebVideoFrame.h"
26 #include "webkit/glue/media/buffered_data_source.h" 26 #include "webkit/glue/media/buffered_data_source.h"
27 #include "webkit/glue/media/media_resource_loader_bridge_factory.h"
28 #include "webkit/glue/media/simple_data_source.h" 27 #include "webkit/glue/media/simple_data_source.h"
29 #include "webkit/glue/media/video_renderer_impl.h" 28 #include "webkit/glue/media/video_renderer_impl.h"
30 #include "webkit/glue/media/web_video_renderer.h" 29 #include "webkit/glue/media/web_video_renderer.h"
31 #include "webkit/glue/webvideoframe_impl.h" 30 #include "webkit/glue/webvideoframe_impl.h"
32 31
33 using WebKit::WebCanvas; 32 using WebKit::WebCanvas;
34 using WebKit::WebRect; 33 using WebKit::WebRect;
35 using WebKit::WebSize; 34 using WebKit::WebSize;
36 35
37 namespace { 36 namespace {
(...skipping 763 matching lines...) Expand 10 before | Expand all | Expand 10 after
801 pipeline_stopped_.Signal(); 800 pipeline_stopped_.Signal();
802 } 801 }
803 802
804 WebKit::WebMediaPlayerClient* WebMediaPlayerImpl::GetClient() { 803 WebKit::WebMediaPlayerClient* WebMediaPlayerImpl::GetClient() {
805 DCHECK(MessageLoop::current() == main_loop_); 804 DCHECK(MessageLoop::current() == main_loop_);
806 DCHECK(client_); 805 DCHECK(client_);
807 return client_; 806 return client_;
808 } 807 }
809 808
810 } // namespace webkit_glue 809 } // namespace webkit_glue
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698