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

Unified Diff: webkit/media/webmediaplayer_impl.cc

Issue 8601004: Remove --enable-video-logging and WebVideoRenderer. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src
Patch Set: forgot gypi Created 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/media/webmediaplayer_impl.h ('k') | webkit/media/webmediaplayer_proxy.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/media/webmediaplayer_impl.cc
diff --git a/webkit/media/webmediaplayer_impl.cc b/webkit/media/webmediaplayer_impl.cc
index a4fe3e92066bcd2e612ebe7505d0196d81e5260f..bcdf4661da406c09f7478ea6cebcbda369c4762e 100644
--- a/webkit/media/webmediaplayer_impl.cc
+++ b/webkit/media/webmediaplayer_impl.cc
@@ -34,7 +34,6 @@
#include "webkit/media/media_stream_client.h"
#include "webkit/media/simple_data_source.h"
#include "webkit/media/video_renderer_impl.h"
-#include "webkit/media/web_video_renderer.h"
#include "webkit/media/webmediaplayer_delegate.h"
#include "webkit/media/webmediaplayer_proxy.h"
#include "webkit/media/webvideoframe_impl.h"
@@ -131,8 +130,7 @@ WebMediaPlayerImpl::WebMediaPlayerImpl(
bool WebMediaPlayerImpl::Initialize(
WebKit::WebFrame* frame,
- bool use_simple_data_source,
- scoped_refptr<WebVideoRenderer> web_video_renderer) {
+ bool use_simple_data_source) {
DCHECK_EQ(main_loop_, MessageLoop::current());
MessageLoop* pipeline_message_loop =
message_loop_factory_->GetMessageLoop("PipelineThread");
@@ -161,10 +159,12 @@ bool WebMediaPlayerImpl::Initialize(
// Also we want to be notified of |main_loop_| destruction.
main_loop_->AddDestructionObserver(this);
- // Creates the proxy.
+ // Create proxy and default video renderer.
proxy_ = new WebMediaPlayerProxy(main_loop_, this);
- web_video_renderer->SetWebMediaPlayerProxy(proxy_);
- proxy_->SetVideoRenderer(web_video_renderer);
+ scoped_refptr<VideoRendererImpl> video_renderer =
+ new VideoRendererImpl(proxy_);
+ filter_collection_->AddVideoRenderer(video_renderer);
+ proxy_->SetVideoRenderer(video_renderer);
// Set our pipeline callbacks.
pipeline_->Init(
@@ -561,9 +561,8 @@ unsigned long long WebMediaPlayerImpl::totalBytes() const {
void WebMediaPlayerImpl::setSize(const WebSize& size) {
DCHECK_EQ(main_loop_, MessageLoop::current());
- DCHECK(proxy_);
- proxy_->SetSize(gfx::Rect(0, 0, size.width, size.height));
+ // Don't need to do anything as we use the dimensions passed in via paint().
}
void WebMediaPlayerImpl::paint(WebCanvas* canvas,
« no previous file with comments | « webkit/media/webmediaplayer_impl.h ('k') | webkit/media/webmediaplayer_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698