Changeset 211986 in webkit
- Timestamp:
- Feb 9, 2017 1:31:35 PM (7 years ago)
- Location:
- trunk
- Files:
-
- 2 deleted
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r211985 r211986 1 2017-02-09 Ryan Haddad <ryanhaddad@apple.com> 2 3 Unreviewed, rolling out r211802. 4 5 This change caused fast/regions/inline-block-inside-anonymous- 6 overflow-with-covered-controls.html to be a flaky failure. 7 8 Reverted changeset: 9 10 "[Modern Media Controls] Improve handling of <video> with only 11 audio tracks" 12 https://bugs.webkit.org/show_bug.cgi?id=167836 13 http://trac.webkit.org/changeset/211802 14 1 15 2017-02-09 Ryan Haddad <ryanhaddad@apple.com> 2 16 -
trunk/LayoutTests/fast/regions/inline-block-inside-anonymous-overflow-with-covered-controls-expected.html
r211802 r211986 1 <!DOCTYPE html> <!-- webkit-test-runner [ enableModernMediaControls=false ] -->1 <!DOCTYPE html> 2 2 <html> 3 3 <head> … … 45 45 <div class="region" id="region1"> 46 46 <div class="article" id="article1"> 47 <video id="video" src="../../media/content/test.mp4"controls></video><span style="color:#00FF00">47 <video id="video" controls></video><span style="color:#00FF00"> 48 48 </div> 49 49 </div> -
trunk/LayoutTests/fast/regions/inline-block-inside-anonymous-overflow-with-covered-controls.html
r211802 r211986 1 <!DOCTYPE html> <!-- webkit-test-runner [ enableModernMediaControls=false ] -->1 <!DOCTYPE html> 2 2 <html> 3 3 <head> … … 45 45 <div class="region" id="region2"></div> 46 46 <div id="article"> 47 <video id="video" src="../../media/content/test.mp4"controls></video><span style="color:#00FF00">This text, together with the video element, are inside an anonymouse block</span>47 <video id="video" controls></video><span style="color:#00FF00">This text, together with the video element, are inside an anonymouse block</span> 48 48 <div id="after" style="color:blue">This div is after the anonymous block</div> 49 49 </div> -
trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-on-expected.txt
r211802 r211986 4 4 5 5 6 Media has not begun loading yet 7 PASS mediaController.controls.controlsBar.visible is false 8 PASS mediaController.controls.startButton.visible is false 6 9 7 10 Media has loaded metadata 8 PASS media.videoTracks.length is 19 11 PASS mediaController.controls.controlsBar.visible is true 10 12 PASS mediaController.controls.startButton.visible is true -
trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-on.html
r211802 r211986 14 14 const mediaController = createControls(shadowRoot, media, null); 15 15 16 debug("Media has not begun loading yet"); 17 shouldBeFalse("mediaController.controls.controlsBar.visible"); 18 shouldBeFalse("mediaController.controls.startButton.visible"); 19 16 20 media.addEventListener("loadedmetadata", function() { 17 21 debug(""); 18 22 debug("Media has loaded metadata"); 19 shouldBe("media.videoTracks.length", "1");20 23 shouldBeTrue("mediaController.controls.controlsBar.visible"); 21 24 shouldBeTrue("mediaController.controls.startButton.visible"); -
trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-toggle-expected.txt
r211802 r211986 4 4 5 5 6 Media has not begun loading yet 7 PASS mediaController.controls.controlsBar.visible is false 8 PASS mediaController.controls.startButton.visible is false 6 9 7 10 Media has loaded metadata 8 PASS media.videoTracks.length is 19 11 PASS mediaController.controls.controlsBar.visible is true 10 12 PASS mediaController.controls.startButton.visible is true -
trunk/LayoutTests/media/modern-media-controls/controls-visibility-support/controls-visibility-support-controls-toggle.html
r211802 r211986 36 36 }).observe(media, { attributes: true, attributeFilter: ["controls"] }); 37 37 38 debug("Media has not begun loading yet"); 39 shouldBeFalse("mediaController.controls.controlsBar.visible"); 40 shouldBeFalse("mediaController.controls.startButton.visible"); 41 38 42 media.addEventListener("loadedmetadata", function() { 39 43 debug(""); 40 44 debug("Media has loaded metadata"); 41 shouldBe("media.videoTracks.length", "1");42 45 shouldBeTrue("mediaController.controls.controlsBar.visible"); 43 46 shouldBeTrue("mediaController.controls.startButton.visible"); -
trunk/LayoutTests/media/modern-media-controls/time-label/time-label-white-space-nowrap.html
r211802 r211986 15 15 media.pause(); 16 16 17 window.requestAnimationFrame(() => { 18 timeLabel = window.internals.shadowRoot(media).querySelector(".time-label"); 19 shouldBeEqualToString("timeLabel.ownerDocument.defaultView.getComputedStyle(timeLabel).whiteSpace", "nowrap"); 17 timeLabel = window.internals.shadowRoot(media).querySelector(".time-label"); 18 shouldBeEqualToString("timeLabel.ownerDocument.defaultView.getComputedStyle(timeLabel).whiteSpace", "nowrap"); 20 19 21 debug(""); 22 media.remove(); 23 finishJSTest(); 24 }); 20 debug(""); 21 media.remove(); 22 finishJSTest(); 25 23 }); 26 24 -
trunk/Source/WebCore/ChangeLog
r211981 r211986 1 2017-02-09 Ryan Haddad <ryanhaddad@apple.com> 2 3 Unreviewed, rolling out r211802. 4 5 This change caused fast/regions/inline-block-inside-anonymous- 6 overflow-with-covered-controls.html to be a flaky failure. 7 8 Reverted changeset: 9 10 "[Modern Media Controls] Improve handling of <video> with only 11 audio tracks" 12 https://bugs.webkit.org/show_bug.cgi?id=167836 13 http://trac.webkit.org/changeset/211802 14 1 15 2017-02-09 Alex Christensen <achristensen@webkit.org> 2 16 -
trunk/Source/WebCore/Modules/modern-media-controls/media/controls-visibility-support.js
r211802 r211986 49 49 } 50 50 51 get tracksToMonitor()52 {53 return [this.mediaController.media.videoTracks];54 }55 56 51 handleEvent() 57 52 { … … 64 59 { 65 60 const media = this.mediaController.media; 66 const isVideo = media instanceof HTMLVideoElement && media.videoTracks.length > 0;61 const isVideo = media instanceof HTMLVideoElement; 67 62 let shouldShowControls = this.mediaController.media.controls; 68 63 if (isVideo) -
trunk/Source/WebCore/Modules/modern-media-controls/media/fullscreen-support.js
r211802 r211986 70 70 const control = this.control; 71 71 const media = this.mediaController.media; 72 control.enabled = media.webkitSupportsFullscreen && media.videoTracks.length > 0;72 control.enabled = media.webkitSupportsFullscreen; 73 73 control.isFullScreen = media.webkitDisplayingFullscreen; 74 74 }
Note: See TracChangeset
for help on using the changeset viewer.