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 826 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
837 invalidate(m_overlayPlayButton); | 837 invalidate(m_overlayPlayButton); |
838 invalidate(m_muteButton); | 838 invalidate(m_muteButton); |
839 invalidate(m_fullscreenButton); | 839 invalidate(m_fullscreenButton); |
840 invalidate(m_downloadButton); | 840 invalidate(m_downloadButton); |
841 invalidate(m_timeline); | 841 invalidate(m_timeline); |
842 invalidate(m_volumeSlider); | 842 invalidate(m_volumeSlider); |
843 } | 843 } |
844 | 844 |
845 bool MediaControls::overflowMenuVisible() | 845 bool MediaControls::overflowMenuVisible() |
846 { | 846 { |
847 return m_overflowList->isWanted(); | 847 return m_overflowList ? m_overflowList->isWanted() : false; |
848 } | 848 } |
849 | 849 |
850 void MediaControls::toggleOverflowMenu() | 850 void MediaControls::toggleOverflowMenu() |
851 { | 851 { |
| 852 DCHECK(m_overflowList); |
852 m_overflowList->setIsWanted(!m_overflowList->isWanted()); | 853 m_overflowList->setIsWanted(!m_overflowList->isWanted()); |
853 } | 854 } |
854 | 855 |
855 DEFINE_TRACE(MediaControls) | 856 DEFINE_TRACE(MediaControls) |
856 { | 857 { |
857 visitor->trace(m_mediaElement); | 858 visitor->trace(m_mediaElement); |
858 visitor->trace(m_panel); | 859 visitor->trace(m_panel); |
859 visitor->trace(m_overlayPlayButton); | 860 visitor->trace(m_overlayPlayButton); |
860 visitor->trace(m_overlayEnclosure); | 861 visitor->trace(m_overlayEnclosure); |
861 visitor->trace(m_playButton); | 862 visitor->trace(m_playButton); |
862 visitor->trace(m_currentTimeDisplay); | 863 visitor->trace(m_currentTimeDisplay); |
863 visitor->trace(m_timeline); | 864 visitor->trace(m_timeline); |
864 visitor->trace(m_muteButton); | 865 visitor->trace(m_muteButton); |
865 visitor->trace(m_volumeSlider); | 866 visitor->trace(m_volumeSlider); |
866 visitor->trace(m_toggleClosedCaptionsButton); | 867 visitor->trace(m_toggleClosedCaptionsButton); |
867 visitor->trace(m_fullscreenButton); | 868 visitor->trace(m_fullscreenButton); |
868 visitor->trace(m_downloadButton); | 869 visitor->trace(m_downloadButton); |
869 visitor->trace(m_durationDisplay); | 870 visitor->trace(m_durationDisplay); |
870 visitor->trace(m_enclosure); | 871 visitor->trace(m_enclosure); |
871 visitor->trace(m_textTrackList); | 872 visitor->trace(m_textTrackList); |
872 visitor->trace(m_overflowMenu); | 873 visitor->trace(m_overflowMenu); |
873 visitor->trace(m_overflowList); | 874 visitor->trace(m_overflowList); |
874 visitor->trace(m_castButton); | 875 visitor->trace(m_castButton); |
875 visitor->trace(m_overlayCastButton); | 876 visitor->trace(m_overlayCastButton); |
876 HTMLDivElement::trace(visitor); | 877 HTMLDivElement::trace(visitor); |
877 } | 878 } |
878 | 879 |
879 } // namespace blink | 880 } // namespace blink |
OLD | NEW |