Migrate webkit/renderer/media/ to content/renderer/media/.

webkit/renderer/media/webmediaplayer_impl.cc

 // Copyright 2013 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/renderer/media/webmediaplayer_impl.h"
 
 #include <algorithm>
 #include <limits>
 #include <string>
 #include <vector>
@@ skipping 29 matching lines @@
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
 #include "third_party/WebKit/public/web/WebMediaSource.h"
 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
 #include "third_party/WebKit/public/web/WebView.h"
 #include "v8/include/v8.h"
 #include "webkit/plugins/ppapi/ppapi_webplugin_impl.h"
 #include "webkit/renderer/compositor_bindings/web_layer_impl.h"
 #include "webkit/renderer/media/buffered_data_source.h"
 #include "webkit/renderer/media/crypto/key_systems.h"
+#include "webkit/renderer/media/media_load_delegate.h"
 #include "webkit/renderer/media/texttrack_impl.h"
 #include "webkit/renderer/media/webaudiosourceprovider_impl.h"
 #include "webkit/renderer/media/webinbandtexttrack_impl.h"
 #include "webkit/renderer/media/webmediaplayer_delegate.h"
 #include "webkit/renderer/media/webmediaplayer_params.h"
 #include "webkit/renderer/media/webmediaplayer_util.h"
 #include "webkit/renderer/media/webmediasourceclient_impl.h"
 
 using WebKit::WebCanvas;
 using WebKit::WebMediaPlayer;
@@ skipping 72 matching lines @@
       ready_state_(WebMediaPlayer::ReadyStateHaveNothing),
       main_loop_(base::MessageLoopProxy::current()),
       media_loop_(params.message_loop_proxy()),
       paused_(true),
       seeking_(false),
       playback_rate_(0.0f),
       pending_seek_(false),
       pending_seek_seconds_(0.0f),
       client_(client),
       delegate_(delegate),
+      load_delegate_(params.load_delegate()),
       media_log_(params.media_log()),
       accelerated_compositing_reported_(false),
       incremented_externally_allocated_memory_(false),
       gpu_factories_(params.gpu_factories()),
       is_local_source_(false),
       supports_save_(true),
       starting_(false),
       chunk_demuxer_(NULL),
       pending_repaint_(false),
       pending_size_change_(false),
@@ skipping 83 matching lines @@
   if (url.SchemeIs("file")) return kFileURLScheme;
   if (url.SchemeIs("blob")) return kBlobURLScheme;
   if (url.SchemeIs("data")) return kDataURLScheme;
   if (url.SchemeIs("filesystem")) return kFileSystemScheme;
   return kUnknownURLScheme;
 }
 
 }  // anonymous namespace
 
 void WebMediaPlayerImpl::load(const WebKit::WebURL& url, CORSMode cors_mode) {
-  DCHECK(main_loop_->BelongsToCurrentThread());
-
-  LoadSetup(url);
-
-  // Otherwise it's a regular request which requires resolving the URL first.
-  GURL gurl(url);
-  data_source_.reset(new BufferedDataSource(
-      main_loop_,
-      frame_,
-      media_log_.get(),
-      base::Bind(&WebMediaPlayerImpl::NotifyDownloading, AsWeakPtr())));
-  data_source_->Initialize(
-      url, static_cast<BufferedResourceLoader::CORSMode>(cors_mode),
-      base::Bind(
-          &WebMediaPlayerImpl::DataSourceInitialized,
-          AsWeakPtr(), gurl));
-
-  is_local_source_ = !gurl.SchemeIs("http") && !gurl.SchemeIs("https");
+  load(url, NULL, cors_mode);

[ddorwin, 2013/06/29 01:38:30]

overloading not allowed?

[scherkus (not reviewing), 2013/07/02 01:46:23]

this is an interface defined in WK

AFAIK it's OK there but in any case that's beyond the scope of this CL

 }
 
 void WebMediaPlayerImpl::load(const WebKit::WebURL& url,
                               WebKit::WebMediaSource* media_source,

[ddorwin, 2013/06/29 01:38:30]

nit: Should be last parameter? (Fine to change later.)

[scherkus (not reviewing), 2013/07/02 01:46:23]

ditto

                               CORSMode cors_mode) {
-  LoadSetup(url);
-
-  // Media source pipelines can start immediately.
-  supports_save_ = false;
-  StartPipeline(media_source);
+  if (load_delegate_) {
+    load_delegate_->DeferLoad(base::Bind(
+        &WebMediaPlayerImpl::ContinueLoad, AsWeakPtr(), url, media_source,
+        cors_mode));
+    return;
+  }
+  ContinueLoad(url, media_source, cors_mode);
 }
 
-void WebMediaPlayerImpl::LoadSetup(const WebKit::WebURL& url) {
+void WebMediaPlayerImpl::ContinueLoad(const WebKit::WebURL& url,
+                                      WebKit::WebMediaSource* media_source,
+                                      CORSMode cors_mode) {
+  DCHECK(main_loop_->BelongsToCurrentThread());
+
   GURL gurl(url);
   UMA_HISTOGRAM_ENUMERATION("Media.URLScheme", URLScheme(gurl), kMaxURLScheme);
 
   // Set subresource URL for crash reporting.
   base::debug::SetCrashKeyValue("subresource_url", gurl.spec());
 
   // Handle any volume/preload changes that occurred before load().
   setVolume(GetClient()->volume());
   setPreload(GetClient()->preload());
 
   SetNetworkState(WebMediaPlayer::NetworkStateLoading);
   SetReadyState(WebMediaPlayer::ReadyStateHaveNothing);
   media_log_->AddEvent(media_log_->CreateLoadEvent(url.spec()));
+
+  // Media source pipelines can start immediately.
+  if (media_source) {
+    supports_save_ = false;
+    StartPipeline(media_source);
+    return;
+  }
+
+  // Otherwise it's a regular request which requires resolving the URL first.
+  data_source_.reset(new BufferedDataSource(
+      main_loop_,
+      frame_,
+      media_log_.get(),
+      base::Bind(&WebMediaPlayerImpl::NotifyDownloading, AsWeakPtr())));
+  data_source_->Initialize(
+      url, static_cast<BufferedResourceLoader::CORSMode>(cors_mode),
+      base::Bind(
+          &WebMediaPlayerImpl::DataSourceInitialized,
+          AsWeakPtr(), gurl));
+
+  is_local_source_ = !gurl.SchemeIs("http") && !gurl.SchemeIs("https");
 }
 
 void WebMediaPlayerImpl::play() {
   DCHECK(main_loop_->BelongsToCurrentThread());
 
   paused_ = false;
   pipeline_->SetPlaybackRate(playback_rate_);
 
   media_log_->AddEvent(media_log_->CreateEvent(media::MediaLogEvent::PLAY));
 
@@ skipping 918 matching lines @@
 
   if (pending_repaint_)
     return;
 
   pending_repaint_ = true;
   main_loop_->PostTask(FROM_HERE, base::Bind(
       &WebMediaPlayerImpl::Repaint, AsWeakPtr()));
 }
 
 }  // namespace webkit_media