Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(216)

Side by Side Diff: Source/core/html/shadow/MediaControls.h

Issue 949203002: Separate the text track container from the media controls (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: address nits Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/html/HTMLMediaElement.cpp ('k') | Source/core/html/shadow/MediaControls.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 void refreshClosedCaptionsButtonVisibility(); 61 void refreshClosedCaptionsButtonVisibility();
62 62
63 void enteredFullscreen(); 63 void enteredFullscreen();
64 void exitedFullscreen(); 64 void exitedFullscreen();
65 65
66 void startedCasting(); 66 void startedCasting();
67 void stoppedCasting(); 67 void stoppedCasting();
68 void refreshCastButtonVisibility(); 68 void refreshCastButtonVisibility();
69 void showOverlayCastButton(); 69 void showOverlayCastButton();
70 70
71 TextTrackContainer* textTrackContainer();
72
73 void mediaElementFocused(); 71 void mediaElementFocused();
74 72
75 DECLARE_VIRTUAL_TRACE(); 73 DECLARE_VIRTUAL_TRACE();
76 74
77 private: 75 private:
78 explicit MediaControls(HTMLMediaElement&); 76 explicit MediaControls(HTMLMediaElement&);
79 77
80 void initializeControls(); 78 void initializeControls();
81 79
82 void makeOpaque(); 80 void makeOpaque();
(...skipping 22 matching lines...) Expand all
105 virtual bool isMediaControls() const override { return true; } 103 virtual bool isMediaControls() const override { return true; }
106 virtual bool willRespondToMouseMoveEvents() override { return true; } 104 virtual bool willRespondToMouseMoveEvents() override { return true; }
107 virtual void defaultEventHandler(Event*) override; 105 virtual void defaultEventHandler(Event*) override;
108 bool containsRelatedTarget(Event*); 106 bool containsRelatedTarget(Event*);
109 107
110 RawPtrWillBeMember<HTMLMediaElement> m_mediaElement; 108 RawPtrWillBeMember<HTMLMediaElement> m_mediaElement;
111 109
112 // Container for the media control elements. 110 // Container for the media control elements.
113 RawPtrWillBeMember<MediaControlPanelElement> m_panel; 111 RawPtrWillBeMember<MediaControlPanelElement> m_panel;
114 112
115 // Container for the text track cues.
116 RawPtrWillBeMember<TextTrackContainer> m_textTrackContainer;
117
118 // Media control elements. 113 // Media control elements.
119 RawPtrWillBeMember<MediaControlOverlayPlayButtonElement> m_overlayPlayButton ; 114 RawPtrWillBeMember<MediaControlOverlayPlayButtonElement> m_overlayPlayButton ;
120 RawPtrWillBeMember<MediaControlOverlayEnclosureElement> m_overlayEnclosure; 115 RawPtrWillBeMember<MediaControlOverlayEnclosureElement> m_overlayEnclosure;
121 RawPtrWillBeMember<MediaControlPlayButtonElement> m_playButton; 116 RawPtrWillBeMember<MediaControlPlayButtonElement> m_playButton;
122 RawPtrWillBeMember<MediaControlCurrentTimeDisplayElement> m_currentTimeDispl ay; 117 RawPtrWillBeMember<MediaControlCurrentTimeDisplayElement> m_currentTimeDispl ay;
123 RawPtrWillBeMember<MediaControlTimelineElement> m_timeline; 118 RawPtrWillBeMember<MediaControlTimelineElement> m_timeline;
124 RawPtrWillBeMember<MediaControlMuteButtonElement> m_muteButton; 119 RawPtrWillBeMember<MediaControlMuteButtonElement> m_muteButton;
125 RawPtrWillBeMember<MediaControlVolumeSliderElement> m_volumeSlider; 120 RawPtrWillBeMember<MediaControlVolumeSliderElement> m_volumeSlider;
126 RawPtrWillBeMember<MediaControlToggleClosedCaptionsButtonElement> m_toggleCl osedCaptionsButton; 121 RawPtrWillBeMember<MediaControlToggleClosedCaptionsButtonElement> m_toggleCl osedCaptionsButton;
127 RawPtrWillBeMember<MediaControlFullscreenButtonElement> m_fullScreenButton; 122 RawPtrWillBeMember<MediaControlFullscreenButtonElement> m_fullScreenButton;
128 RawPtrWillBeMember<MediaControlCastButtonElement> m_castButton; 123 RawPtrWillBeMember<MediaControlCastButtonElement> m_castButton;
129 RawPtrWillBeMember<MediaControlCastButtonElement> m_overlayCastButton; 124 RawPtrWillBeMember<MediaControlCastButtonElement> m_overlayCastButton;
130 RawPtrWillBeMember<MediaControlTimeRemainingDisplayElement> m_durationDispla y; 125 RawPtrWillBeMember<MediaControlTimeRemainingDisplayElement> m_durationDispla y;
131 RawPtrWillBeMember<MediaControlPanelEnclosureElement> m_enclosure; 126 RawPtrWillBeMember<MediaControlPanelEnclosureElement> m_enclosure;
132 127
133 Timer<MediaControls> m_hideMediaControlsTimer; 128 Timer<MediaControls> m_hideMediaControlsTimer;
134 unsigned m_hideTimerBehaviorFlags; 129 unsigned m_hideTimerBehaviorFlags;
135 bool m_isMouseOverControls : 1; 130 bool m_isMouseOverControls : 1;
136 bool m_isPausedForScrubbing : 1; 131 bool m_isPausedForScrubbing : 1;
137 }; 132 };
138 133
139 DEFINE_ELEMENT_TYPE_CASTS(MediaControls, isMediaControls()); 134 DEFINE_ELEMENT_TYPE_CASTS(MediaControls, isMediaControls());
140 135
141 } 136 }
142 137
143 #endif 138 #endif
OLDNEW
« no previous file with comments | « Source/core/html/HTMLMediaElement.cpp ('k') | Source/core/html/shadow/MediaControls.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698