Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1927)

Unified Diff: Source/web/WebMediaPlayerClientImpl.h

Issue 192013002: Move deferred loading logic from WebMediaPlayerClientImpl to HTMLMediaElement. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Clean up unnecessary logic and state. Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/web/WebMediaPlayerClientImpl.h
diff --git a/Source/web/WebMediaPlayerClientImpl.h b/Source/web/WebMediaPlayerClientImpl.h
index 94501c924a9304cf6d66dfee6b73ae31efe092f5..179910f6f0ef4e608bd76a87a413145ad75fbe41 100644
--- a/Source/web/WebMediaPlayerClientImpl.h
+++ b/Source/web/WebMediaPlayerClientImpl.h
@@ -95,10 +95,9 @@ public:
// MediaPlayer methods:
virtual WebMediaPlayer* webMediaPlayer() const OVERRIDE;
- virtual void load(WebMediaPlayer::LoadType, const WTF::String& url) OVERRIDE;
+ virtual void load(WebMediaPlayer::LoadType, const WTF::String& url, WebMediaPlayer::CORSMode) OVERRIDE;
virtual void play() OVERRIDE;
virtual void pause() OVERRIDE;
- virtual void prepareToPlay() OVERRIDE;
virtual bool supportsSave() const OVERRIDE;
virtual WebCore::IntSize naturalSize() const OVERRIDE;
virtual bool hasVideo() const OVERRIDE;
@@ -140,9 +139,6 @@ public:
private:
explicit WebMediaPlayerClientImpl(WebCore::MediaPlayerClient*);
- void startDelayedLoad();
- void loadInternal();
-
WebCore::HTMLMediaElement& mediaElement() const;
#if OS(ANDROID)
@@ -155,8 +151,6 @@ private:
WebCore::MediaPlayerClient* m_client;
OwnPtr<WebMediaPlayer> m_webMediaPlayer;
- WebCore::KURL m_url;
- bool m_delayingLoad;
WebCore::MediaPlayer::Preload m_preload;
bool m_needsWebLayerForVideo;
double m_volume;
@@ -210,8 +204,6 @@ private:
AudioSourceProviderImpl m_audioSourceProvider;
#endif
-
- WebMediaPlayer::LoadType m_loadType;
};
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698