Changeset 213920 in webkit
- Timestamp:
- Mar 14, 2017 11:29:14 AM (7 years ago)
- Location:
- trunk
- Files:
-
- 3 added
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r213919 r213920 1 2017-03-14 Antoine Quint <graouts@apple.com> 2 3 [Modern Media Controls] Fullscreen controls during Live Broadcast is completely broken 4 https://bugs.webkit.org/show_bug.cgi?id=169354 5 <rdar://problem/30636370> 6 7 Reviewed by Dean Jackson. 8 9 Add a new test, skipped on iOS, to check scrubbing controls are disabled in fullscreen 10 for a Live Broadcast video and that the status label is visible. We also rebaseline a 11 couple of tests now that the time control is added on first layout instead of inside 12 the constructor. 13 14 * http/tests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-live-broadcast-expected.txt: Added. 15 * http/tests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-live-broadcast.html: Added. 16 * media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-constructor-expected.txt: 17 * media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-constructor.html: 18 * media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-time-control-styles-expected.txt: 19 * media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-time-control-styles.html: 20 * platform/ios-simulator/TestExpectations: 21 1 22 2017-03-14 Ryan Haddad <ryanhaddad@apple.com> 2 23 -
trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-constructor-expected.txt
r212280 r213920 9 9 10 10 Controls bar 11 PASS mediaControls.controlsBar.children.length is 511 PASS mediaControls.controlsBar.children.length is 4 12 12 PASS mediaControls.controlsBar.children[1] instanceof ButtonsContainer is true 13 13 PASS mediaControls.controlsBar.children[2] instanceof ButtonsContainer is true 14 14 PASS mediaControls.controlsBar.children[3] instanceof ButtonsContainer is true 15 PASS mediaControls.controlsBar.children[4] is mediaControls.timeControl16 15 17 16 Left container -
trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-constructor.html
r212280 r213920 14 14 debug(""); 15 15 debug("Controls bar"); 16 shouldBe("mediaControls.controlsBar.children.length", " 5");16 shouldBe("mediaControls.controlsBar.children.length", "4"); 17 17 shouldBeTrue("mediaControls.controlsBar.children[1] instanceof ButtonsContainer"); 18 18 shouldBeTrue("mediaControls.controlsBar.children[2] instanceof ButtonsContainer"); 19 19 shouldBeTrue("mediaControls.controlsBar.children[3] instanceof ButtonsContainer"); 20 shouldBe("mediaControls.controlsBar.children[4]", "mediaControls.timeControl");21 20 22 21 debug(""); -
trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-time-control-styles-expected.txt
r212280 r213920 4 4 5 5 6 PASS window.getComputedStyle(mediaControls.timeControl.element).width became "457px" 6 7 PASS window.getComputedStyle(mediaControls.timeControl.element).left is "10px" 7 8 PASS window.getComputedStyle(mediaControls.timeControl.element).top is "48px" 8 PASS window.getComputedStyle(mediaControls.timeControl.element).width is "457px"9 9 PASS window.getComputedStyle(mediaControls.timeControl.scrubber.element).top is "-3px" 10 10 PASS window.getComputedStyle(mediaControls.timeControl.elapsedTimeLabel.element).fontSize is "12px" -
trunk/LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-time-control-styles.html
r212280 r213920 10 10 11 11 const mediaControls = new MacOSFullscreenMediaControls; 12 document.body.appendChild(mediaControls.element); 12 13 13 scheduler.frameDidFire = function() 14 { 15 document.body.appendChild(mediaControls.element); 16 14 shouldBecomeEqualToString("window.getComputedStyle(mediaControls.timeControl.element).width", "457px", () => { 17 15 shouldBeEqualToString("window.getComputedStyle(mediaControls.timeControl.element).left", "10px"); 18 16 shouldBeEqualToString("window.getComputedStyle(mediaControls.timeControl.element).top", "48px"); 19 shouldBeEqualToString("window.getComputedStyle(mediaControls.timeControl.element).width", "457px");20 17 shouldBeEqualToString("window.getComputedStyle(mediaControls.timeControl.scrubber.element).top", "-3px"); 21 18 shouldBeEqualToString("window.getComputedStyle(mediaControls.timeControl.elapsedTimeLabel.element).fontSize", "12px"); … … 26 23 27 24 finishMediaControlsTest(); 28 } ;25 }); 29 26 30 27 </script> -
trunk/LayoutTests/platform/ios-simulator/TestExpectations
r213878 r213920 2810 2810 media/modern-media-controls/controls-visibility-support/controls-visibility-support-fullscreen-on-video.html [ Skip ] 2811 2811 media/modern-media-controls/controls-visibility-support/controls-visibility-support-fullscreen-on-parent-element.html [ Skip ] 2812 http/tests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-live-broadcast.html [ Skip ] 2812 2813 2813 2814 # These tests are macOS-specific or mouse-specific -
trunk/Source/WebCore/ChangeLog
r213917 r213920 1 2017-03-14 Antoine Quint <graouts@apple.com> 2 3 [Modern Media Controls] Fullscreen controls during Live Broadcast is completely broken 4 https://bugs.webkit.org/show_bug.cgi?id=169354 5 <rdar://problem/30636370> 6 7 Reviewed by Dean Jackson. 8 9 When playing a Live Broadcast video in fullscreen, we should not show any scrubbing-related 10 piece of UI and ensure that we show the status label. 11 12 Test: http/tests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-live-broadcast.html 13 14 * Modules/modern-media-controls/controls/macos-fullscreen-media-controls.css: 15 (.media-controls.mac.fullscreen > .controls-bar .status-label): 16 * Modules/modern-media-controls/controls/macos-fullscreen-media-controls.js: 17 (MacOSFullscreenMediaControls.prototype.layout): 18 * Modules/modern-media-controls/media/seek-support.js: 19 (SeekSupport.prototype.get mediaEvents): 20 (SeekSupport.prototype.syncControl): 21 1 22 2017-03-14 Joseph Pecoraro <pecoraro@apple.com> 2 23 -
trunk/Source/WebCore/Modules/modern-media-controls/controls/macos-fullscreen-media-controls.css
r213641 r213920 118 118 top: -3px; 119 119 } 120 121 /* Status Label */ 122 123 .media-controls.mac.fullscreen > .controls-bar .status-label { 124 position: absolute; 125 left: 0; 126 right: 0; 127 bottom: 13px; 128 text-align: center; 129 } -
trunk/Source/WebCore/Modules/modern-media-controls/controls/macos-fullscreen-media-controls.js
r213641 r213920 72 72 }); 73 73 74 this.controlsBar.children = [new BackgroundTint, this._leftContainer, this._centerContainer, this._rightContainer , this.timeControl];74 this.controlsBar.children = [new BackgroundTint, this._leftContainer, this._centerContainer, this._rightContainer]; 75 75 76 76 this.controlsBar.element.addEventListener("mousedown", this); … … 109 109 this._rightContainer.layout(); 110 110 111 this.timeControl.width = FullscreenTimeControlWidth; 111 if (this.statusLabel.enabled && this.statusLabel.parent !== this.controlsBar) { 112 this.timeControl.remove(); 113 this.controlsBar.addChild(this.statusLabel); 114 } else if (!this.statusLabel.enabled && this.timeControl.parent !== this.controlsBar) { 115 this.statusLabel.remove(); 116 this.controlsBar.addChild(this.timeControl); 117 this.timeControl.width = FullscreenTimeControlWidth; 118 } 112 119 } 113 120 -
trunk/Source/WebCore/Modules/modern-media-controls/media/seek-support.js
r209271 r213920 29 29 // Protected 30 30 31 get mediaEvents() 32 { 33 return ["durationchange"]; 34 } 35 31 36 get multiplier() 32 37 { … … 40 45 else 41 46 this._stopSeeking(); 47 } 48 49 syncControl() 50 { 51 this.control.enabled = this.mediaController.media.duration !== Number.POSITIVE_INFINITY; 42 52 } 43 53
Note: See TracChangeset
for help on using the changeset viewer.