Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. | 2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple 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 | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 101 | 101 |
| 102 enum DelayedActionType { | 102 enum DelayedActionType { |
| 103 LoadMediaResource = 1 << 0, | 103 LoadMediaResource = 1 << 0, |
| 104 LoadTextTrackResource = 1 << 1, | 104 LoadTextTrackResource = 1 << 1, |
| 105 TextTrackChangesNotification = 1 << 2 | 105 TextTrackChangesNotification = 1 << 2 |
| 106 }; | 106 }; |
| 107 void scheduleDelayedAction(DelayedActionType); | 107 void scheduleDelayedAction(DelayedActionType); |
| 108 | 108 |
| 109 bool isActive() const { return m_active; } | 109 bool isActive() const { return m_active; } |
| 110 | 110 |
| 111 bool hasRemoteRoutes() const { return m_remoteRoutesAvailable; } | |
| 112 bool isCasting() const { return m_casting; } | |
|
acolwell GONE FROM CHROMIUM
2014/08/05 19:36:34
nit: s/Casting/PlayingRemotely/ since all your oth
aberent
2014/08/22 14:08:34
Done.
| |
| 113 | |
| 111 // error state | 114 // error state |
| 112 PassRefPtrWillBeRawPtr<MediaError> error() const; | 115 PassRefPtrWillBeRawPtr<MediaError> error() const; |
| 113 | 116 |
| 114 // network state | 117 // network state |
| 115 void setSrc(const AtomicString&); | 118 void setSrc(const AtomicString&); |
| 116 const KURL& currentSrc() const { return m_currentSrc; } | 119 const KURL& currentSrc() const { return m_currentSrc; } |
| 117 | 120 |
| 118 enum NetworkState { NETWORK_EMPTY, NETWORK_IDLE, NETWORK_LOADING, NETWORK_NO _SOURCE }; | 121 enum NetworkState { NETWORK_EMPTY, NETWORK_IDLE, NETWORK_LOADING, NETWORK_NO _SOURCE }; |
| 119 NetworkState networkState() const; | 122 NetworkState networkState() const; |
| 120 | 123 |
| (...skipping 20 matching lines...) Expand all Loading... | |
| 141 void setPlaybackRate(double); | 144 void setPlaybackRate(double); |
| 142 void updatePlaybackRate(); | 145 void updatePlaybackRate(); |
| 143 PassRefPtrWillBeRawPtr<TimeRanges> played(); | 146 PassRefPtrWillBeRawPtr<TimeRanges> played(); |
| 144 PassRefPtrWillBeRawPtr<TimeRanges> seekable() const; | 147 PassRefPtrWillBeRawPtr<TimeRanges> seekable() const; |
| 145 bool ended() const; | 148 bool ended() const; |
| 146 bool autoplay() const; | 149 bool autoplay() const; |
| 147 bool loop() const; | 150 bool loop() const; |
| 148 void setLoop(bool b); | 151 void setLoop(bool b); |
| 149 void play(); | 152 void play(); |
| 150 void pause(); | 153 void pause(); |
| 154 void requestRemotePlayback(); | |
| 155 void requestRemotePlaybackControl(); | |
| 151 | 156 |
| 152 // statistics | 157 // statistics |
| 153 unsigned webkitAudioDecodedByteCount() const; | 158 unsigned webkitAudioDecodedByteCount() const; |
| 154 unsigned webkitVideoDecodedByteCount() const; | 159 unsigned webkitVideoDecodedByteCount() const; |
| 155 | 160 |
| 156 // media source extensions | 161 // media source extensions |
| 157 void closeMediaSource(); | 162 void closeMediaSource(); |
| 158 void durationChanged(double duration, bool requestSeek); | 163 void durationChanged(double duration, bool requestSeek); |
| 159 | 164 |
| 160 // controls | 165 // controls |
| (...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 352 void setReadyState(ReadyState); | 357 void setReadyState(ReadyState); |
| 353 void setNetworkState(blink::WebMediaPlayer::NetworkState); | 358 void setNetworkState(blink::WebMediaPlayer::NetworkState); |
| 354 | 359 |
| 355 virtual void mediaPlayerNetworkStateChanged() OVERRIDE FINAL; | 360 virtual void mediaPlayerNetworkStateChanged() OVERRIDE FINAL; |
| 356 virtual void mediaPlayerReadyStateChanged() OVERRIDE FINAL; | 361 virtual void mediaPlayerReadyStateChanged() OVERRIDE FINAL; |
| 357 virtual void mediaPlayerTimeChanged() OVERRIDE FINAL; | 362 virtual void mediaPlayerTimeChanged() OVERRIDE FINAL; |
| 358 virtual void mediaPlayerDurationChanged() OVERRIDE FINAL; | 363 virtual void mediaPlayerDurationChanged() OVERRIDE FINAL; |
| 359 virtual void mediaPlayerPlaybackStateChanged() OVERRIDE FINAL; | 364 virtual void mediaPlayerPlaybackStateChanged() OVERRIDE FINAL; |
| 360 virtual void mediaPlayerRequestFullscreen() OVERRIDE FINAL; | 365 virtual void mediaPlayerRequestFullscreen() OVERRIDE FINAL; |
| 361 virtual void mediaPlayerRequestSeek(double) OVERRIDE FINAL; | 366 virtual void mediaPlayerRequestSeek(double) OVERRIDE FINAL; |
| 367 virtual void mediaPlayerRemoteRouteAvailabilityChanged(bool) OVERRIDE FINAL; | |
| 368 virtual void mediaPlayerConnectedToRemoteDevice() OVERRIDE FINAL; | |
| 369 virtual void mediaPlayerDisconnectedFromRemoteDevice() OVERRIDE FINAL; | |
| 362 virtual void mediaPlayerRepaint() OVERRIDE FINAL; | 370 virtual void mediaPlayerRepaint() OVERRIDE FINAL; |
| 363 virtual void mediaPlayerSizeChanged() OVERRIDE FINAL; | 371 virtual void mediaPlayerSizeChanged() OVERRIDE FINAL; |
| 364 virtual void mediaPlayerSetWebLayer(blink::WebLayer*) OVERRIDE FINAL; | 372 virtual void mediaPlayerSetWebLayer(blink::WebLayer*) OVERRIDE FINAL; |
| 365 virtual void mediaPlayerMediaSourceOpened(blink::WebMediaSource*) OVERRIDE F INAL; | 373 virtual void mediaPlayerMediaSourceOpened(blink::WebMediaSource*) OVERRIDE F INAL; |
| 366 | 374 |
| 367 void loadTimerFired(Timer<HTMLMediaElement>*); | 375 void loadTimerFired(Timer<HTMLMediaElement>*); |
| 368 void progressEventTimerFired(Timer<HTMLMediaElement>*); | 376 void progressEventTimerFired(Timer<HTMLMediaElement>*); |
| 369 void playbackProgressTimerFired(Timer<HTMLMediaElement>*); | 377 void playbackProgressTimerFired(Timer<HTMLMediaElement>*); |
| 370 void startPlaybackProgressTimer(); | 378 void startPlaybackProgressTimer(); |
| 371 void startProgressEventTimer(); | 379 void startProgressEventTimer(); |
| (...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 566 | 574 |
| 567 bool m_closedCaptionsVisible : 1; | 575 bool m_closedCaptionsVisible : 1; |
| 568 | 576 |
| 569 bool m_completelyLoaded : 1; | 577 bool m_completelyLoaded : 1; |
| 570 bool m_havePreparedToPlay : 1; | 578 bool m_havePreparedToPlay : 1; |
| 571 bool m_delayingLoadForPreloadNone : 1; | 579 bool m_delayingLoadForPreloadNone : 1; |
| 572 | 580 |
| 573 bool m_tracksAreReady : 1; | 581 bool m_tracksAreReady : 1; |
| 574 bool m_haveVisibleTextTrack : 1; | 582 bool m_haveVisibleTextTrack : 1; |
| 575 bool m_processingPreferenceChange : 1; | 583 bool m_processingPreferenceChange : 1; |
| 584 bool m_remoteRoutesAvailable : 1; | |
| 585 bool m_casting : 1; | |
|
acolwell GONE FROM CHROMIUM
2014/08/05 19:36:34
ditto
aberent
2014/08/22 14:08:34
Done.
| |
| 576 #if ENABLE(OILPAN) | 586 #if ENABLE(OILPAN) |
| 577 bool m_isFinalizing : 1; | 587 bool m_isFinalizing : 1; |
| 578 bool m_closeMediaSourceWhenFinalizing : 1; | 588 bool m_closeMediaSourceWhenFinalizing : 1; |
| 579 #endif | 589 #endif |
| 580 double m_lastTextTrackUpdateTime; | 590 double m_lastTextTrackUpdateTime; |
| 581 | 591 |
| 582 RefPtrWillBeMember<AudioTrackList> m_audioTracks; | 592 RefPtrWillBeMember<AudioTrackList> m_audioTracks; |
| 583 RefPtrWillBeMember<VideoTrackList> m_videoTracks; | 593 RefPtrWillBeMember<VideoTrackList> m_videoTracks; |
| 584 RefPtrWillBeMember<TextTrackList> m_textTracks; | 594 RefPtrWillBeMember<TextTrackList> m_textTracks; |
| 585 WillBeHeapVector<RefPtrWillBeMember<TextTrack> > m_textTracksWhenResourceSel ectionBegan; | 595 WillBeHeapVector<RefPtrWillBeMember<TextTrack> > m_textTracksWhenResourceSel ectionBegan; |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 626 inline bool isHTMLMediaElement(const HTMLElement& element) | 636 inline bool isHTMLMediaElement(const HTMLElement& element) |
| 627 { | 637 { |
| 628 return isHTMLAudioElement(element) || isHTMLVideoElement(element); | 638 return isHTMLAudioElement(element) || isHTMLVideoElement(element); |
| 629 } | 639 } |
| 630 | 640 |
| 631 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement); | 641 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement); |
| 632 | 642 |
| 633 } //namespace | 643 } //namespace |
| 634 | 644 |
| 635 #endif | 645 #endif |
| OLD | NEW |