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

Side by Side Diff: Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp

Issue 13454026: Update all float attributes in HTMLMediaElement and related objects to double (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Removed GTK change since the file is gone now. Created 7 years, 8 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 "WebMediaPlayerClientImpl.h" 6 #include "WebMediaPlayerClientImpl.h"
7 7
8 #if ENABLE(VIDEO) 8 #if ENABLE(VIDEO)
9 9
10 #include "AudioBus.h" 10 #include "AudioBus.h"
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 ASSERT(m_mediaPlayer); 109 ASSERT(m_mediaPlayer);
110 m_mediaPlayer->networkStateChanged(); 110 m_mediaPlayer->networkStateChanged();
111 } 111 }
112 112
113 void WebMediaPlayerClientImpl::readyStateChanged() 113 void WebMediaPlayerClientImpl::readyStateChanged()
114 { 114 {
115 ASSERT(m_mediaPlayer); 115 ASSERT(m_mediaPlayer);
116 m_mediaPlayer->readyStateChanged(); 116 m_mediaPlayer->readyStateChanged();
117 } 117 }
118 118
119 void WebMediaPlayerClientImpl::volumeChanged(float newVolume) 119 void WebMediaPlayerClientImpl::volumeChanged(double newVolume)
120 { 120 {
121 ASSERT(m_mediaPlayer); 121 ASSERT(m_mediaPlayer);
122 m_mediaPlayer->volumeChanged(newVolume); 122 m_mediaPlayer->volumeChanged(newVolume);
123 } 123 }
124 124
125 void WebMediaPlayerClientImpl::muteChanged(bool newMute) 125 void WebMediaPlayerClientImpl::muteChanged(bool newMute)
126 { 126 {
127 ASSERT(m_mediaPlayer); 127 ASSERT(m_mediaPlayer);
128 m_mediaPlayer->muteChanged(newMute); 128 m_mediaPlayer->muteChanged(newMute);
129 } 129 }
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 m_videoLayer->setOpaque(m_opaque); 168 m_videoLayer->setOpaque(m_opaque);
169 #endif 169 #endif
170 } 170 }
171 171
172 void WebMediaPlayerClientImpl::sawUnsupportedTracks() 172 void WebMediaPlayerClientImpl::sawUnsupportedTracks()
173 { 173 {
174 ASSERT(m_mediaPlayer); 174 ASSERT(m_mediaPlayer);
175 m_mediaPlayer->mediaPlayerClient()->mediaPlayerSawUnsupportedTracks(m_mediaP layer); 175 m_mediaPlayer->mediaPlayerClient()->mediaPlayerSawUnsupportedTracks(m_mediaP layer);
176 } 176 }
177 177
178 float WebMediaPlayerClientImpl::volume() const 178 double WebMediaPlayerClientImpl::volume() const
179 { 179 {
180 if (m_mediaPlayer) 180 if (m_mediaPlayer)
181 return m_mediaPlayer->volume(); 181 return m_mediaPlayer->volume();
182 return 0.0f; 182 return 0.0;
183 } 183 }
184 184
185 void WebMediaPlayerClientImpl::playbackStateChanged() 185 void WebMediaPlayerClientImpl::playbackStateChanged()
186 { 186 {
187 ASSERT(m_mediaPlayer); 187 ASSERT(m_mediaPlayer);
188 m_mediaPlayer->playbackStateChanged(); 188 m_mediaPlayer->playbackStateChanged();
189 } 189 }
190 190
191 WebMediaPlayer::Preload WebMediaPlayerClientImpl::preload() const 191 WebMediaPlayer::Preload WebMediaPlayerClientImpl::preload() const
192 { 192 {
(...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after
463 return m_webMediaPlayer->hasAudio(); 463 return m_webMediaPlayer->hasAudio();
464 return false; 464 return false;
465 } 465 }
466 466
467 void WebMediaPlayerClientImpl::setVisible(bool visible) 467 void WebMediaPlayerClientImpl::setVisible(bool visible)
468 { 468 {
469 if (m_webMediaPlayer) 469 if (m_webMediaPlayer)
470 m_webMediaPlayer->setVisible(visible); 470 m_webMediaPlayer->setVisible(visible);
471 } 471 }
472 472
473 float WebMediaPlayerClientImpl::duration() const 473 double WebMediaPlayerClientImpl::duration() const
474 { 474 {
475 if (m_webMediaPlayer) 475 if (m_webMediaPlayer)
476 return m_webMediaPlayer->duration(); 476 return m_webMediaPlayer->durationFloat();
477 return 0.0f; 477 return 0.0f;
478 } 478 }
479 479
480 float WebMediaPlayerClientImpl::currentTime() const 480 double WebMediaPlayerClientImpl::currentTime() const
481 { 481 {
482 if (m_webMediaPlayer) 482 if (m_webMediaPlayer)
483 return m_webMediaPlayer->currentTime(); 483 return m_webMediaPlayer->currentTimeFloat();
484 return 0.0f; 484 return 0.0f;
485 } 485 }
486 486
487 void WebMediaPlayerClientImpl::seek(float time) 487 void WebMediaPlayerClientImpl::seek(double time)
488 { 488 {
489 if (m_webMediaPlayer) 489 if (m_webMediaPlayer)
490 m_webMediaPlayer->seek(time); 490 m_webMediaPlayer->seekFloat(time);
491 } 491 }
492 492
493 bool WebMediaPlayerClientImpl::seeking() const 493 bool WebMediaPlayerClientImpl::seeking() const
494 { 494 {
495 if (m_webMediaPlayer) 495 if (m_webMediaPlayer)
496 return m_webMediaPlayer->seeking(); 496 return m_webMediaPlayer->seeking();
497 return false; 497 return false;
498 } 498 }
499 499
500 void WebMediaPlayerClientImpl::setEndTime(float time) 500 void WebMediaPlayerClientImpl::setEndTime(double time)
501 { 501 {
502 if (m_webMediaPlayer) 502 if (m_webMediaPlayer)
503 m_webMediaPlayer->setEndTime(time); 503 m_webMediaPlayer->setEndTimeFloat(time);
504 } 504 }
505 505
506 void WebMediaPlayerClientImpl::setRate(float rate) 506 void WebMediaPlayerClientImpl::setRate(double rate)
507 { 507 {
508 if (m_webMediaPlayer) 508 if (m_webMediaPlayer)
509 m_webMediaPlayer->setRate(rate); 509 m_webMediaPlayer->setRateFloat(rate);
510 } 510 }
511 511
512 bool WebMediaPlayerClientImpl::paused() const 512 bool WebMediaPlayerClientImpl::paused() const
513 { 513 {
514 if (m_webMediaPlayer) 514 if (m_webMediaPlayer)
515 return m_webMediaPlayer->paused(); 515 return m_webMediaPlayer->paused();
516 return false; 516 return false;
517 } 517 }
518 518
519 bool WebMediaPlayerClientImpl::supportsFullscreen() const 519 bool WebMediaPlayerClientImpl::supportsFullscreen() const
520 { 520 {
521 if (m_webMediaPlayer) 521 if (m_webMediaPlayer)
522 return m_webMediaPlayer->supportsFullscreen(); 522 return m_webMediaPlayer->supportsFullscreen();
523 return false; 523 return false;
524 } 524 }
525 525
526 bool WebMediaPlayerClientImpl::supportsSave() const 526 bool WebMediaPlayerClientImpl::supportsSave() const
527 { 527 {
528 if (m_webMediaPlayer) 528 if (m_webMediaPlayer)
529 return m_webMediaPlayer->supportsSave(); 529 return m_webMediaPlayer->supportsSave();
530 return false; 530 return false;
531 } 531 }
532 532
533 void WebMediaPlayerClientImpl::setVolume(float volume) 533 void WebMediaPlayerClientImpl::setVolume(double volume)
534 { 534 {
535 if (m_webMediaPlayer) 535 if (m_webMediaPlayer)
536 m_webMediaPlayer->setVolume(volume); 536 m_webMediaPlayer->setVolumeFloat(volume);
537 } 537 }
538 538
539 MediaPlayer::NetworkState WebMediaPlayerClientImpl::networkState() const 539 MediaPlayer::NetworkState WebMediaPlayerClientImpl::networkState() const
540 { 540 {
541 if (m_webMediaPlayer) 541 if (m_webMediaPlayer)
542 return static_cast<MediaPlayer::NetworkState>(m_webMediaPlayer->networkS tate()); 542 return static_cast<MediaPlayer::NetworkState>(m_webMediaPlayer->networkS tate());
543 return MediaPlayer::Empty; 543 return MediaPlayer::Empty;
544 } 544 }
545 545
546 MediaPlayer::ReadyState WebMediaPlayerClientImpl::readyState() const 546 MediaPlayer::ReadyState WebMediaPlayerClientImpl::readyState() const
547 { 547 {
548 if (m_webMediaPlayer) 548 if (m_webMediaPlayer)
549 return static_cast<MediaPlayer::ReadyState>(m_webMediaPlayer->readyState ()); 549 return static_cast<MediaPlayer::ReadyState>(m_webMediaPlayer->readyState ());
550 return MediaPlayer::HaveNothing; 550 return MediaPlayer::HaveNothing;
551 } 551 }
552 552
553 float WebMediaPlayerClientImpl::maxTimeSeekable() const 553 double WebMediaPlayerClientImpl::maxTimeSeekable() const
554 { 554 {
555 if (m_webMediaPlayer) 555 if (m_webMediaPlayer)
556 return m_webMediaPlayer->maxTimeSeekable(); 556 return m_webMediaPlayer->maxTimeSeekableFloat();
557 return 0.0f; 557 return 0.0;
558 } 558 }
559 559
560 PassRefPtr<TimeRanges> WebMediaPlayerClientImpl::buffered() const 560 PassRefPtr<TimeRanges> WebMediaPlayerClientImpl::buffered() const
561 { 561 {
562 if (m_webMediaPlayer) { 562 if (m_webMediaPlayer) {
563 const WebTimeRanges& webRanges = m_webMediaPlayer->buffered(); 563 const WebTimeRanges& webRanges = m_webMediaPlayer->buffered();
564 564
565 // FIXME: Save the time ranges in a member variable and update it when n eeded. 565 // FIXME: Save the time ranges in a member variable and update it when n eeded.
566 RefPtr<TimeRanges> ranges = TimeRanges::create(); 566 RefPtr<TimeRanges> ranges = TimeRanges::create();
567 for (size_t i = 0; i < webRanges.size(); ++i) 567 for (size_t i = 0; i < webRanges.size(); ++i)
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
661 } 661 }
662 662
663 MediaPlayer::MovieLoadType WebMediaPlayerClientImpl::movieLoadType() const 663 MediaPlayer::MovieLoadType WebMediaPlayerClientImpl::movieLoadType() const
664 { 664 {
665 if (m_webMediaPlayer) 665 if (m_webMediaPlayer)
666 return static_cast<MediaPlayer::MovieLoadType>( 666 return static_cast<MediaPlayer::MovieLoadType>(
667 m_webMediaPlayer->movieLoadType()); 667 m_webMediaPlayer->movieLoadType());
668 return MediaPlayer::Unknown; 668 return MediaPlayer::Unknown;
669 } 669 }
670 670
671 float WebMediaPlayerClientImpl::mediaTimeForTimeValue(float timeValue) const 671 double WebMediaPlayerClientImpl::mediaTimeForTimeValue(double timeValue) const
672 { 672 {
673 if (m_webMediaPlayer) 673 if (m_webMediaPlayer)
674 return m_webMediaPlayer->mediaTimeForTimeValue(timeValue); 674 return m_webMediaPlayer->mediaTimeForTimeValueFloat(timeValue);
675 return timeValue; 675 return timeValue;
676 } 676 }
677 677
678 unsigned WebMediaPlayerClientImpl::decodedFrameCount() const 678 unsigned WebMediaPlayerClientImpl::decodedFrameCount() const
679 { 679 {
680 if (m_webMediaPlayer) 680 if (m_webMediaPlayer)
681 return m_webMediaPlayer->decodedFrameCount(); 681 return m_webMediaPlayer->decodedFrameCount();
682 return 0; 682 return 0;
683 } 683 }
684 684
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
829 { 829 {
830 if (m_client) 830 if (m_client)
831 m_client->setFormat(numberOfChannels, sampleRate); 831 m_client->setFormat(numberOfChannels, sampleRate);
832 } 832 }
833 833
834 #endif 834 #endif
835 835
836 } // namespace WebKit 836 } // namespace WebKit
837 837
838 #endif // ENABLE(VIDEO) 838 #endif // ENABLE(VIDEO)
OLDNEW
« Source/WebCore/platform/Clock.h ('K') | « Source/WebKit/chromium/src/WebMediaPlayerClientImpl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698