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

Side by Side Diff: Source/web/WebMediaPlayerClientImpl.cpp

Issue 298093004: Eliminate MediaPlayer & MediaPlayerClient abstractions(play/pause, other APIs) (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 7 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
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 #include "web/WebMediaPlayerClientImpl.h" 6 #include "web/WebMediaPlayerClientImpl.h"
7 7
8 #include "core/frame/LocalFrame.h" 8 #include "core/frame/LocalFrame.h"
9 #include "core/html/HTMLMediaElement.h" 9 #include "core/html/HTMLMediaElement.h"
10 #include "core/html/TimeRanges.h" 10 #include "core/html/TimeRanges.h"
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 198
199 #if OS(ANDROID) 199 #if OS(ANDROID)
200 m_usePaintOnAndroid = (loadType != WebMediaPlayer::LoadTypeMediaStream); 200 m_usePaintOnAndroid = (loadType != WebMediaPlayer::LoadTypeMediaStream);
201 #endif 201 #endif
202 202
203 // Tell WebMediaPlayer about any connected CDM (may be null). 203 // Tell WebMediaPlayer about any connected CDM (may be null).
204 m_webMediaPlayer->setContentDecryptionModule(HTMLMediaElementEncryptedMedia: :contentDecryptionModule(mediaElement())); 204 m_webMediaPlayer->setContentDecryptionModule(HTMLMediaElementEncryptedMedia: :contentDecryptionModule(mediaElement()));
205 m_webMediaPlayer->load(loadType, kurl, corsMode); 205 m_webMediaPlayer->load(loadType, kurl, corsMode);
206 } 206 }
207 207
208 void WebMediaPlayerClientImpl::play()
209 {
210 if (m_webMediaPlayer)
211 m_webMediaPlayer->play();
212 }
213
214 void WebMediaPlayerClientImpl::pause()
215 {
216 if (m_webMediaPlayer)
217 m_webMediaPlayer->pause();
218 }
219
220 void WebMediaPlayerClientImpl::showFullscreenOverlay() 208 void WebMediaPlayerClientImpl::showFullscreenOverlay()
221 { 209 {
222 if (m_webMediaPlayer) 210 if (m_webMediaPlayer)
223 m_webMediaPlayer->enterFullscreen(); 211 m_webMediaPlayer->enterFullscreen();
224 } 212 }
225 213
226 void WebMediaPlayerClientImpl::hideFullscreenOverlay() 214 void WebMediaPlayerClientImpl::hideFullscreenOverlay()
227 { 215 {
228 if (m_webMediaPlayer) 216 if (m_webMediaPlayer)
229 m_webMediaPlayer->exitFullscreen(); 217 m_webMediaPlayer->exitFullscreen();
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 return m_rate; 254 return m_rate;
267 } 255 }
268 256
269 void WebMediaPlayerClientImpl::setRate(double rate) 257 void WebMediaPlayerClientImpl::setRate(double rate)
270 { 258 {
271 m_rate = rate; 259 m_rate = rate;
272 if (m_webMediaPlayer) 260 if (m_webMediaPlayer)
273 m_webMediaPlayer->setRate(rate); 261 m_webMediaPlayer->setRate(rate);
274 } 262 }
275 263
276 bool WebMediaPlayerClientImpl::paused() const
277 {
278 if (m_webMediaPlayer)
279 return m_webMediaPlayer->paused();
280 return false;
281 }
282
283 bool WebMediaPlayerClientImpl::supportsSave() const
284 {
285 if (m_webMediaPlayer)
286 return m_webMediaPlayer->supportsSave();
287 return false;
288 }
289
290 void WebMediaPlayerClientImpl::setPoster(const KURL& poster) 264 void WebMediaPlayerClientImpl::setPoster(const KURL& poster)
291 { 265 {
292 if (m_webMediaPlayer) 266 if (m_webMediaPlayer)
293 m_webMediaPlayer->setPoster(WebURL(poster)); 267 m_webMediaPlayer->setPoster(WebURL(poster));
294 } 268 }
295 269
296 MediaPlayer::NetworkState WebMediaPlayerClientImpl::networkState() const 270 MediaPlayer::NetworkState WebMediaPlayerClientImpl::networkState() const
297 { 271 {
298 if (m_webMediaPlayer) 272 if (m_webMediaPlayer)
299 return static_cast<MediaPlayer::NetworkState>(m_webMediaPlayer->networkS tate()); 273 return static_cast<MediaPlayer::NetworkState>(m_webMediaPlayer->networkS tate());
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
356 } 330 }
357 331
358 void WebMediaPlayerClientImpl::setPreload(MediaPlayer::Preload preload) 332 void WebMediaPlayerClientImpl::setPreload(MediaPlayer::Preload preload)
359 { 333 {
360 m_preload = preload; 334 m_preload = preload;
361 335
362 if (m_webMediaPlayer) 336 if (m_webMediaPlayer)
363 m_webMediaPlayer->setPreload(static_cast<WebMediaPlayer::Preload>(preloa d)); 337 m_webMediaPlayer->setPreload(static_cast<WebMediaPlayer::Preload>(preloa d));
364 } 338 }
365 339
366 bool WebMediaPlayerClientImpl::hasSingleSecurityOrigin() const
367 {
368 if (m_webMediaPlayer)
369 return m_webMediaPlayer->hasSingleSecurityOrigin();
370 return false;
371 }
372
373 double WebMediaPlayerClientImpl::mediaTimeForTimeValue(double timeValue) const
374 {
375 if (m_webMediaPlayer)
376 return m_webMediaPlayer->mediaTimeForTimeValue(timeValue);
377 return timeValue;
378 }
379
380 #if ENABLE(WEB_AUDIO) 340 #if ENABLE(WEB_AUDIO)
381 AudioSourceProvider* WebMediaPlayerClientImpl::audioSourceProvider() 341 AudioSourceProvider* WebMediaPlayerClientImpl::audioSourceProvider()
382 { 342 {
383 return &m_audioSourceProvider; 343 return &m_audioSourceProvider;
384 } 344 }
385 #endif 345 #endif
386 346
387 PassOwnPtr<MediaPlayer> WebMediaPlayerClientImpl::create(MediaPlayerClient* clie nt) 347 PassOwnPtr<MediaPlayer> WebMediaPlayerClientImpl::create(MediaPlayerClient* clie nt)
388 { 348 {
389 return adoptPtr(new WebMediaPlayerClientImpl(client)); 349 return adoptPtr(new WebMediaPlayerClientImpl(client));
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
491 451
492 void WebMediaPlayerClientImpl::AudioClientImpl::setFormat(size_t numberOfChannel s, float sampleRate) 452 void WebMediaPlayerClientImpl::AudioClientImpl::setFormat(size_t numberOfChannel s, float sampleRate)
493 { 453 {
494 if (m_client) 454 if (m_client)
495 m_client->setFormat(numberOfChannels, sampleRate); 455 m_client->setFormat(numberOfChannels, sampleRate);
496 } 456 }
497 457
498 #endif 458 #endif
499 459
500 } // namespace blink 460 } // namespace blink
OLDNEW
« Source/core/html/HTMLMediaElement.cpp ('K') | « Source/web/WebMediaPlayerClientImpl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698