OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 2011, 2012 Apple Inc. All rights reserved. | 2 * Copyright (C) 2011, 2012 Apple Inc. All rights reserved. |
3 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. | 3 * Copyright (C) 2011, 2012 Google Inc. All rights 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 11 matching lines...) Expand all Loading... | |
22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
25 */ | 25 */ |
26 | 26 |
27 #include "core/html/shadow/MediaControls.h" | 27 #include "core/html/shadow/MediaControls.h" |
28 | 28 |
29 #include "bindings/core/v8/ExceptionState.h" | 29 #include "bindings/core/v8/ExceptionState.h" |
30 #include "core/dom/ClientRect.h" | 30 #include "core/dom/ClientRect.h" |
31 #include "core/dom/Fullscreen.h" | 31 #include "core/dom/Fullscreen.h" |
32 #include "core/dom/ResizeObserver.h" | |
33 #include "core/dom/ResizeObserverCallback.h" | |
34 #include "core/dom/ResizeObserverEntry.h" | |
32 #include "core/dom/TaskRunnerHelper.h" | 35 #include "core/dom/TaskRunnerHelper.h" |
33 #include "core/events/MouseEvent.h" | 36 #include "core/events/MouseEvent.h" |
34 #include "core/frame/Settings.h" | 37 #include "core/frame/Settings.h" |
35 #include "core/html/HTMLMediaElement.h" | 38 #include "core/html/HTMLMediaElement.h" |
36 #include "core/html/HTMLVideoElement.h" | 39 #include "core/html/HTMLVideoElement.h" |
37 #include "core/html/shadow/MediaControlsMediaEventListener.h" | 40 #include "core/html/shadow/MediaControlsMediaEventListener.h" |
38 #include "core/html/shadow/MediaControlsOrientationLockDelegate.h" | 41 #include "core/html/shadow/MediaControlsOrientationLockDelegate.h" |
39 #include "core/html/shadow/MediaControlsWindowEventListener.h" | 42 #include "core/html/shadow/MediaControlsWindowEventListener.h" |
40 #include "core/html/track/TextTrackContainer.h" | 43 #include "core/html/track/TextTrackContainer.h" |
41 #include "core/html/track/TextTrackList.h" | 44 #include "core/html/track/TextTrackList.h" |
42 #include "core/layout/LayoutObject.h" | 45 #include "core/layout/LayoutObject.h" |
43 #include "core/layout/LayoutTheme.h" | 46 #include "core/layout/LayoutTheme.h" |
44 #include "platform/EventDispatchForbiddenScope.h" | 47 #include "platform/EventDispatchForbiddenScope.h" |
45 | 48 |
46 namespace blink { | 49 namespace blink { |
47 | 50 |
51 namespace { | |
52 | |
53 constexpr int kOverlayPlayButtonWidth = 48; | |
54 constexpr int kOverlayPlayButtonHeight = 48; | |
55 constexpr int kOverlayBottomMargin = 10; | |
56 constexpr int kAndroidMediaPanelHeight = 48; | |
57 | |
58 constexpr int kMinWidthForOverlayPlayButton = kOverlayPlayButtonWidth; | |
59 constexpr int kMinHeightForOverlayPlayButton = kOverlayPlayButtonHeight + | |
60 (2 * kAndroidMediaPanelHeight) + | |
61 (2 * kOverlayBottomMargin); | |
62 | |
63 } // anonymous namespace | |
64 | |
48 // If you change this value, then also update the corresponding value in | 65 // If you change this value, then also update the corresponding value in |
49 // LayoutTests/media/media-controls.js. | 66 // LayoutTests/media/media-controls.js. |
50 static const double timeWithoutMouseMovementBeforeHidingMediaControls = 3; | 67 static const double timeWithoutMouseMovementBeforeHidingMediaControls = 3; |
51 | 68 |
52 static bool shouldShowFullscreenButton(const HTMLMediaElement& mediaElement) { | 69 static bool shouldShowFullscreenButton(const HTMLMediaElement& mediaElement) { |
53 // Unconditionally allow the user to exit fullscreen if we are in it | 70 // Unconditionally allow the user to exit fullscreen if we are in it |
54 // now. Especially on android, when we might not yet know if | 71 // now. Especially on android, when we might not yet know if |
55 // fullscreen is supported, we sometimes guess incorrectly and show | 72 // fullscreen is supported, we sometimes guess incorrectly and show |
56 // the button earlier, and we don't want to remove it here if the | 73 // the button earlier, and we don't want to remove it here if the |
57 // user chose to enter fullscreen. crbug.com/500732 . | 74 // user chose to enter fullscreen. crbug.com/500732 . |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
107 } | 124 } |
108 | 125 |
109 private: | 126 private: |
110 Member<MediaControls> m_controls; | 127 Member<MediaControls> m_controls; |
111 static int s_batchDepth; | 128 static int s_batchDepth; |
112 }; | 129 }; |
113 | 130 |
114 // Count of number open batches for controls visibility. | 131 // Count of number open batches for controls visibility. |
115 int MediaControls::BatchedControlUpdate::s_batchDepth = 0; | 132 int MediaControls::BatchedControlUpdate::s_batchDepth = 0; |
116 | 133 |
134 class MediaControls::MediaControlsResizeObserverCallback final | |
135 : public ResizeObserverCallback { | |
136 public: | |
137 explicit MediaControlsResizeObserverCallback(MediaControls* controls) | |
138 : m_controls(controls) { | |
139 DCHECK(controls); | |
140 } | |
141 ~MediaControlsResizeObserverCallback() override = default; | |
142 | |
143 void handleEvent(const HeapVector<Member<ResizeObserverEntry>>& entries, | |
144 ResizeObserver* observer) override { | |
145 DCHECK_EQ(1u, entries.size()); | |
146 DCHECK_EQ(entries[0]->target(), m_controls->m_mediaElement); | |
147 m_controls->notifyElementSizeChanged(entries[0]->contentRect()); | |
148 } | |
149 | |
150 DEFINE_INLINE_TRACE() { | |
151 visitor->trace(m_controls); | |
152 ResizeObserverCallback::trace(visitor); | |
153 } | |
154 | |
155 private: | |
156 Member<MediaControls> m_controls; | |
157 }; | |
158 | |
117 MediaControls::MediaControls(HTMLMediaElement& mediaElement) | 159 MediaControls::MediaControls(HTMLMediaElement& mediaElement) |
118 : HTMLDivElement(mediaElement.document()), | 160 : HTMLDivElement(mediaElement.document()), |
119 m_mediaElement(&mediaElement), | 161 m_mediaElement(&mediaElement), |
120 m_overlayEnclosure(nullptr), | 162 m_overlayEnclosure(nullptr), |
121 m_overlayPlayButton(nullptr), | 163 m_overlayPlayButton(nullptr), |
122 m_overlayCastButton(nullptr), | 164 m_overlayCastButton(nullptr), |
123 m_enclosure(nullptr), | 165 m_enclosure(nullptr), |
124 m_panel(nullptr), | 166 m_panel(nullptr), |
125 m_playButton(nullptr), | 167 m_playButton(nullptr), |
126 m_timeline(nullptr), | 168 m_timeline(nullptr), |
(...skipping 12 matching lines...) Expand all Loading... | |
139 this, | 181 this, |
140 WTF::bind(&MediaControls::hideAllMenus, wrapWeakPersistent(this)))), | 182 WTF::bind(&MediaControls::hideAllMenus, wrapWeakPersistent(this)))), |
141 m_orientationLockDelegate(nullptr), | 183 m_orientationLockDelegate(nullptr), |
142 m_hideMediaControlsTimer(TaskRunnerHelper::get(TaskType::UnspecedTimer, | 184 m_hideMediaControlsTimer(TaskRunnerHelper::get(TaskType::UnspecedTimer, |
143 &mediaElement.document()), | 185 &mediaElement.document()), |
144 this, | 186 this, |
145 &MediaControls::hideMediaControlsTimerFired), | 187 &MediaControls::hideMediaControlsTimerFired), |
146 m_hideTimerBehaviorFlags(IgnoreNone), | 188 m_hideTimerBehaviorFlags(IgnoreNone), |
147 m_isMouseOverControls(false), | 189 m_isMouseOverControls(false), |
148 m_isPausedForScrubbing(false), | 190 m_isPausedForScrubbing(false), |
149 m_panelWidthChangedTimer(TaskRunnerHelper::get(TaskType::UnspecedTimer, | 191 m_resizeObserver(ResizeObserver::create( |
150 &mediaElement.document()), | 192 mediaElement.document(), |
151 this, | 193 new MediaControlsResizeObserverCallback(this))), |
152 &MediaControls::panelWidthChangedTimerFired), | 194 m_elementSizeChangedTimer(TaskRunnerHelper::get(TaskType::UnspecedTimer, |
153 m_panelWidth(0), | 195 &mediaElement.document()), |
154 m_keepShowingUntilTimerFires(false) {} | 196 this, |
197 &MediaControls::elementSizeChangedTimerFired), | |
198 m_effectiveWidth(0), | |
199 m_effectiveHeight(0), | |
mlamouri (slow - plz ping)
2017/02/28 16:03:14
m_size is set to (0,0) by default
steimel
2017/03/01 15:58:31
Acknowledged.
| |
200 m_keepShowingUntilTimerFires(false) { | |
201 m_resizeObserver->observe(m_mediaElement); | |
202 } | |
155 | 203 |
156 MediaControls* MediaControls::create(HTMLMediaElement& mediaElement, | 204 MediaControls* MediaControls::create(HTMLMediaElement& mediaElement, |
157 ShadowRoot& shadowRoot) { | 205 ShadowRoot& shadowRoot) { |
158 MediaControls* controls = new MediaControls(mediaElement); | 206 MediaControls* controls = new MediaControls(mediaElement); |
159 controls->setShadowPseudoId(AtomicString("-webkit-media-controls")); | 207 controls->setShadowPseudoId(AtomicString("-webkit-media-controls")); |
160 controls->initializeControls(); | 208 controls->initializeControls(); |
161 controls->reset(); | 209 controls->reset(); |
162 | 210 |
163 // Initialize the orientation lock when going fullscreen feature. | 211 // Initialize the orientation lock when going fullscreen feature. |
164 if (RuntimeEnabledFeatures::videoFullscreenOrientationLockEnabled() && | 212 if (RuntimeEnabledFeatures::videoFullscreenOrientationLockEnabled() && |
(...skipping 616 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
781 stopHideMediaControlsTimer(); | 829 stopHideMediaControlsTimer(); |
782 startHideMediaControlsTimer(); | 830 startHideMediaControlsTimer(); |
783 } | 831 } |
784 | 832 |
785 void MediaControls::onExitedFullscreen() { | 833 void MediaControls::onExitedFullscreen() { |
786 m_fullscreenButton->setIsFullscreen(false); | 834 m_fullscreenButton->setIsFullscreen(false); |
787 stopHideMediaControlsTimer(); | 835 stopHideMediaControlsTimer(); |
788 startHideMediaControlsTimer(); | 836 startHideMediaControlsTimer(); |
789 } | 837 } |
790 | 838 |
791 void MediaControls::notifyPanelWidthChanged(const LayoutUnit& newWidth) { | 839 void MediaControls::notifyElementSizeChanged(ClientRect* newSize) { |
792 // Don't bother to do any work if this matches the most recent panel | |
793 // width, since we're called after layout. | |
794 // Note that this code permits a bad frame on resize, since it is | 840 // Note that this code permits a bad frame on resize, since it is |
795 // run after the relayout / paint happens. It would be great to improve | 841 // run after the relayout / paint happens. It would be great to improve |
796 // this, but it would be even greater to move this code entirely to | 842 // this, but it would be even greater to move this code entirely to |
797 // JS and fix it there. | 843 // JS and fix it there. |
798 m_panelWidth = newWidth.toInt(); | 844 |
845 int oldWidth = m_effectiveWidth; | |
846 int oldHeight = m_effectiveHeight; | |
847 m_effectiveWidth = newSize->width(); | |
848 m_effectiveHeight = newSize->height(); | |
mlamouri (slow - plz ping)
2017/02/28 16:03:14
IntSize oldSize = m_size;
m_size = newSize; // or
steimel
2017/03/01 15:58:31
Done.
| |
799 | 849 |
800 // Adjust for effective zoom. | 850 // Adjust for effective zoom. |
801 if (!m_panel->layoutObject() || !m_panel->layoutObject()->style()) | 851 if (m_panel->layoutObject() && m_panel->layoutObject()->style()) { |
802 return; | 852 m_effectiveWidth = ceil(m_effectiveWidth / |
803 m_panelWidth = | 853 m_panel->layoutObject()->style()->effectiveZoom()); |
804 ceil(m_panelWidth / m_panel->layoutObject()->style()->effectiveZoom()); | 854 m_effectiveHeight = ceil(m_effectiveHeight / |
855 m_panel->layoutObject()->style()->effectiveZoom()); | |
856 } | |
805 | 857 |
806 m_panelWidthChangedTimer.startOneShot(0, BLINK_FROM_HERE); | 858 // Don't bother to do any work if this matches the most recent size. |
859 if (oldWidth != m_effectiveWidth || oldHeight != m_effectiveHeight) | |
mlamouri (slow - plz ping)
2017/02/28 16:03:14
if (oldSize != newSize)
steimel
2017/03/01 15:58:31
Done.
| |
860 m_elementSizeChangedTimer.startOneShot(0, BLINK_FROM_HERE); | |
807 } | 861 } |
808 | 862 |
809 void MediaControls::panelWidthChangedTimerFired(TimerBase*) { | 863 void MediaControls::elementSizeChangedTimerFired(TimerBase*) { |
810 computeWhichControlsFit(); | 864 computeWhichControlsFit(); |
811 } | 865 } |
812 | 866 |
813 void MediaControls::computeWhichControlsFit() { | 867 void MediaControls::computeWhichControlsFit() { |
814 // Hide all controls that don't fit, and show the ones that do. | 868 // Hide all controls that don't fit, and show the ones that do. |
815 // This might be better suited for a layout, but since JS media controls | 869 // This might be better suited for a layout, but since JS media controls |
816 // won't benefit from that anwyay, we just do it here like JS will. | 870 // won't benefit from that anwyay, we just do it here like JS will. |
817 | 871 |
818 // Controls that we'll hide / show, in order of decreasing priority. | 872 // Controls that we'll hide / show, in order of decreasing priority. |
819 MediaControlElement* elements[] = { | 873 MediaControlElement* elements[] = { |
820 // Exclude m_overflowMenu; we handle it specially. | 874 // Exclude m_overflowMenu; we handle it specially. |
821 m_playButton.get(), | 875 m_playButton.get(), |
822 m_fullscreenButton.get(), | 876 m_fullscreenButton.get(), |
823 m_downloadButton.get(), | 877 m_downloadButton.get(), |
824 m_timeline.get(), | 878 m_timeline.get(), |
825 m_muteButton.get(), | 879 m_muteButton.get(), |
826 m_volumeSlider.get(), | 880 m_volumeSlider.get(), |
827 m_toggleClosedCaptionsButton.get(), | 881 m_toggleClosedCaptionsButton.get(), |
828 m_castButton.get(), | 882 m_castButton.get(), |
829 m_currentTimeDisplay.get(), | 883 m_currentTimeDisplay.get(), |
830 m_durationDisplay.get(), | 884 m_durationDisplay.get(), |
831 }; | 885 }; |
832 | 886 |
833 // TODO(mlamouri): we need a more dynamic way to find out the width of an | 887 // TODO(mlamouri): we need a more dynamic way to find out the width of an |
834 // element. | 888 // element. |
835 const int sliderMargin = 36; // Sliders have 18px margin on each side. | 889 const int sliderMargin = 36; // Sliders have 18px margin on each side. |
836 | 890 |
837 if (!m_panelWidth) { | 891 if (!m_effectiveWidth) { |
838 // No layout yet -- hide everything, then make them show up later. | 892 // No layout yet -- hide everything, then make them show up later. |
839 // This prevents the wrong controls from being shown briefly | 893 // This prevents the wrong controls from being shown briefly |
840 // immediately after the first layout and paint, but before we have | 894 // immediately after the first layout and paint, but before we have |
841 // a chance to revise them. | 895 // a chance to revise them. |
842 for (MediaControlElement* element : elements) { | 896 for (MediaControlElement* element : elements) { |
843 if (element) | 897 if (element) |
844 element->setDoesFit(false); | 898 element->setDoesFit(false); |
845 } | 899 } |
846 return; | 900 return; |
847 } | 901 } |
(...skipping 24 matching lines...) Expand all Loading... | |
872 MediaControlElement* firstDisplacedElement = nullptr; | 926 MediaControlElement* firstDisplacedElement = nullptr; |
873 // For each control that fits, enable it in order of decreasing priority. | 927 // For each control that fits, enable it in order of decreasing priority. |
874 for (MediaControlElement* element : elements) { | 928 for (MediaControlElement* element : elements) { |
875 if (!element) | 929 if (!element) |
876 continue; | 930 continue; |
877 int width = minimumWidth; | 931 int width = minimumWidth; |
878 if ((element == m_timeline.get()) || (element == m_volumeSlider.get())) | 932 if ((element == m_timeline.get()) || (element == m_volumeSlider.get())) |
879 width += sliderMargin; | 933 width += sliderMargin; |
880 element->shouldShowButtonInOverflowMenu(false); | 934 element->shouldShowButtonInOverflowMenu(false); |
881 if (element->isWanted()) { | 935 if (element->isWanted()) { |
882 if (usedWidth + width <= m_panelWidth) { | 936 if (usedWidth + width <= m_effectiveWidth) { |
883 element->setDoesFit(true); | 937 element->setDoesFit(true); |
884 usedWidth += width; | 938 usedWidth += width; |
885 } else { | 939 } else { |
886 element->setDoesFit(false); | 940 element->setDoesFit(false); |
887 element->shouldShowButtonInOverflowMenu(true); | 941 element->shouldShowButtonInOverflowMenu(true); |
888 if (element->hasOverflowButton()) | 942 if (element->hasOverflowButton()) |
889 overflowElements.push_front(element); | 943 overflowElements.push_front(element); |
890 // We want a way to access the first media element that was | 944 // We want a way to access the first media element that was |
891 // removed. If we don't end up needing an overflow menu, we can | 945 // removed. If we don't end up needing an overflow menu, we can |
892 // use the space the overflow menu would have taken up to | 946 // use the space the overflow menu would have taken up to |
893 // instead display that media element. | 947 // instead display that media element. |
894 if (!element->hasOverflowButton() && !firstDisplacedElement) | 948 if (!element->hasOverflowButton() && !firstDisplacedElement) |
895 firstDisplacedElement = element; | 949 firstDisplacedElement = element; |
896 } | 950 } |
897 } | 951 } |
898 } | 952 } |
899 | 953 |
900 // If we don't have at least two overflow elements, we will not show the | 954 // If we don't have at least two overflow elements, we will not show the |
901 // overflow menu. | 955 // overflow menu. |
902 if (overflowElements.empty()) { | 956 if (overflowElements.empty()) { |
903 m_overflowMenu->setIsWanted(false); | 957 m_overflowMenu->setIsWanted(false); |
904 usedWidth -= minimumWidth; | 958 usedWidth -= minimumWidth; |
905 if (firstDisplacedElement) { | 959 if (firstDisplacedElement) { |
906 int width = minimumWidth; | 960 int width = minimumWidth; |
907 if ((firstDisplacedElement == m_timeline.get()) || | 961 if ((firstDisplacedElement == m_timeline.get()) || |
908 (firstDisplacedElement == m_volumeSlider.get())) | 962 (firstDisplacedElement == m_volumeSlider.get())) |
909 width += sliderMargin; | 963 width += sliderMargin; |
910 if (usedWidth + width <= m_panelWidth) | 964 if (usedWidth + width <= m_effectiveWidth) |
911 firstDisplacedElement->setDoesFit(true); | 965 firstDisplacedElement->setDoesFit(true); |
912 } | 966 } |
913 } else if (overflowElements.size() == 1) { | 967 } else if (overflowElements.size() == 1) { |
914 m_overflowMenu->setIsWanted(false); | 968 m_overflowMenu->setIsWanted(false); |
915 overflowElements.front()->setDoesFit(true); | 969 overflowElements.front()->setDoesFit(true); |
916 } | 970 } |
971 | |
972 // Decide if the overlay play button fits. | |
973 if (m_effectiveWidth && m_effectiveHeight && m_overlayPlayButton) { | |
mlamouri (slow - plz ping)
2017/02/28 16:03:14
`if (!m_size.isEmpty() && m_overlayPlayButton) {`
steimel
2017/03/01 15:58:31
Done.
| |
974 bool doesFit = m_effectiveWidth >= kMinWidthForOverlayPlayButton && | |
975 m_effectiveHeight >= kMinHeightForOverlayPlayButton; | |
976 m_overlayPlayButton->setDoesFit(doesFit); | |
977 } | |
917 } | 978 } |
918 | 979 |
919 void MediaControls::invalidate(Element* element) { | 980 void MediaControls::invalidate(Element* element) { |
920 if (!element) | 981 if (!element) |
921 return; | 982 return; |
922 | 983 |
923 if (LayoutObject* layoutObject = element->layoutObject()) | 984 if (LayoutObject* layoutObject = element->layoutObject()) |
924 layoutObject | 985 layoutObject |
925 ->setShouldDoFullPaintInvalidationIncludingNonCompositingDescendants(); | 986 ->setShouldDoFullPaintInvalidationIncludingNonCompositingDescendants(); |
926 } | 987 } |
(...skipping 23 matching lines...) Expand all Loading... | |
950 void MediaControls::hideAllMenus() { | 1011 void MediaControls::hideAllMenus() { |
951 m_windowEventListener->stop(); | 1012 m_windowEventListener->stop(); |
952 | 1013 |
953 if (m_overflowList->isWanted()) | 1014 if (m_overflowList->isWanted()) |
954 m_overflowList->setIsWanted(false); | 1015 m_overflowList->setIsWanted(false); |
955 if (m_textTrackList->isWanted()) | 1016 if (m_textTrackList->isWanted()) |
956 m_textTrackList->setVisible(false); | 1017 m_textTrackList->setVisible(false); |
957 } | 1018 } |
958 | 1019 |
959 DEFINE_TRACE(MediaControls) { | 1020 DEFINE_TRACE(MediaControls) { |
1021 visitor->trace(m_resizeObserver); | |
960 visitor->trace(m_mediaElement); | 1022 visitor->trace(m_mediaElement); |
961 visitor->trace(m_panel); | 1023 visitor->trace(m_panel); |
962 visitor->trace(m_overlayPlayButton); | 1024 visitor->trace(m_overlayPlayButton); |
963 visitor->trace(m_overlayEnclosure); | 1025 visitor->trace(m_overlayEnclosure); |
964 visitor->trace(m_playButton); | 1026 visitor->trace(m_playButton); |
965 visitor->trace(m_currentTimeDisplay); | 1027 visitor->trace(m_currentTimeDisplay); |
966 visitor->trace(m_timeline); | 1028 visitor->trace(m_timeline); |
967 visitor->trace(m_muteButton); | 1029 visitor->trace(m_muteButton); |
968 visitor->trace(m_volumeSlider); | 1030 visitor->trace(m_volumeSlider); |
969 visitor->trace(m_toggleClosedCaptionsButton); | 1031 visitor->trace(m_toggleClosedCaptionsButton); |
970 visitor->trace(m_fullscreenButton); | 1032 visitor->trace(m_fullscreenButton); |
971 visitor->trace(m_downloadButton); | 1033 visitor->trace(m_downloadButton); |
972 visitor->trace(m_durationDisplay); | 1034 visitor->trace(m_durationDisplay); |
973 visitor->trace(m_enclosure); | 1035 visitor->trace(m_enclosure); |
974 visitor->trace(m_textTrackList); | 1036 visitor->trace(m_textTrackList); |
975 visitor->trace(m_overflowMenu); | 1037 visitor->trace(m_overflowMenu); |
976 visitor->trace(m_overflowList); | 1038 visitor->trace(m_overflowList); |
977 visitor->trace(m_castButton); | 1039 visitor->trace(m_castButton); |
978 visitor->trace(m_overlayCastButton); | 1040 visitor->trace(m_overlayCastButton); |
979 visitor->trace(m_mediaEventListener); | 1041 visitor->trace(m_mediaEventListener); |
980 visitor->trace(m_windowEventListener); | 1042 visitor->trace(m_windowEventListener); |
981 visitor->trace(m_orientationLockDelegate); | 1043 visitor->trace(m_orientationLockDelegate); |
982 HTMLDivElement::trace(visitor); | 1044 HTMLDivElement::trace(visitor); |
983 } | 1045 } |
984 | 1046 |
985 } // namespace blink | 1047 } // namespace blink |
OLD | NEW |