Skip to content

Conversation

@Phinny01
Copy link
Contributor

@Phinny01 Phinny01 commented Oct 18, 2025

faf6036

Mac full screen media controls do no match AVKit floating controls
https://bugs.webkit.org/show_bug.cgi?id=301025
rdar://162909216

Reviewed by Andy Estes.

Update macOS inline media controls to match AVKit's floating controls design. Increase bottom
control bar height and slider heights. Replace circular and bar shaped slider thumbs with
pill-shaped design for both time control scrubber and volume slider.

* LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-drag-is-prevented-over-button-expected.txt:
* LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-drag-is-prevented-over-button.html:
* LayoutTests/platform/mac-sonoma-wk1/imported/w3c/web-platform-tests/media-source/mediasource-seek-during-pending-seek-expected.txt:
* Source/WebCore/Modules/modern-media-controls/controls/macos-fullscreen-media-controls.css:
(.media-controls.mac.fullscreen .buttons-container.left):
(.media-controls.mac.fullscreen .buttons-container.left .slider):
* Source/WebCore/Modules/modern-media-controls/controls/macos-fullscreen-media-controls.js:
(MacOSFullscreenMediaControls.prototype._handleMousedown):
* Source/WebCore/rendering/cocoa/RenderThemeCocoa.mm:
(WebCore::macOSFullscreenMediaControlsStyleSheet):
(WebCore::RenderThemeCocoa::mediaControlsStyleSheets):

Canonical link: https://commits.webkit.org/303335@main

ff96b58

Misc iOS, visionOS, tvOS & watchOS macOS Linux Windows Apple Internal
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 win loading 🛠 ios-apple
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug ✅ 🧪 wpe-wk2 🧪 win-tests ✅ 🛠 mac-apple
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 ✅ 🧪 api-mac ✅ 🧪 api-wpe ✅ 🛠 vision-apple
✅ 🧪 ios-wk2-wpt 🧪 api-mac-debug ✅ 🛠 wpe-cairo
✅ 🧪 api-ios ✅ 🧪 mac-wk1 ✅ 🛠 gtk
✅ 🛠 vision ✅ 🧪 mac-wk2 ✅ 🧪 gtk-wk2
✅ 🛠 vision-sim ✅ 🧪 mac-AS-debug-wk2 ✅ 🧪 api-gtk
✅ 🛠 🧪 merge ✅ 🧪 vision-wk2 ✅ 🧪 mac-wk2-stress 🛠 playstation
✅ 🛠 tv ✅ 🧪 mac-intel-wk2
✅ 🛠 tv-sim ✅ 🛠 mac-safer-cpp
✅ 🛠 watch
✅ 🛠 watch-sim

@Phinny01 Phinny01 self-assigned this Oct 18, 2025
@Phinny01 Phinny01 added the Media Bugs related to the HTML 5 Media elements. label Oct 18, 2025
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Oct 18, 2025
@Phinny01 Phinny01 removed the merging-blocked Applied to prevent a change from being merged label Oct 18, 2025
@Phinny01 Phinny01 force-pushed the eng/Mac-full-screen-media-controls-do-no-match-AVKit-floating-controls branch from 11ef94a to 6a58589 Compare October 18, 2025 08:13
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Oct 18, 2025
@Phinny01 Phinny01 removed the merging-blocked Applied to prevent a change from being merged label Oct 20, 2025
@Phinny01 Phinny01 force-pushed the eng/Mac-full-screen-media-controls-do-no-match-AVKit-floating-controls branch from 6a58589 to d5d5612 Compare October 20, 2025 22:34
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Oct 21, 2025
@Phinny01 Phinny01 removed the merging-blocked Applied to prevent a change from being merged label Oct 21, 2025
@Phinny01 Phinny01 force-pushed the eng/Mac-full-screen-media-controls-do-no-match-AVKit-floating-controls branch from d5d5612 to 5796eca Compare October 21, 2025 21:24
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Oct 22, 2025
@Phinny01 Phinny01 removed the merging-blocked Applied to prevent a change from being merged label Oct 22, 2025
@Phinny01 Phinny01 force-pushed the eng/Mac-full-screen-media-controls-do-no-match-AVKit-floating-controls branch from 5796eca to 19231d9 Compare October 22, 2025 22:45
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Oct 23, 2025
@Phinny01
Copy link
Contributor Author

I don't think the tests failing are related to my changes

@Phinny01 Phinny01 requested a review from aestes October 23, 2025 18:49
@Phinny01 Phinny01 removed the merging-blocked Applied to prevent a change from being merged label Nov 3, 2025
@Phinny01 Phinny01 force-pushed the eng/Mac-full-screen-media-controls-do-no-match-AVKit-floating-controls branch from 19231d9 to 1305802 Compare November 3, 2025 20:11
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Nov 3, 2025
@aestes aestes added merge-queue Applied to send a pull request to merge-queue and removed merging-blocked Applied to prevent a change from being merged labels Nov 5, 2025
@webkit-commit-queue
Copy link
Collaborator

Commit message contains (OOPS!), blocking PR #52600. Details: Build #27273

@webkit-commit-queue webkit-commit-queue added merging-blocked Applied to prevent a change from being merged and removed merge-queue Applied to send a pull request to merge-queue labels Nov 5, 2025
@aestes aestes added merge-queue Applied to send a pull request to merge-queue and removed merging-blocked Applied to prevent a change from being merged labels Nov 5, 2025
@webkit-commit-queue
Copy link
Collaborator

Commit message contains (OOPS!), blocking PR #52600. Details: Build #27277

@webkit-commit-queue webkit-commit-queue added merging-blocked Applied to prevent a change from being merged and removed merge-queue Applied to send a pull request to merge-queue labels Nov 5, 2025
@aestes aestes added merge-queue Applied to send a pull request to merge-queue and removed merging-blocked Applied to prevent a change from being merged labels Nov 5, 2025
@webkit-commit-queue
Copy link
Collaborator

Commit message contains (OOPS!), blocking PR #52600. Details: Build #27279

@webkit-commit-queue webkit-commit-queue added merging-blocked Applied to prevent a change from being merged and removed merge-queue Applied to send a pull request to merge-queue labels Nov 5, 2025
@Phinny01 Phinny01 removed the merging-blocked Applied to prevent a change from being merged label Nov 20, 2025
@Phinny01 Phinny01 force-pushed the eng/Mac-full-screen-media-controls-do-no-match-AVKit-floating-controls branch from 1305802 to ff96b58 Compare November 20, 2025 08:06
@jernoble jernoble added the merge-queue Applied to send a pull request to merge-queue label Nov 20, 2025
https://bugs.webkit.org/show_bug.cgi?id=301025
rdar://162909216

Reviewed by Andy Estes.

Update macOS inline media controls to match AVKit's floating controls design. Increase bottom
control bar height and slider heights. Replace circular and bar shaped slider thumbs with
pill-shaped design for both time control scrubber and volume slider.

* LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-drag-is-prevented-over-button-expected.txt:
* LayoutTests/media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-drag-is-prevented-over-button.html:
* LayoutTests/platform/mac-sonoma-wk1/imported/w3c/web-platform-tests/media-source/mediasource-seek-during-pending-seek-expected.txt:
* Source/WebCore/Modules/modern-media-controls/controls/macos-fullscreen-media-controls.css:
(.media-controls.mac.fullscreen .buttons-container.left):
(.media-controls.mac.fullscreen .buttons-container.left .slider):
* Source/WebCore/Modules/modern-media-controls/controls/macos-fullscreen-media-controls.js:
(MacOSFullscreenMediaControls.prototype._handleMousedown):
* Source/WebCore/rendering/cocoa/RenderThemeCocoa.mm:
(WebCore::macOSFullscreenMediaControlsStyleSheet):
(WebCore::RenderThemeCocoa::mediaControlsStyleSheets):

Canonical link: https://commits.webkit.org/303335@main
@webkit-commit-queue webkit-commit-queue force-pushed the eng/Mac-full-screen-media-controls-do-no-match-AVKit-floating-controls branch from ff96b58 to faf6036 Compare November 20, 2025 19:09
@webkit-commit-queue
Copy link
Collaborator

Committed 303335@main (faf6036): https://commits.webkit.org/303335@main

Reviewed commits have been landed. Closing PR #52600 and removing active labels.

@webkit-commit-queue webkit-commit-queue merged commit faf6036 into WebKit:main Nov 20, 2025
@webkit-commit-queue webkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label Nov 20, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Media Bugs related to the HTML 5 Media elements.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants