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

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

Issue 14651027: Move webkit/compositor_bindings into webkit/renderer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 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 | « webkit/media/webkit_media.gypi ('k') | webkit/media/webmediaplayer_ms.cc » ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/media/webmediaplayer_impl.h" 5 #include "webkit/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 25 matching lines...) Expand all
36 #include "media/filters/video_renderer_base.h" 36 #include "media/filters/video_renderer_base.h"
37 #include "media/filters/vpx_video_decoder.h" 37 #include "media/filters/vpx_video_decoder.h"
38 #include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h" 38 #include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h"
39 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" 39 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h"
40 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h" 40 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h"
41 #include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" 41 #include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h"
42 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaSource.h" 42 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaSource.h"
43 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h" 43 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h"
44 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" 44 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
45 #include "v8/include/v8.h" 45 #include "v8/include/v8.h"
46 #include "webkit/compositor_bindings/web_layer_impl.h"
47 #include "webkit/media/buffered_data_source.h" 46 #include "webkit/media/buffered_data_source.h"
48 #include "webkit/media/webaudiosourceprovider_impl.h" 47 #include "webkit/media/webaudiosourceprovider_impl.h"
49 #include "webkit/media/webmediaplayer_delegate.h" 48 #include "webkit/media/webmediaplayer_delegate.h"
50 #include "webkit/media/webmediaplayer_params.h" 49 #include "webkit/media/webmediaplayer_params.h"
51 #include "webkit/media/webmediaplayer_util.h" 50 #include "webkit/media/webmediaplayer_util.h"
52 #include "webkit/media/webmediasourceclient_impl.h" 51 #include "webkit/media/webmediasourceclient_impl.h"
53 #include "webkit/plugins/ppapi/ppapi_webplugin_impl.h" 52 #include "webkit/plugins/ppapi/ppapi_webplugin_impl.h"
53 #include "webkit/renderer/compositor_bindings/web_layer_impl.h"
54 54
55 using WebKit::WebCanvas; 55 using WebKit::WebCanvas;
56 using WebKit::WebMediaPlayer; 56 using WebKit::WebMediaPlayer;
57 using WebKit::WebRect; 57 using WebKit::WebRect;
58 using WebKit::WebSize; 58 using WebKit::WebSize;
59 using WebKit::WebString; 59 using WebKit::WebString;
60 using media::PipelineStatus; 60 using media::PipelineStatus;
61 61
62 namespace { 62 namespace {
63 63
(...skipping 1204 matching lines...) Expand 10 before | Expand all | Expand 10 after
1268 1268
1269 if (pending_repaint_) 1269 if (pending_repaint_)
1270 return; 1270 return;
1271 1271
1272 pending_repaint_ = true; 1272 pending_repaint_ = true;
1273 main_loop_->PostTask(FROM_HERE, base::Bind( 1273 main_loop_->PostTask(FROM_HERE, base::Bind(
1274 &WebMediaPlayerImpl::Repaint, AsWeakPtr())); 1274 &WebMediaPlayerImpl::Repaint, AsWeakPtr()));
1275 } 1275 }
1276 1276
1277 } // namespace webkit_media 1277 } // namespace webkit_media
OLDNEW
« no previous file with comments | « webkit/media/webkit_media.gypi ('k') | webkit/media/webmediaplayer_ms.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698