| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights | 2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights |
| 3 * reserved. | 3 * reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 345 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 356 InsertionNotificationRequest insertedInto(ContainerNode*) final; | 356 InsertionNotificationRequest insertedInto(ContainerNode*) final; |
| 357 void didNotifySubtreeInsertionsToDocument() override; | 357 void didNotifySubtreeInsertionsToDocument() override; |
| 358 void removedFrom(ContainerNode*) final; | 358 void removedFrom(ContainerNode*) final; |
| 359 void didRecalcStyle() final; | 359 void didRecalcStyle() final; |
| 360 | 360 |
| 361 bool canStartSelection() const override { return false; } | 361 bool canStartSelection() const override { return false; } |
| 362 | 362 |
| 363 bool isInteractiveContent() const final; | 363 bool isInteractiveContent() const final; |
| 364 | 364 |
| 365 // SuspendableObject functions. | 365 // SuspendableObject functions. |
| 366 void contextDestroyed(ExecutionContext*) final; | 366 void contextDestroyed(ExecutionContext*) override; |
| 367 | 367 |
| 368 virtual void updateDisplayState() {} | 368 virtual void updateDisplayState() {} |
| 369 | 369 |
| 370 void setReadyState(ReadyState); | 370 void setReadyState(ReadyState); |
| 371 void setNetworkState(WebMediaPlayer::NetworkState); | 371 void setNetworkState(WebMediaPlayer::NetworkState); |
| 372 | 372 |
| 373 // WebMediaPlayerClient implementation. | 373 // WebMediaPlayerClient implementation. |
| 374 void networkStateChanged() final; | 374 void networkStateChanged() final; |
| 375 void readyStateChanged() final; | 375 void readyStateChanged() final; |
| 376 void timeChanged() final; | 376 void timeChanged() final; |
| (...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 733 | 733 |
| 734 AudioSourceProviderImpl m_audioSourceProvider; | 734 AudioSourceProviderImpl m_audioSourceProvider; |
| 735 | 735 |
| 736 friend class AutoplayUmaHelper; // for isAutoplayAllowedPerSettings | 736 friend class AutoplayUmaHelper; // for isAutoplayAllowedPerSettings |
| 737 friend class AutoplayUmaHelperTest; | 737 friend class AutoplayUmaHelperTest; |
| 738 friend class Internals; | 738 friend class Internals; |
| 739 friend class TrackDisplayUpdateScope; | 739 friend class TrackDisplayUpdateScope; |
| 740 friend class MediaControlsTest; | 740 friend class MediaControlsTest; |
| 741 friend class HTMLMediaElementTest; | 741 friend class HTMLMediaElementTest; |
| 742 friend class HTMLMediaElementEventListenersTest; | 742 friend class HTMLMediaElementEventListenersTest; |
| 743 friend class HTMLVideoElement; |
| 743 friend class HTMLVideoElementTest; | 744 friend class HTMLVideoElementTest; |
| 744 friend class MediaControlsOrientationLockDelegateTest; | 745 friend class MediaControlsOrientationLockDelegateTest; |
| 745 | 746 |
| 746 Member<AutoplayUmaHelper> m_autoplayUmaHelper; | 747 Member<AutoplayUmaHelper> m_autoplayUmaHelper; |
| 747 | 748 |
| 748 WebRemotePlaybackClient* m_remotePlaybackClient; | 749 WebRemotePlaybackClient* m_remotePlaybackClient; |
| 749 | 750 |
| 750 // class AutoplayVisibilityObserver; | 751 // class AutoplayVisibilityObserver; |
| 751 Member<ElementVisibilityObserver> m_autoplayVisibilityObserver; | 752 Member<ElementVisibilityObserver> m_autoplayVisibilityObserver; |
| 752 | 753 |
| 753 IntRect m_currentIntersectRect; | 754 IntRect m_currentIntersectRect; |
| 754 | 755 |
| 755 Member<MediaControls> m_mediaControls; | 756 Member<MediaControls> m_mediaControls; |
| 756 Member<HTMLMediaElementControlsList> m_controlsList; | 757 Member<HTMLMediaElementControlsList> m_controlsList; |
| 757 | 758 |
| 758 static URLRegistry* s_mediaStreamRegistry; | 759 static URLRegistry* s_mediaStreamRegistry; |
| 759 }; | 760 }; |
| 760 | 761 |
| 761 inline bool isHTMLMediaElement(const HTMLElement& element) { | 762 inline bool isHTMLMediaElement(const HTMLElement& element) { |
| 762 return isHTMLAudioElement(element) || isHTMLVideoElement(element); | 763 return isHTMLAudioElement(element) || isHTMLVideoElement(element); |
| 763 } | 764 } |
| 764 | 765 |
| 765 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement); | 766 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement); |
| 766 | 767 |
| 767 } // namespace blink | 768 } // namespace blink |
| 768 | 769 |
| 769 #endif // HTMLMediaElement_h | 770 #endif // HTMLMediaElement_h |
| OLD | NEW |