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

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

Issue 6783023: Eliminate skia::PlatformCanvas - Step 1 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 8 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #include <string> 8 #include <string>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "media/base/composite_data_source_factory.h" 12 #include "media/base/composite_data_source_factory.h"
13 #include "media/base/filter_collection.h" 13 #include "media/base/filter_collection.h"
14 #include "media/base/limits.h" 14 #include "media/base/limits.h"
15 #include "media/base/media_format.h" 15 #include "media/base/media_format.h"
16 #include "media/base/media_switches.h" 16 #include "media/base/media_switches.h"
17 #include "media/base/pipeline_impl.h" 17 #include "media/base/pipeline_impl.h"
18 #include "media/base/video_frame.h" 18 #include "media/base/video_frame.h"
19 #include "media/filters/adaptive_demuxer.h" 19 #include "media/filters/adaptive_demuxer.h"
20 #include "media/filters/ffmpeg_audio_decoder.h" 20 #include "media/filters/ffmpeg_audio_decoder.h"
21 #include "media/filters/ffmpeg_demuxer_factory.h" 21 #include "media/filters/ffmpeg_demuxer_factory.h"
22 #include "media/filters/ffmpeg_video_decoder.h" 22 #include "media/filters/ffmpeg_video_decoder.h"
23 #include "media/filters/rtc_video_decoder.h" 23 #include "media/filters/rtc_video_decoder.h"
24 #include "media/filters/null_audio_renderer.h" 24 #include "media/filters/null_audio_renderer.h"
25 #include "skia/ext/platform_canvas.h"
26 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRect.h" 25 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRect.h"
27 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSize.h" 26 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSize.h"
28 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h" 27 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h"
29 #include "third_party/WebKit/Source/WebKit/chromium/public/WebVideoFrame.h" 28 #include "third_party/WebKit/Source/WebKit/chromium/public/WebVideoFrame.h"
30 #include "webkit/glue/media/buffered_data_source.h" 29 #include "webkit/glue/media/buffered_data_source.h"
31 #include "webkit/glue/media/simple_data_source.h" 30 #include "webkit/glue/media/simple_data_source.h"
32 #include "webkit/glue/media/video_renderer_impl.h" 31 #include "webkit/glue/media/video_renderer_impl.h"
33 #include "webkit/glue/media/web_video_renderer.h" 32 #include "webkit/glue/media/web_video_renderer.h"
34 #include "webkit/glue/webvideoframe_impl.h" 33 #include "webkit/glue/webvideoframe_impl.h"
35 34
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 scoped_refptr<WebVideoRenderer> video_renderer) { 116 scoped_refptr<WebVideoRenderer> video_renderer) {
118 video_renderer_ = video_renderer; 117 video_renderer_ = video_renderer;
119 } 118 }
120 119
121 WebDataSourceBuildObserverHack* WebMediaPlayerImpl::Proxy::GetBuildObserver() { 120 WebDataSourceBuildObserverHack* WebMediaPlayerImpl::Proxy::GetBuildObserver() {
122 if (!build_observer_.get()) 121 if (!build_observer_.get())
123 build_observer_.reset(NewCallback(this, &Proxy::AddDataSource)); 122 build_observer_.reset(NewCallback(this, &Proxy::AddDataSource));
124 return build_observer_.get(); 123 return build_observer_.get();
125 } 124 }
126 125
127 void WebMediaPlayerImpl::Proxy::Paint(skia::PlatformCanvas* canvas, 126 void WebMediaPlayerImpl::Proxy::Paint(SkCanvas* canvas,
128 const gfx::Rect& dest_rect) { 127 const gfx::Rect& dest_rect) {
129 DCHECK(MessageLoop::current() == render_loop_); 128 DCHECK(MessageLoop::current() == render_loop_);
130 if (video_renderer_) { 129 if (video_renderer_) {
131 video_renderer_->Paint(canvas, dest_rect); 130 video_renderer_->Paint(canvas, dest_rect);
132 } 131 }
133 } 132 }
134 133
135 void WebMediaPlayerImpl::Proxy::SetSize(const gfx::Rect& rect) { 134 void WebMediaPlayerImpl::Proxy::SetSize(const gfx::Rect& rect) {
136 DCHECK(MessageLoop::current() == render_loop_); 135 DCHECK(MessageLoop::current() == render_loop_);
137 if (video_renderer_) { 136 if (video_renderer_) {
(...skipping 774 matching lines...) Expand 10 before | Expand all | Expand 10 after
912 } 911 }
913 } 912 }
914 913
915 WebKit::WebMediaPlayerClient* WebMediaPlayerImpl::GetClient() { 914 WebKit::WebMediaPlayerClient* WebMediaPlayerImpl::GetClient() {
916 DCHECK(MessageLoop::current() == main_loop_); 915 DCHECK(MessageLoop::current() == main_loop_);
917 DCHECK(client_); 916 DCHECK(client_);
918 return client_; 917 return client_;
919 } 918 }
920 919
921 } // namespace webkit_glue 920 } // namespace webkit_glue
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698