Changeset 168479 in webkit
- Timestamp:
- May 8, 2014 12:03:38 PM (10 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r168478 r168479 1 2014-05-08 Brent Fulgham <bfulgham@apple.com> 2 3 Cue display events may not be registered during page load. 4 https://bugs.webkit.org/show_bug.cgi?id=132696 5 <rdar://problem/16652874> 6 7 Reviewed by Eric Carlson. 8 9 * Modules/mediacontrols/mediaControlsApple.js: 10 (Controller.prototype.handleTextTrackAdd): Don't register 11 for 'cuechange' events anymore. 12 (Controller.prototype.handleTextTrackRemove): Ditto. 13 (Controller.prototype.updateCaptionContainer): Reduce CSS 14 churn by not adding/removing 'Hidden' class every time a 15 new cue is processed. Only do this when transitioning 16 track display state. 17 (Controller.prototype.handleTextTrackCueChange): Deleted. 18 * html/HTMLMediaElement.cpp: 19 (WebCore::HTMLMediaElement::updateTextTrackDisplay): Call 20 'updateTextTrackContainer' directory when processing cues, 21 rather than trampolining through the JS layer. 22 1 23 2014-05-08 Alexey Proskuryakov <ap@apple.com> 2 24 -
trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js
r168215 r168479 572 572 { 573 573 var track = event.track; 574 this.listenFor(track, 'cuechange', this.handleTextTrackCueChange);575 574 576 575 if (this.trackHasThumbnails(track) && track.mode === 'disabled') … … 584 583 handleTextTrackRemove: function(event) 585 584 { 586 var track = event.track;587 this.stopListeningFor(track, 'cuechange', this.handleTextTrackCueChange);588 585 this.updateThumbnail(); 589 586 this.updateCaptionButton(); 590 this.updateCaptionContainer();591 },592 593 handleTextTrackCueChange: function(event)594 {595 587 this.updateCaptionContainer(); 596 588 }, … … 1050 1042 return; 1051 1043 1052 if (this.video.webkitHasClosedCaptions) 1044 var hasClosedCaptions = this.video.webkitHasClosedCaptions; 1045 var hasHiddenClass = this.host.textTrackContainer.classList.contains(this.ClassNames.hidden); 1046 1047 if (hasClosedCaptions && hasHiddenClass) 1053 1048 this.host.textTrackContainer.classList.remove(this.ClassNames.hidden); 1054 else 1049 else if (!hasClosedCaptions && !hasHiddenClass) 1055 1050 this.host.textTrackContainer.classList.add(this.ClassNames.hidden); 1056 1051 -
trunk/Source/WebCore/html/HTMLMediaElement.cpp
r168245 r168479 4940 4940 #if ENABLE(MEDIA_CONTROLS_SCRIPT) 4941 4941 ensureUserAgentShadowRoot(); 4942 ASSERT(m_mediaControlsHost); 4943 m_mediaControlsHost->updateTextTrackContainer(); 4942 4944 return; 4943 4945 #endif
Note: See TracChangeset
for help on using the changeset viewer.