Changeset 140862 in webkit
- Timestamp:
- Jan 25, 2013 1:39:43 PM (11 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r140860 r140862 1 2013-01-25 Eric Carlson <eric.carlson@apple.com> 2 3 Adding a text track should not make controls visible 4 https://bugs.webkit.org/show_bug.cgi?id=107956 5 6 Reviewed by Dean Jackson. 7 8 * media/media-captions-no-controls-expected.txt: Added. 9 * media/media-captions-no-controls.html: Added. 10 1 11 2013-01-25 Erik Arvidsson <arv@chromium.org> 2 12 -
trunk/Source/WebCore/ChangeLog
r140856 r140862 1 2013-01-25 Eric Carlson <eric.carlson@apple.com> 2 3 Adding a text track should not make controls visible 4 https://bugs.webkit.org/show_bug.cgi?id=107956 5 6 Reviewed by Dean Jackson. 7 8 Test: media/media-captions-no-controls.html 9 10 * html/HTMLMediaElement.cpp: 11 (WebCore::HTMLMediaElement::updateActiveTextTrackCues): Call updateTextTrackDisplay. 12 (WebCore::HTMLMediaElement::updateTextTrackDisplay): New, call mediaControls->updateTextTrackDisplay() 13 if we have controls. 14 (WebCore::HTMLMediaElement::setClosedCaptionsVisible): Call updateTextTrackDisplay. 15 (WebCore::HTMLMediaElement::createMediaControls): Hide controls if they should not be 16 visible. Minor drive by cleanup. 17 (WebCore::HTMLMediaElement::configureTextTrackDisplay): Drive by cleanup, pull the three lines 18 from updateClosedCaptionsControls inline and delete it because this was the only caller. 19 * html/HTMLMediaElement.h: 20 1 21 2013-01-25 Elliott Sprehn <esprehn@chromium.org> 2 22 -
trunk/Source/WebCore/html/HTMLMediaElement.cpp
r140834 r140862 1179 1179 // the mode of a track has changed from 'hidden' to 'showing' and the 1180 1180 // cues have not yet been rendered. 1181 // Note: don't call updateTextTrackDisplay() unless we have controls because it will 1182 // create them. 1181 1183 if (hasMediaControls()) 1182 mediaControls()->updateTextTrackDisplay(); 1183 1184 updateTextTrackDisplay(); 1184 1185 return; 1185 1186 } … … 1319 1320 m_currentlyActiveCues = currentCues; 1320 1321 1321 if (activeSetChanged && hasMediaControls())1322 mediaControls()->updateTextTrackDisplay();1322 if (activeSetChanged) 1323 updateTextTrackDisplay(); 1323 1324 } 1324 1325 … … 4150 4151 } 4151 4152 4153 #if ENABLE(VIDEO_TRACK) 4154 void HTMLMediaElement::updateTextTrackDisplay() 4155 { 4156 if (!hasMediaControls() && !createMediaControls()) 4157 return; 4158 4159 mediaControls()->updateTextTrackDisplay(); 4160 } 4161 #endif 4162 4152 4163 void HTMLMediaElement::setClosedCaptionsVisible(bool closedCaptionVisible) 4153 4164 { … … 4165 4176 4166 4177 markCaptionAndSubtitleTracksAsUnconfigured(); 4167 mediaControls()->updateTextTrackDisplay(); 4178 4179 updateTextTrackDisplay(); 4168 4180 } 4169 4181 #else … … 4286 4298 return true; 4287 4299 4288 ExceptionCode ec; 4289 RefPtr<MediaControls> controls = MediaControls::create(document()); 4290 if (!controls) 4300 RefPtr<MediaControls> mediaControls = MediaControls::create(document()); 4301 if (!mediaControls) 4291 4302 return false; 4292 4303 4293 controls->setMediaController(m_mediaController ? m_mediaController.get() : static_cast<MediaControllerInterface*>(this));4294 controls->reset();4304 mediaControls->setMediaController(m_mediaController ? m_mediaController.get() : static_cast<MediaControllerInterface*>(this)); 4305 mediaControls->reset(); 4295 4306 if (isFullscreen()) 4296 controls->enteredFullscreen();4307 mediaControls->enteredFullscreen(); 4297 4308 4298 4309 if (!shadow()) … … 4300 4311 4301 4312 ASSERT(userAgentShadowRoot()); 4302 userAgentShadowRoot()->appendChild(controls, ec); 4313 userAgentShadowRoot()->appendChild(mediaControls, ASSERT_NO_EXCEPTION); 4314 4315 if (!controls() || !inDocument()) 4316 mediaControls->hide(); 4317 4303 4318 return true; 4304 4319 } … … 4349 4364 return; 4350 4365 4351 updateClosedCaptionsControls(); 4352 } 4353 4354 void HTMLMediaElement::updateClosedCaptionsControls() 4355 { 4356 if (hasMediaControls()) { 4357 mediaControls()->changedClosedCaptionsVisibility(); 4358 4359 if (RuntimeEnabledFeatures::webkitVideoTrackEnabled()) 4360 mediaControls()->updateTextTrackDisplay(); 4361 } 4366 mediaControls()->changedClosedCaptionsVisibility(); 4367 4368 if (RuntimeEnabledFeatures::webkitVideoTrackEnabled()) 4369 updateTextTrackDisplay(); 4362 4370 } 4363 4371 -
trunk/Source/WebCore/html/HTMLMediaElement.h
r140834 r140862 259 259 bool textTracksAreReady() const; 260 260 void configureTextTrackDisplay(); 261 void update ClosedCaptionsControls();261 void updateTextTrackDisplay(); 262 262 263 263 // TextTrackClient
Note: See TracChangeset
for help on using the changeset viewer.