| 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 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 203 enum VisibilityChangeAssumption { | 203 enum VisibilityChangeAssumption { |
| 204 AssumeNoVisibleChange, | 204 AssumeNoVisibleChange, |
| 205 AssumeVisibleChange | 205 AssumeVisibleChange |
| 206 }; | 206 }; |
| 207 void configureTextTrackDisplay(VisibilityChangeAssumption); | 207 void configureTextTrackDisplay(VisibilityChangeAssumption); |
| 208 void updateTextTrackDisplay(); | 208 void updateTextTrackDisplay(); |
| 209 double lastSeekTime() const { return m_lastSeekTime; } | 209 double lastSeekTime() const { return m_lastSeekTime; } |
| 210 void textTrackReadyStateChanged(TextTrack*); | 210 void textTrackReadyStateChanged(TextTrack*); |
| 211 | 211 |
| 212 void textTrackModeChanged(TextTrack*); | 212 void textTrackModeChanged(TextTrack*); |
| 213 void disableAutomaticTextTrackSelection(); |
| 213 | 214 |
| 214 // EventTarget function. | 215 // EventTarget function. |
| 215 // Both Node (via HTMLElement) and ActiveDOMObject define this method, which | 216 // Both Node (via HTMLElement) and ActiveDOMObject define this method, which |
| 216 // causes an ambiguity error at compile time. This class's constructor | 217 // causes an ambiguity error at compile time. This class's constructor |
| 217 // ensures that both implementations return document, so return the result | 218 // ensures that both implementations return document, so return the result |
| 218 // of one of them here. | 219 // of one of them here. |
| 219 using HTMLElement::executionContext; | 220 using HTMLElement::executionContext; |
| 220 | 221 |
| 221 bool hasSingleSecurityOrigin() const { return !m_player || (webMediaPlayer()
&& webMediaPlayer()->hasSingleSecurityOrigin()); } | 222 bool hasSingleSecurityOrigin() const { return !m_player || (webMediaPlayer()
&& webMediaPlayer()->hasSingleSecurityOrigin()); } |
| 222 | 223 |
| (...skipping 317 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 540 | 541 |
| 541 // time has not changed since sending an "ended" event | 542 // time has not changed since sending an "ended" event |
| 542 bool m_sentEndEvent : 1; | 543 bool m_sentEndEvent : 1; |
| 543 | 544 |
| 544 bool m_closedCaptionsVisible : 1; | 545 bool m_closedCaptionsVisible : 1; |
| 545 | 546 |
| 546 bool m_completelyLoaded : 1; | 547 bool m_completelyLoaded : 1; |
| 547 bool m_havePreparedToPlay : 1; | 548 bool m_havePreparedToPlay : 1; |
| 548 bool m_delayingLoadForPreloadNone : 1; | 549 bool m_delayingLoadForPreloadNone : 1; |
| 549 | 550 |
| 551 bool m_didPerformAutomaticTrackSelection : 1; |
| 550 bool m_tracksAreReady : 1; | 552 bool m_tracksAreReady : 1; |
| 551 bool m_haveVisibleTextTrack : 1; | 553 bool m_haveVisibleTextTrack : 1; |
| 552 bool m_processingPreferenceChange : 1; | 554 bool m_processingPreferenceChange : 1; |
| 553 bool m_remoteRoutesAvailable : 1; | 555 bool m_remoteRoutesAvailable : 1; |
| 554 bool m_playingRemotely : 1; | 556 bool m_playingRemotely : 1; |
| 555 #if ENABLE(OILPAN) | 557 #if ENABLE(OILPAN) |
| 556 bool m_isFinalizing : 1; | 558 bool m_isFinalizing : 1; |
| 557 bool m_closeMediaSourceWhenFinalizing : 1; | 559 bool m_closeMediaSourceWhenFinalizing : 1; |
| 558 #endif | 560 #endif |
| 559 bool m_initialPlayWithoutUserGestures : 1; | 561 bool m_initialPlayWithoutUserGestures : 1; |
| (...skipping 25 matching lines...) Expand all Loading... |
| 585 inline bool isHTMLMediaElement(const HTMLElement& element) | 587 inline bool isHTMLMediaElement(const HTMLElement& element) |
| 586 { | 588 { |
| 587 return isHTMLAudioElement(element) || isHTMLVideoElement(element); | 589 return isHTMLAudioElement(element) || isHTMLVideoElement(element); |
| 588 } | 590 } |
| 589 | 591 |
| 590 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement); | 592 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement); |
| 591 | 593 |
| 592 } // namespace blink | 594 } // namespace blink |
| 593 | 595 |
| 594 #endif // HTMLMediaElement_h | 596 #endif // HTMLMediaElement_h |
| OLD | NEW |