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

Side by Side Diff: trunk/Source/web/WebMediaPlayerClientImpl.h

Issue 320053003: Revert 175683 "Eliminate MediaPlayer & MediaPlayerClient abstrac..." (Closed) Base URL: svn://svn.chromium.org/blink/
Patch Set: Created 6 years, 6 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 virtual void setWebLayer(WebLayer*) OVERRIDE; 87 virtual void setWebLayer(WebLayer*) OVERRIDE;
88 virtual void addTextTrack(WebInbandTextTrack*) OVERRIDE; 88 virtual void addTextTrack(WebInbandTextTrack*) OVERRIDE;
89 virtual void removeTextTrack(WebInbandTextTrack*) OVERRIDE; 89 virtual void removeTextTrack(WebInbandTextTrack*) OVERRIDE;
90 virtual void mediaSourceOpened(WebMediaSource*) OVERRIDE; 90 virtual void mediaSourceOpened(WebMediaSource*) OVERRIDE;
91 virtual void requestFullscreen() OVERRIDE; 91 virtual void requestFullscreen() OVERRIDE;
92 virtual void requestSeek(double) OVERRIDE; 92 virtual void requestSeek(double) OVERRIDE;
93 93
94 // MediaPlayer methods: 94 // MediaPlayer methods:
95 virtual WebMediaPlayer* webMediaPlayer() const OVERRIDE; 95 virtual WebMediaPlayer* webMediaPlayer() const OVERRIDE;
96 virtual void load(WebMediaPlayer::LoadType, const WTF::String& url, WebMedia Player::CORSMode) OVERRIDE; 96 virtual void load(WebMediaPlayer::LoadType, const WTF::String& url, WebMedia Player::CORSMode) OVERRIDE;
97 virtual double rate() const OVERRIDE;
98 virtual void setRate(double) OVERRIDE;
97 virtual WebCore::MediaPlayer::NetworkState networkState() const OVERRIDE; 99 virtual WebCore::MediaPlayer::NetworkState networkState() const OVERRIDE;
98 virtual WebCore::MediaPlayer::ReadyState readyState() const OVERRIDE; 100 virtual WebCore::MediaPlayer::ReadyState readyState() const OVERRIDE;
101 virtual double maxTimeSeekable() const OVERRIDE;
102 virtual WTF::PassRefPtr<WebCore::TimeRanges> buffered() const OVERRIDE;
103 virtual bool didLoadingProgress() const OVERRIDE;
99 virtual void paint(WebCore::GraphicsContext*, const WebCore::IntRect&) OVERR IDE; 104 virtual void paint(WebCore::GraphicsContext*, const WebCore::IntRect&) OVERR IDE;
100 virtual bool copyVideoTextureToPlatformTexture(WebGraphicsContext3D*, Platfo rm3DObject texture, GLint level, GLenum type, GLenum internalFormat, bool premul tiplyAlpha, bool flipY) OVERRIDE; 105 virtual bool copyVideoTextureToPlatformTexture(WebGraphicsContext3D*, Platfo rm3DObject texture, GLint level, GLenum type, GLenum internalFormat, bool premul tiplyAlpha, bool flipY) OVERRIDE;
101 virtual void setPreload(WebCore::MediaPlayer::Preload) OVERRIDE; 106 virtual void setPreload(WebCore::MediaPlayer::Preload) OVERRIDE;
102 107
103 #if ENABLE(WEB_AUDIO) 108 #if ENABLE(WEB_AUDIO)
104 virtual WebCore::AudioSourceProvider* audioSourceProvider() OVERRIDE; 109 virtual WebCore::AudioSourceProvider* audioSourceProvider() OVERRIDE;
105 #endif 110 #endif
106 111
107 private: 112 private:
108 explicit WebMediaPlayerClientImpl(WebCore::MediaPlayerClient*); 113 explicit WebMediaPlayerClientImpl(WebCore::MediaPlayerClient*);
109 114
110 WebCore::HTMLMediaElement& mediaElement() const; 115 WebCore::HTMLMediaElement& mediaElement() const;
111 116
112 WebCore::MediaPlayerClient* m_client; 117 WebCore::MediaPlayerClient* m_client;
113 OwnPtr<WebMediaPlayer> m_webMediaPlayer; 118 OwnPtr<WebMediaPlayer> m_webMediaPlayer;
114 WebCore::MediaPlayer::Preload m_preload; 119 WebCore::MediaPlayer::Preload m_preload;
120 double m_rate;
115 121
116 #if OS(ANDROID) 122 #if OS(ANDROID)
117 // FIXME: This path "only works" on Android. It is a workaround for the prob lem that Skia could not handle Android's GL_TEXTURE_EXTERNAL_OES 123 // FIXME: This path "only works" on Android. It is a workaround for the prob lem that Skia could not handle Android's GL_TEXTURE_EXTERNAL_OES
118 // texture internally. It should be removed and replaced by the normal paint path. 124 // texture internally. It should be removed and replaced by the normal paint path.
119 // https://code.google.com/p/skia/issues/detail?id=1189 125 // https://code.google.com/p/skia/issues/detail?id=1189
120 void paintOnAndroid(WebCore::GraphicsContext*, const WebCore::IntRect&, uint 8_t alpha); 126 void paintOnAndroid(WebCore::GraphicsContext*, const WebCore::IntRect&, uint 8_t alpha);
121 SkBitmap m_bitmap; 127 SkBitmap m_bitmap;
122 bool m_usePaintOnAndroid; 128 bool m_usePaintOnAndroid;
123 #endif 129 #endif
124 130
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 Mutex provideInputLock; 173 Mutex provideInputLock;
168 }; 174 };
169 175
170 AudioSourceProviderImpl m_audioSourceProvider; 176 AudioSourceProviderImpl m_audioSourceProvider;
171 #endif 177 #endif
172 }; 178 };
173 179
174 } // namespace blink 180 } // namespace blink
175 181
176 #endif 182 #endif
OLDNEW
« no previous file with comments | « trunk/Source/platform/graphics/media/MediaPlayer.h ('k') | trunk/Source/web/WebMediaPlayerClientImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698