Full screen video Chromium patch

webkit/glue/webmediaplayer_impl.cc

 // Copyright (c) 2010 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/glue/webmediaplayer_impl.h"
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "media/base/limits.h"
 #include "media/base/media_format.h"
@@ skipping 224 matching lines @@
 WebMediaPlayerImpl::~WebMediaPlayerImpl() {
   Destroy();
 
   // Finally tell the |main_loop_| we don't want to be notified of destruction
   // event.
   if (main_loop_) {
     main_loop_->RemoveDestructionObserver(this);
   }
 }
 
+WebKit::WebMediaPlayerClient* WebMediaPlayerImpl::client() const {
+  // TODO(boliu): Remove these? Need locks?
+  DCHECK(MessageLoop::current() == main_loop_);
+  DCHECK(client_);
+  return client_;
+}
+
+void WebMediaPlayerImpl::setClient(WebKit::WebMediaPlayerClient* new_client) {
+  // TODO(boliu): Remove these? Need locks?
+  DCHECK(MessageLoop::current() == main_loop_);
+  client_ = new_client;
+}
+
 void WebMediaPlayerImpl::load(const WebKit::WebURL& url) {
   DCHECK(MessageLoop::current() == main_loop_);
   DCHECK(proxy_);
 
   // Handle any volume changes that occured before load().
-  setVolume(GetClient()->volume());
+  setVolume(client()->volume());
 
   // Initialize the pipeline.
   SetNetworkState(WebKit::WebMediaPlayer::Loading);
   SetReadyState(WebKit::WebMediaPlayer::HaveNothing);
   pipeline_->Start(
       filter_factory_.get(),
       url.spec(),
       NewCallback(proxy_.get(),
                   &WebMediaPlayerImpl::Proxy::PipelineInitializationCallback));
 }
@@ skipping 31 matching lines @@
   DCHECK(MessageLoop::current() == main_loop_);
 
   // WebKit fires a seek(0) at the very start, however pipeline already does a
   // seek(0) internally.  Avoid doing seek(0) the second time because this will
   // cause extra pre-rolling and will break servers without range request
   // support.
   //
   // We still have to notify WebKit that time has changed otherwise
   // HTMLMediaElement gets into an inconsistent state.
   if (pipeline_->GetCurrentTime().ToInternalValue() == 0 && seconds == 0) {
-    GetClient()->timeChanged();
+    client()->timeChanged();
     return;
   }
 
   // Drop our ready state if the media file isn't fully loaded.
   if (!pipeline_->IsLoaded()) {
     SetReadyState(WebKit::WebMediaPlayer::HaveMetadata);
   }
 
   // Try to preserve as much accuracy as possible.
   float microseconds = seconds * base::Time::kMicrosecondsPerSecond;
@@ skipping 249 matching lines @@
   return WebKit::WebMediaPlayer::Unknown;
 }
 
 void WebMediaPlayerImpl::WillDestroyCurrentMessageLoop() {
   Destroy();
   main_loop_ = NULL;
 }
 
 void WebMediaPlayerImpl::Repaint() {
   DCHECK(MessageLoop::current() == main_loop_);
-  GetClient()->repaint();
+  client()->repaint();
 }
 
 void WebMediaPlayerImpl::OnPipelineInitialize() {
   DCHECK(MessageLoop::current() == main_loop_);
   if (pipeline_->GetError() == media::PIPELINE_OK) {
     // Only keep one time range starting from 0.
     WebKit::WebTimeRanges new_buffered(static_cast<size_t>(1));
     new_buffered[0].start = 0.0f;
     new_buffered[0].end =
         static_cast<float>(pipeline_->GetMediaDuration().InSecondsF());
@@ skipping 22 matching lines @@
 
 void WebMediaPlayerImpl::OnPipelineSeek() {
   DCHECK(MessageLoop::current() == main_loop_);
   if (pipeline_->GetError() == media::PIPELINE_OK) {
     // Update our paused time.
     if (paused_) {
       paused_time_ = pipeline_->GetCurrentTime();
     }
 
     SetReadyState(WebKit::WebMediaPlayer::HaveEnoughData);
-    GetClient()->timeChanged();
+    client()->timeChanged();
   }
 }
 
 void WebMediaPlayerImpl::OnPipelineEnded() {
   DCHECK(MessageLoop::current() == main_loop_);
   if (pipeline_->GetError() == media::PIPELINE_OK) {
-    GetClient()->timeChanged();
+    client()->timeChanged();
   }
 }
 
 void WebMediaPlayerImpl::OnPipelineError() {
   DCHECK(MessageLoop::current() == main_loop_);
   switch (pipeline_->GetError()) {
     case media::PIPELINE_OK:
     case media::PIPELINE_ERROR_INITIALIZATION_FAILED:
     case media::PIPELINE_ERROR_REQUIRED_FILTER_MISSING:
     case media::PIPELINE_ERROR_COULD_NOT_RENDER:
@@ skipping 35 matching lines @@
       SetNetworkState(WebKit::WebMediaPlayer::Idle);
     }
   }
 }
 
 void WebMediaPlayerImpl::SetNetworkState(
     WebKit::WebMediaPlayer::NetworkState state) {
   DCHECK(MessageLoop::current() == main_loop_);
   // Always notify to ensure client has the latest value.
   network_state_ = state;
-  GetClient()->networkStateChanged();
+  client()->networkStateChanged();
 }
 
 void WebMediaPlayerImpl::SetReadyState(
     WebKit::WebMediaPlayer::ReadyState state) {
   DCHECK(MessageLoop::current() == main_loop_);
   // Always notify to ensure client has the latest value.
   ready_state_ = state;
-  GetClient()->readyStateChanged();
+  client()->readyStateChanged();
 }
 
 void WebMediaPlayerImpl::Destroy() {
   DCHECK(MessageLoop::current() == main_loop_);
 
   // Make sure to kill the pipeline so there's no more media threads running.
   // Note: stopping the pipeline might block for a long time.
   pipeline_->Stop(NewCallback(this,
       &WebMediaPlayerImpl::PipelineStoppedCallback));
   pipeline_stopped_.Wait();
   pipeline_thread_.Stop();
 
   // And then detach the proxy, it may live on the render thread for a little
   // longer until all the tasks are finished.
   if (proxy_) {
     proxy_->Detach();
     proxy_ = NULL;
   }
 }
 
 void WebMediaPlayerImpl::PipelineStoppedCallback() {
   pipeline_stopped_.Signal();
 }
 
-WebKit::WebMediaPlayerClient* WebMediaPlayerImpl::GetClient() {
-  DCHECK(MessageLoop::current() == main_loop_);
-  DCHECK(client_);
-  return client_;
-}
-
 }  // namespace webkit_glue