| 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 717 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 728 }; | 728 }; |
| 729 | 729 |
| 730 AudioSourceProviderImpl m_audioSourceProvider; | 730 AudioSourceProviderImpl m_audioSourceProvider; |
| 731 | 731 |
| 732 friend class AutoplayUmaHelper; // for isAutoplayAllowedPerSettings | 732 friend class AutoplayUmaHelper; // for isAutoplayAllowedPerSettings |
| 733 friend class AutoplayUmaHelperTest; | 733 friend class AutoplayUmaHelperTest; |
| 734 friend class Internals; | 734 friend class Internals; |
| 735 friend class TrackDisplayUpdateScope; | 735 friend class TrackDisplayUpdateScope; |
| 736 friend class MediaControlsTest; | 736 friend class MediaControlsTest; |
| 737 friend class HTMLMediaElementTest; | 737 friend class HTMLMediaElementTest; |
| 738 friend class HTMLMediaElementEventListenersTest; |
| 738 friend class HTMLVideoElementTest; | 739 friend class HTMLVideoElementTest; |
| 739 friend class MediaControlsOrientationLockDelegateTest; | 740 friend class MediaControlsOrientationLockDelegateTest; |
| 740 | 741 |
| 741 Member<AutoplayUmaHelper> m_autoplayUmaHelper; | 742 Member<AutoplayUmaHelper> m_autoplayUmaHelper; |
| 742 | 743 |
| 743 WebRemotePlaybackClient* m_remotePlaybackClient; | 744 WebRemotePlaybackClient* m_remotePlaybackClient; |
| 744 | 745 |
| 745 // class AutoplayVisibilityObserver; | 746 // class AutoplayVisibilityObserver; |
| 746 Member<ElementVisibilityObserver> m_autoplayVisibilityObserver; | 747 Member<ElementVisibilityObserver> m_autoplayVisibilityObserver; |
| 747 | 748 |
| 748 IntRect m_currentIntersectRect; | 749 IntRect m_currentIntersectRect; |
| 749 | 750 |
| 750 Member<MediaControls> m_mediaControls; | 751 Member<MediaControls> m_mediaControls; |
| 751 | 752 |
| 752 static URLRegistry* s_mediaStreamRegistry; | 753 static URLRegistry* s_mediaStreamRegistry; |
| 753 }; | 754 }; |
| 754 | 755 |
| 755 inline bool isHTMLMediaElement(const HTMLElement& element) { | 756 inline bool isHTMLMediaElement(const HTMLElement& element) { |
| 756 return isHTMLAudioElement(element) || isHTMLVideoElement(element); | 757 return isHTMLAudioElement(element) || isHTMLVideoElement(element); |
| 757 } | 758 } |
| 758 | 759 |
| 759 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement); | 760 DEFINE_HTMLELEMENT_TYPE_CASTS_WITH_FUNCTION(HTMLMediaElement); |
| 760 | 761 |
| 761 } // namespace blink | 762 } // namespace blink |
| 762 | 763 |
| 763 #endif // HTMLMediaElement_h | 764 #endif // HTMLMediaElement_h |
| OLD | NEW |