Changeset 213115 in webkit
- Timestamp:
- Feb 27, 2017 7:24:37 PM (7 years ago)
- Location:
- trunk
- Files:
-
- 8 deleted
- 15 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r213113 r213115 1 2017-02-27 Antoine Quint <graouts@apple.com> 2 3 [Modern Media Controls] Use compact mode by default on macOS 4 https://bugs.webkit.org/show_bug.cgi?id=168958 5 <rdar://problem/30748638> 6 7 Reviewed by Jon Lee. 8 9 Rebaseline tests to account for compact mode being the default mode for macOS 10 and remove tests that would check dynamically applying compact mode at some 11 threshold and the reduced padding mode. 12 13 * media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-compact-expected.txt: 14 * media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-compact.html: 15 * media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-reduced-padding-expected.txt: Removed. 16 * media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-reduced-padding.html: Removed. 17 * media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-tight-padding-expected.txt: Removed. 18 * media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-tight-padding.html: Removed. 19 * media/modern-media-controls/media-controller/media-controller-compact.html: 20 * media/modern-media-controls/media-controller/media-controller-fullscreen-change-expected.txt: 21 * media/modern-media-controls/media-controller/media-controller-fullscreen-change.html: 22 * media/modern-media-controls/media-controller/media-controller-reduced-padding-expected.txt: Removed. 23 * media/modern-media-controls/media-controller/media-controller-reduced-padding.html: Removed. 24 * media/modern-media-controls/media-controller/media-controller-toggle-compact-mode-expected.txt: Removed. 25 * media/modern-media-controls/media-controller/media-controller-toggle-compact-mode.html: Removed. 26 * platform/mac/TestExpectations: 27 1 28 2017-02-27 Antoine Quint <graouts@apple.com> 2 29 -
trunk/LayoutTests/media/modern-media-controls/ios-inline-media-controls/ios-inline-media-controls-tight-padding.html
r213113 r213115 7 7 description("Testing <code>IOSInlineMediaControls</code> with tight padding."); 8 8 9 const mediaControls = new MacOSInlineMediaControls({ width: 400 });9 const mediaControls = new IOSInlineMediaControls({ width: 400 }); 10 10 mediaControls.layoutTraits = LayoutTraits.iOS | LayoutTraits.TightPadding; 11 11 -
trunk/LayoutTests/media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-compact-expected.txt
r211904 r213115 5 5 6 6 PASS mediaControls.element.classList.contains('compact') is true 7 PASS mediaControls.rightContainer.buttons is [mediaControls.muteButton, mediaControls.fullscreenButton]8 7 PASS mediaControls.leftContainer.leftMargin is 8 9 8 PASS mediaControls.leftContainer.rightMargin is 12 -
trunk/LayoutTests/media/modern-media-controls/macos-inline-media-controls/macos-inline-media-controls-compact.html
r211904 r213115 11 11 12 12 shouldBeTrue("mediaControls.element.classList.contains('compact')"); 13 shouldBe("mediaControls.rightContainer.buttons", "[mediaControls.muteButton, mediaControls.fullscreenButton]");14 13 shouldBe("mediaControls.leftContainer.leftMargin", "8"); 15 14 shouldBe("mediaControls.leftContainer.rightMargin", "12"); -
trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-compact.html
r212943 r213115 7 7 left: 0; 8 8 top: 0; 9 width: 240px;10 height: 180px;9 width: 800px; 10 height: 600px; 11 11 } 12 12 -
trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-fullscreen-change-expected.txt
r208537 r213115 9 9 10 10 Media exited fullscreen 11 PASS mediaController.layoutTraits is LayoutTraits.macOS 11 PASS mediaController.layoutTraits is LayoutTraits.macOS | LayoutTraits.Compact 12 12 PASS mediaController.controls instanceof MacOSInlineMediaControls is true 13 13 -
trunk/LayoutTests/media/modern-media-controls/media-controller/media-controller-fullscreen-change.html
r208537 r213115 47 47 } else { 48 48 debug("Media exited fullscreen"); 49 shouldBe("mediaController.layoutTraits", "LayoutTraits.macOS ");49 shouldBe("mediaController.layoutTraits", "LayoutTraits.macOS | LayoutTraits.Compact"); 50 50 shouldBeTrue("mediaController.controls instanceof MacOSInlineMediaControls"); 51 51 -
trunk/LayoutTests/platform/mac/TestExpectations
r213109 r213115 1478 1478 media/modern-media-controls/media-controller/media-controller-ios-only-enable-tap-gesture-recognizer-with-fades-when-idle.html [ Skip ] 1479 1479 media/modern-media-controls/media-controller/media-controller-ios-do-not-hide-controls-when-tapping-button.html [ Skip ] 1480 media/modern-media-controls/media-controller/media-controller-tight-padding.html [ Skip ] 1480 1481 1481 1482 # This one always times out on the bots, cannot reproduce locally. -
trunk/Source/WebCore/ChangeLog
r213113 r213115 1 2017-02-27 Antoine Quint <graouts@apple.com> 2 3 [Modern Media Controls] Use compact mode by default on macOS 4 https://bugs.webkit.org/show_bug.cgi?id=168958 5 <rdar://problem/30748638> 6 7 Reviewed by Jon Lee. 8 9 We now use the compact layout mode by default on macOS. 10 11 * Modules/modern-media-controls/controls/layout-item.js: Remove the ReducedPadding trait. 12 * Modules/modern-media-controls/controls/macos-compact-inline-media-controls.css: 13 (.media-controls.mac.inline.compact .time-label,): Vertically align the time label with 14 the scrubber in compact mode. 15 (.media-controls.mac.inline.compact .scrubber.slider): Correctly position the scrubber in 16 compact mode so that it's vertically aligned. 17 * Modules/modern-media-controls/controls/macos-inline-media-controls.js: 18 (MacOSInlineMediaControls.prototype.layoutTraitsDidChange): Remove handling of tight and 19 reduced padding traits since these do not apply to macOS anymore. We also notify the 20 scrubber of a layout trait change so that it may adjust its height. 21 * Modules/modern-media-controls/controls/scrubber.js: 22 (Scrubber): 23 (Scrubber.prototype.layoutTraitsDidChange): Adjust the height of the scrubber to match 24 compact layout traits. 25 * Modules/modern-media-controls/controls/time-control.js: 26 (TimeControl.prototype.get isSufficientlyWide): Adjust the minimum scrubber width for 27 TimeControl visibility to match compact layout traits. 28 * Modules/modern-media-controls/media/media-controller.js: 29 (MediaController.prototype.get layoutTraits): Use the compact layout trait by default 30 on macOS and make the tight padding specific to iOS. 31 1 32 2017-02-27 Antoine Quint <graouts@apple.com> 2 33 -
trunk/Source/WebCore/Modules/modern-media-controls/controls/layout-item.js
r211904 r213115 30 30 Fullscreen : 1 << 2, 31 31 Compact : 1 << 3, 32 ReducedPadding : 1 << 4, 33 TightPadding : 1 << 5 32 TightPadding : 1 << 4 34 33 }; 35 34 -
trunk/Source/WebCore/Modules/modern-media-controls/controls/macos-compact-inline-media-controls.css
r212280 r213115 40 40 } 41 41 42 .media-controls.mac.inline.compact .scrubber.slider {43 top: 12px;44 }45 46 42 .media-controls.mac.inline.compact button.mute { 47 43 -webkit-mask-position-y: 6px; … … 56 52 .media-controls.mac.inline.compact .time-label, 57 53 .media-controls.mac.inline.compact .status-label { 54 top: 4px; 55 font-size: 12px; 56 } 57 58 /* Scrubber */ 59 60 .media-controls.mac.inline.compact .scrubber.slider { 58 61 top: 5px; 59 font-size: 12px;60 62 } 61 63 -
trunk/Source/WebCore/Modules/modern-media-controls/controls/macos-inline-media-controls.js
r213113 r213115 41 41 42 42 this.rightContainer = new ButtonsContainer({ 43 buttons: [this.muteButton, this.airplayButton, this.pipButton, this.tracksButton, this.fullscreenButton], 43 44 cssClassName: "right" 44 45 }); … … 116 117 this.rightContainer.rightMargin = 8; 117 118 this.rightContainer.buttonMargin = 12; 118 } else if (layoutTraits & LayoutTraits.TightPadding) {119 this.leftContainer.leftMargin = 12;120 this.leftContainer.rightMargin = 12;121 this.leftContainer.buttonMargin = 12;122 this.rightContainer.leftMargin = 12;123 this.rightContainer.rightMargin = 12;124 this.rightContainer.buttonMargin = 12;125 } else if (layoutTraits & LayoutTraits.ReducedPadding) {126 this.leftContainer.leftMargin = 12;127 this.leftContainer.rightMargin = 16;128 this.leftContainer.buttonMargin = 16;129 this.rightContainer.leftMargin = 0;130 this.rightContainer.rightMargin = 12;131 this.rightContainer.buttonMargin = 16;132 119 } else { 133 120 this.leftContainer.leftMargin = 24; … … 139 126 } 140 127 141 if (layoutTraits & LayoutTraits.Compact)142 this.rightContainer.buttons = [this.muteButton, this.fullscreenButton];143 else144 this.rightContainer.buttons = [this.muteButton, this.airplayButton, this.pipButton, this.tracksButton, this.fullscreenButton];145 146 128 this.leftContainer.buttons.forEach(button => button.layoutTraitsDidChange()); 147 129 this.rightContainer.buttons.forEach(button => button.layoutTraitsDidChange()); 130 this.timeControl.scrubber.layoutTraitsDidChange(); 148 131 149 132 this.element.classList.toggle("compact", layoutTraits & LayoutTraits.Compact); -
trunk/Source/WebCore/Modules/modern-media-controls/controls/scrubber.js
r212280 r213115 34 34 }); 35 35 36 this.height = 23;36 this.layoutTraitsDidChange(); 37 37 38 38 // Add the element used to draw the track on iOS. … … 57 57 this._buffered = buffered; 58 58 this.needsLayout = true; 59 } 60 61 layoutTraitsDidChange() 62 { 63 this.height = (this.layoutTraits & LayoutTraits.Compact) ? 15 : 23; 59 64 } 60 65 -
trunk/Source/WebCore/Modules/modern-media-controls/controls/time-control.js
r212280 r213115 24 24 */ 25 25 26 const MinimumScrubberWidth = 168; 26 const MinimumScrubberWidthDefault = 168; 27 const MinimumScrubberWidthCompact = 124; 27 28 const ElapsedTimeLabelLeftMargin = -2; 28 29 const ElapsedTimeLabelWidth = 40; … … 88 89 get isSufficientlyWide() 89 90 { 90 return this.scrubber.width >= MinimumScrubberWidth;91 return this.scrubber.width >= ((this.layoutTraits & LayoutTraits.Compact) ? MinimumScrubberWidthCompact : MinimumScrubberWidthDefault); 91 92 } 92 93 -
trunk/Source/WebCore/Modules/modern-media-controls/media/media-controller.js
r212980 r213115 24 24 */ 25 25 26 const CompactModeMaxWidth = 241;27 const ReducedPaddingMaxWidth = 300;28 26 const AudioTightPaddingMaxWidth = 400; 29 27 … … 75 73 return traits | LayoutTraits.Fullscreen; 76 74 77 const controlsWidth = this._controlsWidth(); 78 if (controlsWidth <= CompactModeMaxWidth) 75 if (traits & LayoutTraits.macOS) 79 76 return traits | LayoutTraits.Compact; 80 77 81 const isAudio = this.isAudio; 82 if (isAudio && controlsWidth <= AudioTightPaddingMaxWidth) 78 if (this.isAudio && this._controlsWidth() <= AudioTightPaddingMaxWidth) 83 79 return traits | LayoutTraits.TightPadding; 84 85 if (!isAudio && controlsWidth <= ReducedPaddingMaxWidth)86 return traits | LayoutTraits.ReducedPadding;87 80 88 81 return traits;
Note: See TracChangeset
for help on using the changeset viewer.