Changeset 156656 in webkit
- Timestamp:
- Sep 30, 2013 9:09:37 AM (11 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r156652 r156656 1 2013-09-27 Jer Noble <jer.noble@apple.com> 2 3 REGRESSION(r156546): media/video-no-audio.html broken 4 https://bugs.webkit.org/show_bug.cgi?id=122049 5 6 Reviewed by Eric Carlson. 7 8 * platform/mac/TestExpectations: 9 * platform/mac/media/video-no-audio-expected.txt: 10 1 11 2013-09-27 Jer Noble <jer.noble@apple.com> 2 12 -
trunk/LayoutTests/platform/mac/TestExpectations
r156592 r156656 1359 1359 webkit.org/b/122021 media/video-display-toggle.html 1360 1360 webkit.org/b/122021 media/video-empty-source.html 1361 webkit.org/b/122021 media/video-no-audio.html1362 1361 webkit.org/b/122021 media/video-rtl.html 1363 1362 webkit.org/b/122021 media/video-volume-slider.html -
trunk/LayoutTests/platform/mac/media/video-no-audio-expected.txt
r149210 r156656 15 15 layer at (8,305) size 352x25 16 16 RenderFlexibleBox {DIV} at (0,263) size 352x25 17 RenderButton {INPUT} at (6,3) size 18x18 18 RenderButton {INPUT} at (32,4) size 16x16 19 RenderFlexibleBox {DIV} at (49,5) size 273x15 20 RenderSlider {INPUT} at (45,2) size 183x13 21 RenderFlexibleBox {DIV} at (0,0) size 183x13 22 RenderBlock {DIV} at (0,2) size 183x8 23 RenderBlock {DIV} at (0,0) size 10x8 24 RenderButton {INPUT} at (329,4) size 16x16 25 RenderBlock {DIV} at (322,12) size 0x0 17 layer at (14,309) size 16x16 18 RenderButton {BUTTON} at (6,4) size 16x16 [color=#FFFFFF] 19 layer at (40,310) size 16x16 20 RenderButton {BUTTON} at (32,5) size 16x16 [color=#FFFFFF] 21 layer at (57,312) size 273x11 22 RenderFlexibleBox {DIV} at (49,7) size 273x11 26 23 layer at (57,312) size 45x11 27 RenderFlexibleBox {DIV} at (0, 2) size 45x11 [color=#FFFFFF]24 RenderFlexibleBox {DIV} at (0,0) size 45x11 [color=#FFFFFF] 28 25 RenderBlock (anonymous) at (9,0) size 26x11 29 26 RenderText {#text} at (0,0) size 26x11 30 27 text run at (0,0) width 26: "00:00" 31 28 layer at (285,312) size 45x11 32 RenderFlexibleBox {DIV} at (228, 2) size 45x11 [color=#FFFFFF]29 RenderFlexibleBox {DIV} at (228,0) size 45x11 [color=#FFFFFF] 33 30 RenderBlock (anonymous) at (7,0) size 31x11 34 31 RenderText {#text} at (0,0) size 31x11 35 32 text run at (0,0) width 31: "-00:09" 33 layer at (104,313) size 179x9 34 RenderFlexibleBox {DIV} at (47,1) size 179x9 35 RenderSlider {INPUT} at (0,0) size 179x9 [color=#909090] [bgcolor=#000000] 36 RenderFlexibleBox {DIV} at (0,0) size 179x9 37 RenderBlock {DIV} at (0,1) size 179x6 38 layer at (104,314) size 6x6 39 RenderBlock {DIV} at (0,0) size 6x6 [bgcolor=#FFFFFF] 40 layer at (337,310) size 16x16 41 RenderButton {BUTTON} at (329,5) size 16x16 [color=#FFFFFF] -
trunk/Source/WebCore/ChangeLog
r156653 r156656 1 2013-09-27 Jer Noble <jer.noble@apple.com> 2 3 REGRESSION(r156546): media/video-no-audio.html broken 4 https://bugs.webkit.org/show_bug.cgi?id=122049 5 6 Reviewed by Eric Carlson. 7 8 Now that our video elements have audio tracks, use their presence or 9 absense to show or hide the volume controls. 10 11 * Modules/mediacontrols/mediaControlsApple.js: 12 (Controller): 13 (Controller.prototype.addVideoListeners): Listen for audioTrack changes. 14 (Controller.prototype.removeVideoListeners): Stop listening to same. 15 (Controller.prototype.handleAudioTrackChange): Call this.updateHasAudio() 16 (Controller.prototype.handleAudioTrackAdd): Ditto. 17 (Controller.prototype.handleAudioTrackRemove): Ditto. 18 (Controller.prototype.updateHasAudio): Hide the volume controls if no 19 audioTracks are present, and vice versa. 20 1 21 2013-09-30 Jer Noble <jer.noble@apple.com> 2 22 -
trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js
r156546 r156656 26 26 this.updateCaptionContainer(); 27 27 this.updateVolume(); 28 this.updateHasAudio(); 28 29 }; 29 30 … … 113 114 this.listenFor(this.video.textTracks, 'removetrack', this.handleTextTrackRemove); 114 115 116 /* audio tracks */ 117 this.listenFor(this.video.audioTracks, 'change', this.updateHasAudio); 118 this.listenFor(this.video.audioTracks, 'addtrack', this.updateHasAudio); 119 this.listenFor(this.video.audioTracks, 'removetrack', this.updateHasAudio); 120 115 121 /* controls attribute */ 116 122 this.controlsObserver = new MutationObserver(this.handleControlsChange.bind(this)); … … 128 134 this.stopListeningFor(this.video.textTracks, 'addtrack', this.handleTextTrackAdd); 129 135 this.stopListeningFor(this.video.textTracks, 'removetrack', this.handleTextTrackRemove); 136 137 /* audio tracks */ 138 this.stopListeningFor(this.video.audioTracks, 'change', this.updateHasAudio); 139 this.stopListeningFor(this.video.audioTracks, 'addtrack', this.updateHasAudio); 140 this.stopListeningFor(this.video.audioTracks, 'removetrack', this.updateHasAudio); 130 141 131 142 /* controls attribute */ … … 915 926 }, 916 927 928 updateHasAudio: function() 929 { 930 if (this.video.audioTracks.length) 931 this.controls.muteBox.classList.remove(this.ClassNames.hidden); 932 else 933 this.controls.muteBox.classList.add(this.ClassNames.hidden); 934 }, 935 917 936 updateVolume: function() 918 937 {
Note: See TracChangeset
for help on using the changeset viewer.