Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Videos in in-window mode should have their WebKitPresentationMode property set to inline #28862

Merged
merged 1 commit into from
May 22, 2024
Merged

Videos in in-window mode should have their WebKitPresentationMode property set to inline #28862

merged 1 commit into from
May 22, 2024

Conversation

danae404
Copy link
Contributor

@danae404 danae404 commented May 21, 2024 •
edited by webkit-early-warning-system
Loading

ac7aecf

Videos in in-window mode should have their WebKitPresentationMode property set to inline
https://bugs.webkit.org/show_bug.cgi?id=274477
rdar://128482499

Reviewed by Jer Noble.

This fix adds a method HTMLVideoElement::webkitPresentationModeForBindings(). The
default media controls now consult MediaControlsHost::inWindowFullscreen() to
determine that a video is in in-window mode.

* Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp:
(WebCore::MediaControlsHost::inWindowFullscreen const):
* Source/WebCore/Modules/mediacontrols/MediaControlsHost.h:
* Source/WebCore/Modules/mediacontrols/MediaControlsHost.idl:
* Source/WebCore/Modules/modern-media-controls/media/media-controller.js:
(MediaController.prototype.get isFullscreen):
(MediaController.prototype._updateControlsIfNeeded):
* Source/WebCore/html/HTMLVideoElement.cpp:
(WebCore::HTMLVideoElement::webkitPresentationModeForBindings const):
* Source/WebCore/html/HTMLVideoElement.h:
* Source/WebCore/html/HTMLVideoElement.idl:

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

077c1b3

Misc iOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 wincairo
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug ✅ 🧪 wpe-wk2 ✅ 🧪 wincairo-tests
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 ✅ 🧪 api-mac ✅ 🧪 api-wpe
✅ 🧪 ios-wk2-wpt ✅ 🧪 mac-wk1 ✅ 🛠 wpe-cairo
❌ 🧪 api-ios ✅ 🧪 mac-wk2 ✅ 🛠 gtk
✅ 🛠 tv ✅ 🧪 mac-AS-debug-wk2 ✅ 🧪 gtk-wk2
✅ 🛠 tv-sim ✅ 🧪 mac-wk2-stress ✅ 🧪 api-gtk
✅ 🛠 watch
✅ 🛠 🧪 unsafe-merge ✅ 🛠 watch-sim

@danae404 danae404 self-assigned this May 21, 2024
@danae404 danae404 added the Media Bugs related to the HTML 5 Media elements. label May 21, 2024
@webkit-early-warning-system
Copy link
Collaborator

webkit-early-warning-system commented May 21, 2024 •
edited
Loading

EWS run on previous version of this PR (hash 93f9a7d)

Misc iOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ❌ 🛠 wpe ❌ 🛠 wincairo
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug ❌ 🧪 wpe-wk2 ❌ 🧪 wincairo-tests
✅ 🧪 webkitperl ⏳ 🧪 ios-wk2 ✅ 🧪 api-mac ❌ 🧪 api-wpe
⏳ 🧪 ios-wk2-wpt ✅ 🧪 mac-wk1 ❌ 🛠 wpe-cairo
⏳ 🧪 api-ios ✅ 🧪 mac-wk2 ❌ 🛠 gtk
✅ 🛠 tv   🧪 mac-AS-debug-wk2 ❌ 🧪 gtk-wk2
  🛠 tv-sim ✅ 🧪 mac-wk2-stress ❌ 🧪 api-gtk
  🛠 watch
✅ 🛠 watch-sim

@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label May 21, 2024
@danae404 danae404 removed the merging-blocked Applied to prevent a change from being merged label May 21, 2024
@danae404 danae404 force-pushed the eng/videos-in-in-window-mode-should-have-their-WebKitPresentationMode-property-set-to-inline branch from 93f9a7d to 8d0de8a Compare May 21, 2024 19:54
@webkit-early-warning-system
Copy link
Collaborator

webkit-early-warning-system commented May 21, 2024 •
edited
Loading

EWS run on previous version of this PR (hash 8d0de8a)

Misc iOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ❌ 🛠 wpe   🛠 wincairo
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug ❌ 🧪 wpe-wk2   🧪 wincairo-tests
✅ 🧪 webkitperl ⏳ 🧪 ios-wk2 ✅ 🧪 api-mac ❌ 🧪 api-wpe
⏳ 🧪 ios-wk2-wpt ✅ 🧪 mac-wk1 ❌ 🛠 wpe-cairo
⏳ 🧪 api-ios   🧪 mac-wk2 ❌ 🛠 gtk
✅ 🛠 tv loading 🧪 mac-AS-debug-wk2 ❌ 🧪 gtk-wk2
  🛠 tv-sim ✅ 🧪 mac-wk2-stress ❌ 🧪 api-gtk
  🛠 watch
✅ 🛠 watch-sim

@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label May 21, 2024
@danae404 danae404 removed the merging-blocked Applied to prevent a change from being merged label May 21, 2024
@danae404 danae404 force-pushed the eng/videos-in-in-window-mode-should-have-their-WebKitPresentationMode-property-set-to-inline branch from 8d0de8a to 077c1b3 Compare May 21, 2024 20:24
@webkit-early-warning-system
Copy link
Collaborator

webkit-early-warning-system commented May 21, 2024 •
edited
Loading

EWS run on current version of this PR (hash 077c1b3)

Misc iOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 wincairo
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug ✅ 🧪 wpe-wk2 ✅ 🧪 wincairo-tests
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 ✅ 🧪 api-mac ✅ 🧪 api-wpe
✅ 🧪 ios-wk2-wpt ✅ 🧪 mac-wk1 ✅ 🛠 wpe-cairo
❌ 🧪 api-ios ✅ 🧪 mac-wk2 ✅ 🛠 gtk
✅ 🛠 tv ✅ 🧪 mac-AS-debug-wk2 ✅ 🧪 gtk-wk2
✅ 🛠 tv-sim ✅ 🧪 mac-wk2-stress ✅ 🧪 api-gtk
✅ 🛠 watch
✅ 🛠 🧪 unsafe-merge ✅ 🛠 watch-sim

@danae404 danae404 added the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label May 22, 2024
@danae404
Videos in in-window mode should have their WebKitPresentationMode pro…
ac7aecf 
…perty set to inline

https://bugs.webkit.org/show_bug.cgi?id=274477
rdar://128482499

Reviewed by Jer Noble.

This fix adds a method HTMLVideoElement::webkitPresentationModeForBindings(). The
default media controls now consult MediaControlsHost::inWindowFullscreen() to
determine that a video is in in-window mode.

* Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp:
(WebCore::MediaControlsHost::inWindowFullscreen const):
* Source/WebCore/Modules/mediacontrols/MediaControlsHost.h:
* Source/WebCore/Modules/mediacontrols/MediaControlsHost.idl:
* Source/WebCore/Modules/modern-media-controls/media/media-controller.js:
(MediaController.prototype.get isFullscreen):
(MediaController.prototype._updateControlsIfNeeded):
* Source/WebCore/html/HTMLVideoElement.cpp:
(WebCore::HTMLVideoElement::webkitPresentationModeForBindings const):
* Source/WebCore/html/HTMLVideoElement.h:
* Source/WebCore/html/HTMLVideoElement.idl:

Canonical link: https://commits.webkit.org/279143@main
@webkit-commit-queue webkit-commit-queue force-pushed the eng/videos-in-in-window-mode-should-have-their-WebKitPresentationMode-property-set-to-inline branch from 077c1b3 to ac7aecf Compare May 22, 2024 18:52
@webkit-commit-queue
Copy link
Collaborator

Committed 279143@main (ac7aecf): https://commits.webkit.org/279143@main

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

@webkit-commit-queue webkit-commit-queue merged commit ac7aecf into WebKit:main May 22, 2024
@webkit-commit-queue webkit-commit-queue removed the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label May 22, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jernoble jernoble jernoble approved these changes

@cdumez cdumez Awaiting requested review from cdumez cdumez is a code owner

@rniwa rniwa Awaiting requested review from rniwa rniwa is a code owner

@aestes aestes Awaiting requested review from aestes

@eric-carlson eric-carlson Awaiting requested review from eric-carlson

@jyavenard jyavenard Awaiting requested review from jyavenard

Assignees

@danae404 danae404

Labels
Media Bugs related to the HTML 5 Media elements.
Projects
None yet
Milestone
No milestone
5 participants
@danae404 @webkit-early-warning-system @webkit-commit-queue @jernoble @webkit-ews-buildbot