Revert 169465 "Move deferred loading logic from WebMediaPlayerCl..."

trunk/Source/platform/graphics/media/MediaPlayer.h

 /*
  * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 40 matching lines @@
 class TimeRanges;
 
 // GL types as defined in OpenGL ES 2.0 header file gl2.h from khronos.org.
 // That header cannot be included directly due to a conflict with NPAPI headers.
 // See crbug.com/328085.
 typedef unsigned GC3Denum;
 typedef int GC3Dint;
 
 class MediaPlayerClient {
 public:
+    enum CORSMode { Unspecified, Anonymous, UseCredentials };
+
     virtual ~MediaPlayerClient() { }
 
     // the network state has changed
     virtual void mediaPlayerNetworkStateChanged() = 0;
 
     // the ready state has changed
     virtual void mediaPlayerReadyStateChanged() = 0;
 
     // time has jumped, eg. not as a result of normal playback
     virtual void mediaPlayerTimeChanged() = 0;
@@ skipping 12 matching lines @@
     // FIXME: Remove this when WebMediaPlayerClientImpl::loadInternal does not depend on it.
     virtual KURL mediaPlayerPosterURL() = 0;
 
 // Presentation-related methods
     // a new frame of video is available
     virtual void mediaPlayerRepaint() = 0;
 
     // the movie size has changed
     virtual void mediaPlayerSizeChanged() = 0;
 
+    virtual CORSMode mediaPlayerCORSMode() const = 0;
+
     virtual void mediaPlayerSetWebLayer(blink::WebLayer*) = 0;
     virtual void mediaPlayerSetOpaque(bool) = 0;
 
     virtual void mediaPlayerDidAddTextTrack(blink::WebInbandTextTrack*) = 0;
     virtual void mediaPlayerDidRemoveTextTrack(blink::WebInbandTextTrack*) = 0;
 
     virtual void mediaPlayerMediaSourceOpened(blink::WebMediaSource*) = 0;
 };
 
 typedef PassOwnPtr<MediaPlayer> (*CreateMediaEnginePlayer)(MediaPlayerClient*);
 
 class PLATFORM_EXPORT MediaPlayer {
     WTF_MAKE_NONCOPYABLE(MediaPlayer);
 public:
     static PassOwnPtr<MediaPlayer> create(MediaPlayerClient*);
     static void setMediaEngineCreateFunction(CreateMediaEnginePlayer);
 
     static double invalidTime() { return -1.0; }
 
     MediaPlayer() { }
     virtual ~MediaPlayer() { }
 
-    virtual void load(blink::WebMediaPlayer::LoadType, const String& url, blink::WebMediaPlayer::CORSMode) = 0;
+    virtual void load(blink::WebMediaPlayer::LoadType, const String& url) = 0;
+
+    virtual void prepareToPlay() = 0;
 
     virtual void play() = 0;
     virtual void pause() = 0;
 
     virtual bool supportsSave() const = 0;
     virtual IntSize naturalSize() const = 0;
 
     virtual bool hasVideo() const = 0;
     virtual bool hasAudio() const = 0;
 
@@ skipping 49 matching lines @@
 
 #if ENABLE(WEB_AUDIO)
     virtual AudioSourceProvider* audioSourceProvider() = 0;
 #endif
     virtual blink::WebMediaPlayer* webMediaPlayer() const = 0;
 };
 
 }
 
 #endif // MediaPlayer_h