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

Side by Side Diff: content/renderer/media/webmediaplayer_impl.cc

Issue 20165002: Move webkit/plugins/ppapi to content/renderer/pepper. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: more more clang fun Created 7 years, 4 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 | « content/renderer/media/video_destination_handler.cc ('k') | content/renderer/pepper/DEPS » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #include "content/renderer/media/webmediaplayer_impl.h" 5 #include "content/renderer/media/webmediaplayer_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 10 matching lines...) Expand all
21 #include "content/public/common/content_switches.h" 21 #include "content/public/common/content_switches.h"
22 #include "content/renderer/media/buffered_data_source.h" 22 #include "content/renderer/media/buffered_data_source.h"
23 #include "content/renderer/media/crypto/key_systems.h" 23 #include "content/renderer/media/crypto/key_systems.h"
24 #include "content/renderer/media/texttrack_impl.h" 24 #include "content/renderer/media/texttrack_impl.h"
25 #include "content/renderer/media/webaudiosourceprovider_impl.h" 25 #include "content/renderer/media/webaudiosourceprovider_impl.h"
26 #include "content/renderer/media/webinbandtexttrack_impl.h" 26 #include "content/renderer/media/webinbandtexttrack_impl.h"
27 #include "content/renderer/media/webmediaplayer_delegate.h" 27 #include "content/renderer/media/webmediaplayer_delegate.h"
28 #include "content/renderer/media/webmediaplayer_params.h" 28 #include "content/renderer/media/webmediaplayer_params.h"
29 #include "content/renderer/media/webmediaplayer_util.h" 29 #include "content/renderer/media/webmediaplayer_util.h"
30 #include "content/renderer/media/webmediasourceclient_impl.h" 30 #include "content/renderer/media/webmediasourceclient_impl.h"
31 #include "content/renderer/pepper/ppapi_webplugin_impl.h"
31 #include "gpu/GLES2/gl2extchromium.h" 32 #include "gpu/GLES2/gl2extchromium.h"
32 #include "media/audio/null_audio_sink.h" 33 #include "media/audio/null_audio_sink.h"
33 #include "media/base/bind_to_loop.h" 34 #include "media/base/bind_to_loop.h"
34 #include "media/base/filter_collection.h" 35 #include "media/base/filter_collection.h"
35 #include "media/base/limits.h" 36 #include "media/base/limits.h"
36 #include "media/base/media_log.h" 37 #include "media/base/media_log.h"
37 #include "media/base/media_switches.h" 38 #include "media/base/media_switches.h"
38 #include "media/base/pipeline.h" 39 #include "media/base/pipeline.h"
39 #include "media/base/video_frame.h" 40 #include "media/base/video_frame.h"
40 #include "media/filters/audio_renderer_impl.h" 41 #include "media/filters/audio_renderer_impl.h"
41 #include "media/filters/chunk_demuxer.h" 42 #include "media/filters/chunk_demuxer.h"
42 #include "media/filters/ffmpeg_audio_decoder.h" 43 #include "media/filters/ffmpeg_audio_decoder.h"
43 #include "media/filters/ffmpeg_demuxer.h" 44 #include "media/filters/ffmpeg_demuxer.h"
44 #include "media/filters/ffmpeg_video_decoder.h" 45 #include "media/filters/ffmpeg_video_decoder.h"
45 #include "media/filters/gpu_video_decoder.h" 46 #include "media/filters/gpu_video_decoder.h"
46 #include "media/filters/gpu_video_decoder_factories.h" 47 #include "media/filters/gpu_video_decoder_factories.h"
47 #include "media/filters/opus_audio_decoder.h" 48 #include "media/filters/opus_audio_decoder.h"
48 #include "media/filters/video_renderer_base.h" 49 #include "media/filters/video_renderer_base.h"
49 #include "media/filters/vpx_video_decoder.h" 50 #include "media/filters/vpx_video_decoder.h"
50 #include "third_party/WebKit/public/platform/WebRect.h" 51 #include "third_party/WebKit/public/platform/WebRect.h"
51 #include "third_party/WebKit/public/platform/WebSize.h" 52 #include "third_party/WebKit/public/platform/WebSize.h"
52 #include "third_party/WebKit/public/platform/WebString.h" 53 #include "third_party/WebKit/public/platform/WebString.h"
53 #include "third_party/WebKit/public/platform/WebURL.h" 54 #include "third_party/WebKit/public/platform/WebURL.h"
54 #include "third_party/WebKit/public/web/WebMediaSource.h" 55 #include "third_party/WebKit/public/web/WebMediaSource.h"
55 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h" 56 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
56 #include "third_party/WebKit/public/web/WebView.h" 57 #include "third_party/WebKit/public/web/WebView.h"
57 #include "v8/include/v8.h" 58 #include "v8/include/v8.h"
58 #include "webkit/plugins/ppapi/ppapi_webplugin_impl.h"
59 #include "webkit/renderer/compositor_bindings/web_layer_impl.h" 59 #include "webkit/renderer/compositor_bindings/web_layer_impl.h"
60 60
61 using WebKit::WebCanvas; 61 using WebKit::WebCanvas;
62 using WebKit::WebMediaPlayer; 62 using WebKit::WebMediaPlayer;
63 using WebKit::WebRect; 63 using WebKit::WebRect;
64 using WebKit::WebSize; 64 using WebKit::WebSize;
65 using WebKit::WebString; 65 using WebKit::WebString;
66 using media::PipelineStatus; 66 using media::PipelineStatus;
67 67
68 namespace { 68 namespace {
(...skipping 1168 matching lines...) Expand 10 before | Expand all | Expand 10 after
1237 1237
1238 if (pending_repaint_) 1238 if (pending_repaint_)
1239 return; 1239 return;
1240 1240
1241 pending_repaint_ = true; 1241 pending_repaint_ = true;
1242 main_loop_->PostTask(FROM_HERE, base::Bind( 1242 main_loop_->PostTask(FROM_HERE, base::Bind(
1243 &WebMediaPlayerImpl::Repaint, AsWeakPtr())); 1243 &WebMediaPlayerImpl::Repaint, AsWeakPtr()));
1244 } 1244 }
1245 1245
1246 } // namespace content 1246 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/video_destination_handler.cc ('k') | content/renderer/pepper/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698