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.

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

Move more ivars from WKWebViewConfiguration to API::PageConfiguration #26261

Conversation

achristensen07
Copy link
Contributor

@achristensen07 achristensen07 commented Mar 21, 2024

b2db745

Move more ivars from WKWebViewConfiguration to API::PageConfiguration
https://bugs.webkit.org/show_bug.cgi?id=271405
rdar://125186260

Reviewed by Charlie Wolfe.

* Source/WebKit/SourcesCocoa.txt:
* Source/WebKit/UIProcess/API/APIPageConfiguration.h:
(API::PageConfiguration::inlineMediaPlaybackRequiresPlaysInlineAttribute const):
(API::PageConfiguration::setInlineMediaPlaybackRequiresPlaysInlineAttribute):
(API::PageConfiguration::allowsInlineMediaPlaybackAfterFullscreen const):
(API::PageConfiguration::setAllowsInlineMediaPlaybackAfterFullscreen):
(API::PageConfiguration::mediaDataLoadsAutomatically const):
(API::PageConfiguration::setMediaDataLoadsAutomatically):
(API::PageConfiguration::dragLiftDelay const):
(API::PageConfiguration::setDragLiftDelay):
(API::PageConfiguration::textInteractionGesturesEnabled const):
(API::PageConfiguration::setTextInteractionGesturesEnabled):
(API::PageConfiguration::longPressActionsEnabled const):
(API::PageConfiguration::setLongPressActionsEnabled):
(API::PageConfiguration::systemPreviewEnabled const):
(API::PageConfiguration::setSystemPreviewEnabled):
(API::PageConfiguration::shouldDecidePolicyBeforeLoadingQuickLookPreview const):
(API::PageConfiguration::setShouldDecidePolicyBeforeLoadingQuickLookPreview):
* Source/WebKit/UIProcess/API/Cocoa/APIPageConfigurationCocoa.mm: Added.
(API::PageConfiguration::Data::defaultShouldDecidePolicyBeforeLoadingQuickLookPreview):
(API::PageConfiguration::Data::defaultDragLiftDelay):
* Source/WebKit/UIProcess/API/Cocoa/WKBrowsingContextController.mm:
* Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
(toDragLiftDelay):
(toWKDragLiftDelay):
(fromWKDragLiftDelay):
(-[WKWebViewConfiguration init]):
(-[WKWebViewConfiguration copyWithZone:]):
(-[WKWebViewConfiguration _inlineMediaPlaybackRequiresPlaysInlineAttribute]):
(-[WKWebViewConfiguration _setInlineMediaPlaybackRequiresPlaysInlineAttribute:]):
(-[WKWebViewConfiguration _allowsInlineMediaPlaybackAfterFullscreen]):
(-[WKWebViewConfiguration _setAllowsInlineMediaPlaybackAfterFullscreen:]):
(-[WKWebViewConfiguration _dragLiftDelay]):
(-[WKWebViewConfiguration _setDragLiftDelay:]):
(-[WKWebViewConfiguration _longPressActionsEnabled]):
(-[WKWebViewConfiguration _setLongPressActionsEnabled:]):
(-[WKWebViewConfiguration _systemPreviewEnabled]):
(-[WKWebViewConfiguration _setSystemPreviewEnabled:]):
(-[WKWebViewConfiguration _shouldDecidePolicyBeforeLoadingQuickLookPreview]):
(-[WKWebViewConfiguration _setShouldDecidePolicyBeforeLoadingQuickLookPreview:]):
(-[WKWebViewConfiguration _mediaDataLoadsAutomatically]):
(-[WKWebViewConfiguration _setMediaDataLoadsAutomatically:]):
(-[WKWebViewConfiguration _textInteractionGesturesEnabled]):
(-[WKWebViewConfiguration _setTextInteractionGesturesEnabled:]):
(defaultShouldDecidePolicyBeforeLoadingQuickLookPreview): Deleted.
* Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfigurationInternal.h:
* Source/WebKit/WebKit.xcodeproj/project.pbxproj:

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

781cf7b

Misc iOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 wincairo
✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug 🧪 wpe-wk2
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 🧪 api-mac ✅ 🧪 api-wpe
✅ 🧪 ios-wk2-wpt ✅ 🛠 wpe-skia
✅ 🧪 api-ios ✅ 🧪 mac-wk2 ✅ 🛠 gtk
✅ 🛠 tv ✅ 🧪 mac-AS-debug-wk2 ⏳ 🧪 gtk-wk2
🛠 tv-sim ⏳ 🧪 api-gtk
🛠 watch
✅ 🛠 🧪 unsafe-merge ✅ 🛠 watch-sim

@achristensen07 achristensen07 self-assigned this Mar 21, 2024
@achristensen07 achristensen07 added the WebKit API For issues and bugs in the Web Kit public embedding APIs label Mar 21, 2024
@achristensen07 achristensen07 force-pushed the eng/Move-more-ivars-from-WKWebViewConfiguration-to-APIPageConfiguration branch from a95dbc9 to 355b010 Compare March 21, 2024 19:52
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Mar 21, 2024
@achristensen07 achristensen07 removed the merging-blocked Applied to prevent a change from being merged label Mar 21, 2024
@achristensen07 achristensen07 force-pushed the eng/Move-more-ivars-from-WKWebViewConfiguration-to-APIPageConfiguration branch from 355b010 to 0058cda Compare March 21, 2024 20:04
}
#endif

} // API
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I usually see closing namespace comments like } // namespace API.

@@ -137,10 +133,6 @@ - (instancetype)init
_allowsPictureInPictureMediaPlayback = YES;
#endif

_allowsInlineMediaPlayback = !PAL::currentUserInterfaceIdiomIsSmallScreen();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#import <pal/system/ios/UserInterfaceIdiom.h> can probably be removed from this file now.

@achristensen07 achristensen07 force-pushed the eng/Move-more-ivars-from-WKWebViewConfiguration-to-APIPageConfiguration branch from 0058cda to b279eb6 Compare March 22, 2024 00:36
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Mar 22, 2024
@achristensen07 achristensen07 removed the merging-blocked Applied to prevent a change from being merged label Mar 22, 2024
@achristensen07 achristensen07 force-pushed the eng/Move-more-ivars-from-WKWebViewConfiguration-to-APIPageConfiguration branch from b279eb6 to 781cf7b Compare March 22, 2024 00:50
@achristensen07 achristensen07 added the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Mar 22, 2024
https://bugs.webkit.org/show_bug.cgi?id=271405
rdar://125186260

Reviewed by Charlie Wolfe.

* Source/WebKit/SourcesCocoa.txt:
* Source/WebKit/UIProcess/API/APIPageConfiguration.h:
(API::PageConfiguration::inlineMediaPlaybackRequiresPlaysInlineAttribute const):
(API::PageConfiguration::setInlineMediaPlaybackRequiresPlaysInlineAttribute):
(API::PageConfiguration::allowsInlineMediaPlaybackAfterFullscreen const):
(API::PageConfiguration::setAllowsInlineMediaPlaybackAfterFullscreen):
(API::PageConfiguration::mediaDataLoadsAutomatically const):
(API::PageConfiguration::setMediaDataLoadsAutomatically):
(API::PageConfiguration::dragLiftDelay const):
(API::PageConfiguration::setDragLiftDelay):
(API::PageConfiguration::textInteractionGesturesEnabled const):
(API::PageConfiguration::setTextInteractionGesturesEnabled):
(API::PageConfiguration::longPressActionsEnabled const):
(API::PageConfiguration::setLongPressActionsEnabled):
(API::PageConfiguration::systemPreviewEnabled const):
(API::PageConfiguration::setSystemPreviewEnabled):
(API::PageConfiguration::shouldDecidePolicyBeforeLoadingQuickLookPreview const):
(API::PageConfiguration::setShouldDecidePolicyBeforeLoadingQuickLookPreview):
* Source/WebKit/UIProcess/API/Cocoa/APIPageConfigurationCocoa.mm: Added.
(API::PageConfiguration::Data::defaultShouldDecidePolicyBeforeLoadingQuickLookPreview):
(API::PageConfiguration::Data::defaultDragLiftDelay):
* Source/WebKit/UIProcess/API/Cocoa/WKBrowsingContextController.mm:
* Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
(toDragLiftDelay):
(toWKDragLiftDelay):
(fromWKDragLiftDelay):
(-[WKWebViewConfiguration init]):
(-[WKWebViewConfiguration copyWithZone:]):
(-[WKWebViewConfiguration _inlineMediaPlaybackRequiresPlaysInlineAttribute]):
(-[WKWebViewConfiguration _setInlineMediaPlaybackRequiresPlaysInlineAttribute:]):
(-[WKWebViewConfiguration _allowsInlineMediaPlaybackAfterFullscreen]):
(-[WKWebViewConfiguration _setAllowsInlineMediaPlaybackAfterFullscreen:]):
(-[WKWebViewConfiguration _dragLiftDelay]):
(-[WKWebViewConfiguration _setDragLiftDelay:]):
(-[WKWebViewConfiguration _longPressActionsEnabled]):
(-[WKWebViewConfiguration _setLongPressActionsEnabled:]):
(-[WKWebViewConfiguration _systemPreviewEnabled]):
(-[WKWebViewConfiguration _setSystemPreviewEnabled:]):
(-[WKWebViewConfiguration _shouldDecidePolicyBeforeLoadingQuickLookPreview]):
(-[WKWebViewConfiguration _setShouldDecidePolicyBeforeLoadingQuickLookPreview:]):
(-[WKWebViewConfiguration _mediaDataLoadsAutomatically]):
(-[WKWebViewConfiguration _setMediaDataLoadsAutomatically:]):
(-[WKWebViewConfiguration _textInteractionGesturesEnabled]):
(-[WKWebViewConfiguration _setTextInteractionGesturesEnabled:]):
(defaultShouldDecidePolicyBeforeLoadingQuickLookPreview): Deleted.
* Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfigurationInternal.h:
* Source/WebKit/WebKit.xcodeproj/project.pbxproj:

Canonical link: https://commits.webkit.org/276517@main
@webkit-commit-queue webkit-commit-queue force-pushed the eng/Move-more-ivars-from-WKWebViewConfiguration-to-APIPageConfiguration branch from 781cf7b to b2db745 Compare March 22, 2024 02:53
@webkit-commit-queue
Copy link
Collaborator

Committed 276517@main (b2db745): https://commits.webkit.org/276517@main

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

@webkit-commit-queue webkit-commit-queue merged commit b2db745 into WebKit:main Mar 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 Mar 22, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
WebKit API For issues and bugs in the Web Kit public embedding APIs
Projects
None yet
5 participants