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

webkit/renderer/media/webmediaplayer_impl.h

 // 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.
 
 // Delegate calls from WebCore::MediaPlayerPrivate to Chrome's video player.
 // It contains Pipeline which is the actual media player pipeline, it glues
 // the media player pipeline, data source, audio renderer and renderer.
 // Pipeline would creates multiple threads and access some public methods
 // of this class, so we need to be extra careful about concurrent access of
 // methods and members.
@@ skipping 47 matching lines @@
 class MediaLog;
 }
 
 namespace webkit {
 class WebLayerImpl;
 }
 
 namespace webkit_media {
 
 class BufferedDataSource;
-class MediaStreamClient;
+class MediaLoadDelegate;
 class WebAudioSourceProviderImpl;
 class WebMediaPlayerDelegate;
 class WebMediaPlayerParams;
 class WebTextTrackImpl;
 
 class WebMediaPlayerImpl
     : public WebKit::WebMediaPlayer,
       public cc::VideoFrameProvider,
       public base::MessageLoop::DestructionObserver,
       public base::SupportsWeakPtr<WebMediaPlayerImpl> {
@@ skipping 119 matching lines @@
   void OnNeedKey(const std::string& type,
                  const std::string& session_id,
                  scoped_ptr<uint8[]> init_data,
                  int init_data_size);
   scoped_ptr<media::TextTrack> OnTextTrack(media::TextKind kind,
                                            const std::string& label,
                                            const std::string& language);
   void SetOpaque(bool);
 
  private:
-  // Contains common logic used across the different types loading.
-  void LoadSetup(const WebKit::WebURL& url);
+  // Called after |load_delegate_| has decided to allow the load. If
+  // |load_delegate_| is NULL this is called immediately.
+  void ContinueLoad(const WebKit::WebURL& url,

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

nit: "Continue" implies there was a previous step. "Perform" (aka Do)?

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

Done.

+                    WebKit::WebMediaSource* media_source,
+                    CORSMode cors_mode);
 
   // Called after asynchronous initialization of a data source completed.
   void DataSourceInitialized(const GURL& gurl, bool success);
 
   // Called when the data source is downloading or paused.
   void NotifyDownloading(bool is_downloading);
 
   // Finishes starting the pipeline due to a call to load().
   //
   // A non-null |media_source| will construct a Media Source pipeline.
@@ skipping 78 matching lines @@
 
   // Seek gets pending if another seek is in progress. Only last pending seek
   // will have effect.
   bool pending_seek_;
   double pending_seek_seconds_;
 
   WebKit::WebMediaPlayerClient* client_;
 
   base::WeakPtr<WebMediaPlayerDelegate> delegate_;
 
-  MediaStreamClient* media_stream_client_;
+  MediaLoadDelegate* load_delegate_;
 
   scoped_refptr<media::MediaLog> media_log_;
 
   // Since accelerated compositing status is only known after the first layout,
   // we delay reporting it to UMA until that time.
   bool accelerated_compositing_reported_;
 
   bool incremented_externally_allocated_memory_;
 
   // Factories for supporting GpuVideoDecoder. May be null.
@@ skipping 45 matching lines @@
 
   // Text track objects get a unique index value when they're created.
   int text_track_index_;
 
   DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl);
 };
 
 }  // namespace webkit_media
 
 #endif  // WEBKIT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_