Remove --enable-video-logging and WebVideoRenderer.

webkit/media/webmediaplayer_impl.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/media/webmediaplayer_impl.h"
 
 #include <limits>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 16 matching lines @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRect.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSize.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebVideoFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "v8/include/v8.h"
 #include "webkit/media/buffered_data_source.h"
 #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"
 
 using WebKit::WebCanvas;
 using WebKit::WebRect;
 using WebKit::WebSize;
 using media::PipelineStatus;
 
 namespace {
@@ skipping 76 matching lines @@
       incremented_externally_allocated_memory_(false) {
   // Saves the current message loop.
   DCHECK(!main_loop_);
   main_loop_ = MessageLoop::current();
   media_log_->AddEvent(
       media_log_->CreateEvent(media::MediaLogEvent::WEBMEDIAPLAYER_CREATED));
 }
 
 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");
   if (!pipeline_message_loop) {
     NOTREACHED() << "Could not start PipelineThread";
     return false;
   }
 
   // Let V8 know we started new thread if we did not did it yet.
   // Made separate task to avoid deletion of player currently being created.
   // Also, delaying GC until after player starts gets rid of starting lag --
   // collection happens in parallel with playing.
   // TODO(enal): remove when we get rid of per-audio-stream thread.
   if (!incremented_externally_allocated_memory_) {
     MessageLoop::current()->PostTask(
         FROM_HERE,
         base::Bind(&WebMediaPlayerImpl::IncrementExternallyAllocatedMemory,
                    AsWeakPtr()));
   }
 
   is_accelerated_compositing_active_ =
       frame->view()->isAcceleratedCompositingActive();
 
   pipeline_ = new media::PipelineImpl(pipeline_message_loop, media_log_);
 
   // 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(
       base::Bind(&WebMediaPlayerProxy::PipelineEndedCallback,
                  proxy_.get()),
       base::Bind(&WebMediaPlayerProxy::PipelineErrorCallback,
                  proxy_.get()),
       base::Bind(&WebMediaPlayerProxy::NetworkEventCallback,
                  proxy_.get()));
 
@@ skipping 376 matching lines @@
 }
 
 unsigned long long WebMediaPlayerImpl::totalBytes() const {
   DCHECK_EQ(main_loop_, MessageLoop::current());
 
   return pipeline_->GetTotalBytes();
 }
 
 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,
                                const WebRect& rect) {
   DCHECK_EQ(main_loop_, MessageLoop::current());
   DCHECK(proxy_);
 
 #if WEBKIT_USING_SKIA
   proxy_->Paint(canvas, rect);
 #elif WEBKIT_USING_CG
@@ skipping 331 matching lines @@
   return client_;
 }
 
 void WebMediaPlayerImpl::IncrementExternallyAllocatedMemory() {
   DCHECK_EQ(main_loop_, MessageLoop::current());
   incremented_externally_allocated_memory_ = true;
   v8::V8::AdjustAmountOfExternalAllocatedMemory(kPlayerExtraMemory);
 }
 
 }  // namespace webkit_media