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

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

Issue 1153383002: Rearrange MediaControls members to match DOM structure (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 6 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 | « no previous file | 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 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 void tryShowOverlayCastButton(); 104 void tryShowOverlayCastButton();
105 105
106 // Node 106 // Node
107 virtual bool isMediaControls() const override { return true; } 107 virtual bool isMediaControls() const override { return true; }
108 virtual bool willRespondToMouseMoveEvents() override { return true; } 108 virtual bool willRespondToMouseMoveEvents() override { return true; }
109 virtual void defaultEventHandler(Event*) override; 109 virtual void defaultEventHandler(Event*) override;
110 bool containsRelatedTarget(Event*); 110 bool containsRelatedTarget(Event*);
111 111
112 RawPtrWillBeMember<HTMLMediaElement> m_mediaElement; 112 RawPtrWillBeMember<HTMLMediaElement> m_mediaElement;
113 113
114 // Container for the media control elements. 114 // Media control elements.
115 RawPtrWillBeMember<MediaControlOverlayEnclosureElement> m_overlayEnclosure;
116 RawPtrWillBeMember<MediaControlOverlayPlayButtonElement> m_overlayPlayButton ;
117 RawPtrWillBeMember<MediaControlCastButtonElement> m_overlayCastButton;
118 RawPtrWillBeMember<MediaControlPanelEnclosureElement> m_enclosure;
115 RawPtrWillBeMember<MediaControlPanelElement> m_panel; 119 RawPtrWillBeMember<MediaControlPanelElement> m_panel;
116
117 // Media control elements.
118 RawPtrWillBeMember<MediaControlOverlayPlayButtonElement> m_overlayPlayButton ;
119 RawPtrWillBeMember<MediaControlOverlayEnclosureElement> m_overlayEnclosure;
120 RawPtrWillBeMember<MediaControlPlayButtonElement> m_playButton; 120 RawPtrWillBeMember<MediaControlPlayButtonElement> m_playButton;
121 RawPtrWillBeMember<MediaControlTimelineElement> m_timeline;
121 RawPtrWillBeMember<MediaControlCurrentTimeDisplayElement> m_currentTimeDispl ay; 122 RawPtrWillBeMember<MediaControlCurrentTimeDisplayElement> m_currentTimeDispl ay;
122 RawPtrWillBeMember<MediaControlTimelineElement> m_timeline; 123 RawPtrWillBeMember<MediaControlTimeRemainingDisplayElement> m_durationDispla y;
123 RawPtrWillBeMember<MediaControlMuteButtonElement> m_muteButton; 124 RawPtrWillBeMember<MediaControlMuteButtonElement> m_muteButton;
124 RawPtrWillBeMember<MediaControlVolumeSliderElement> m_volumeSlider; 125 RawPtrWillBeMember<MediaControlVolumeSliderElement> m_volumeSlider;
125 RawPtrWillBeMember<MediaControlToggleClosedCaptionsButtonElement> m_toggleCl osedCaptionsButton; 126 RawPtrWillBeMember<MediaControlToggleClosedCaptionsButtonElement> m_toggleCl osedCaptionsButton;
127 RawPtrWillBeMember<MediaControlCastButtonElement> m_castButton;
126 RawPtrWillBeMember<MediaControlFullscreenButtonElement> m_fullScreenButton; 128 RawPtrWillBeMember<MediaControlFullscreenButtonElement> m_fullScreenButton;
127 RawPtrWillBeMember<MediaControlCastButtonElement> m_castButton;
128 RawPtrWillBeMember<MediaControlCastButtonElement> m_overlayCastButton;
129 RawPtrWillBeMember<MediaControlTimeRemainingDisplayElement> m_durationDispla y;
130 RawPtrWillBeMember<MediaControlPanelEnclosureElement> m_enclosure;
131 129
132 Timer<MediaControls> m_hideMediaControlsTimer; 130 Timer<MediaControls> m_hideMediaControlsTimer;
133 unsigned m_hideTimerBehaviorFlags; 131 unsigned m_hideTimerBehaviorFlags;
134 bool m_isMouseOverControls : 1; 132 bool m_isMouseOverControls : 1;
135 bool m_isPausedForScrubbing : 1; 133 bool m_isPausedForScrubbing : 1;
136 }; 134 };
137 135
138 DEFINE_ELEMENT_TYPE_CASTS(MediaControls, isMediaControls()); 136 DEFINE_ELEMENT_TYPE_CASTS(MediaControls, isMediaControls());
139 137
140 } 138 }
141 139
142 #endif 140 #endif
OLDNEW
« no previous file with comments | « no previous file | Source/core/html/shadow/MediaControls.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698