Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: 763cb2198323737994b0136448fabdec2968c23c
https://github.com/WebKit/WebKit/commit/763cb2198323737994b0136448fabdec2968c23c
Author: Richard Robinson <richard_robins...@apple.com>
Date: 2025-03-03 (Mon, 03 Mar 2025)
Changed paths:
A Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration+Extras.swift
A Source/WebKit/UIProcess/API/Cocoa/WKWebpagePreferences+Extras.swift
M Source/WebKit/UIProcess/API/Swift/URLSchemeHandler.swift
R Source/WebKit/UIProcess/API/Swift/WKDownloadDelegateAdapter.swift
R Source/WebKit/UIProcess/API/Swift/WKNavigationDelegateAdapter.swift
R Source/WebKit/UIProcess/API/Swift/WKScrollGeometryAdapter.swift
R Source/WebKit/UIProcess/API/Swift/WKUIDelegateAdapter.swift
M Source/WebKit/UIProcess/API/Swift/WebPage+Configuration.swift
M Source/WebKit/UIProcess/API/Swift/WebPage+NavigationPreferences.swift
M Source/WebKit/UIProcess/API/Swift/WebPage.swift
A Source/WebKit/UIProcess/Cocoa/Foundation+Extras.swift
A Source/WebKit/UIProcess/Cocoa/WKDownloadDelegateAdapter.swift
A Source/WebKit/UIProcess/Cocoa/WKNavigationDelegateAdapter.swift
A Source/WebKit/UIProcess/Cocoa/WKScrollGeometryAdapter.swift
A Source/WebKit/UIProcess/Cocoa/WKUIDelegateAdapter.swift
A Source/WebKit/UIProcess/Cocoa/WKURLSchemeHandlerAdapter.swift
A Source/WebKit/UIProcess/Cocoa/WebPageWebView.swift
M Source/WebKit/WebKit.xcodeproj/project.pbxproj
A Source/WebKit/_WebKit_SwiftUI/API/View+WebViewModifiers.swift
A Source/WebKit/_WebKit_SwiftUI/API/WebPage+SwiftUI.swift
A Source/WebKit/_WebKit_SwiftUI/API/WebPageNavigationAction+SwiftUI.swift
A Source/WebKit/_WebKit_SwiftUI/API/WebView.swift
R Source/WebKit/_WebKit_SwiftUI/CocoaWebViewAdapter.swift
R Source/WebKit/_WebKit_SwiftUI/Foundation+Extras.swift
A Source/WebKit/_WebKit_SwiftUI/Implementation/CocoaWebViewAdapter.swift
A
Source/WebKit/_WebKit_SwiftUI/Implementation/EnvironmentValues+Extras.swift
A Source/WebKit/_WebKit_SwiftUI/Implementation/Foundation+Extras.swift
A Source/WebKit/_WebKit_SwiftUI/Implementation/PlatformTextSearching.swift
A Source/WebKit/_WebKit_SwiftUI/Implementation/SwiftUI+Extras.swift
A Source/WebKit/_WebKit_SwiftUI/Implementation/ViewModifierContexts.swift
A Source/WebKit/_WebKit_SwiftUI/Implementation/ViewModifiers.swift
A Source/WebKit/_WebKit_SwiftUI/Implementation/WebViewRepresentable.swift
R Source/WebKit/_WebKit_SwiftUI/PlatformTextSearching.swift
R Source/WebKit/_WebKit_SwiftUI/SwiftUI+Extras.swift
R Source/WebKit/_WebKit_SwiftUI/View+WebViewModifiers.swift
R Source/WebKit/_WebKit_SwiftUI/ViewModifierContexts.swift
R Source/WebKit/_WebKit_SwiftUI/WebPage+SwiftUI.swift
R Source/WebKit/_WebKit_SwiftUI/WebPageNavigationAction+SwiftUI.swift
R Source/WebKit/_WebKit_SwiftUI/WebView.swift
R Source/WebKit/_WebKit_SwiftUI/WebViewRepresentable.swift
Log Message:
-----------
[SwiftUI] Refactor file structure for better separation of implementation
from interface
https://bugs.webkit.org/show_bug.cgi?id=288903
rdar://145904392
Reviewed by Wenson Hsieh.
Refactor the files into a more organized structure, and move some types into
more suitable files. No logic changes.
* Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration+Extras.swift: Added.
* Source/WebKit/UIProcess/API/Cocoa/WKWebpagePreferences+Extras.swift: Copied
from Source/WebKit/_WebKit_SwiftUI/PlatformTextSearching.swift.
* Source/WebKit/UIProcess/API/Swift/WebPage+Configuration.swift:
* Source/WebKit/UIProcess/API/Swift/WebPage+NavigationPreferences.swift:
* Source/WebKit/UIProcess/API/Swift/WebPage.swift:
(WebPageWebView.delegate): Deleted.
(WebPageWebView.findInteraction(_:didBegin:)): Deleted.
(WebPageWebView.findInteraction(_:didEnd:)): Deleted.
(WebPageWebView.supportsTextReplacement): Deleted.
(WebPageWebView.geometryDidChange(_:)): Deleted.
(Delegate.findInteraction(_:didBegin:)): Deleted.
(Delegate.findInteraction(_:didEnd:)): Deleted.
(Delegate.supportsTextReplacement): Deleted.
(Delegate.geometryDidChange(_:)): Deleted.
(WebPageWebView.alwaysBounceVertical): Deleted.
(WebPageWebView.alwaysBounceHorizontal): Deleted.
(WebPageWebView.bouncesVertically): Deleted.
(WebPageWebView.bouncesHorizontally): Deleted.
(WebPageWebView.allowsMagnification): Deleted.
(WebPageWebView.setContentOffset(_:animated:)): Deleted.
(WebPageWebView.scrollTo(_:animated:)): Deleted.
(FullscreenState.currentNavigationEvent): Deleted.
(FullscreenState.backForwardList): Deleted.
(FullscreenState.url): Deleted.
(FullscreenState.title): Deleted.
(FullscreenState.estimatedProgress): Deleted.
(FullscreenState.isLoading): Deleted.
(FullscreenState.serverTrust): Deleted.
(FullscreenState.hasOnlySecureContent): Deleted.
(FullscreenState.isWritingToolsActive): Deleted.
(FullscreenState.fullscreenState): Deleted.
(FullscreenState.cameraCaptureState): Deleted.
(FullscreenState.microphoneCaptureState): Deleted.
(FullscreenState.mediaType): Deleted.
(FullscreenState.customUserAgent): Deleted.
(FullscreenState.isInspectable): Deleted.
(FullscreenState.setMenuBuilder(_:)): Deleted.
(FullscreenState.backingWebView): Deleted.
(FullscreenState.load(_:)): Deleted.
(FullscreenState.load(_:mimeType:characterEncoding:baseURL:)): Deleted.
(FullscreenState.load(_:baseURL:)): Deleted.
(FullscreenState.load(fileURL:allowingReadAccessTo:)): Deleted.
(FullscreenState.load(fileRequest:allowingReadAccessTo:)): Deleted.
(FullscreenState.load(simulatedRequest:response:responseData:)): Deleted.
(FullscreenState.load(simulatedRequest:responseHTML:)): Deleted.
(FullscreenState.reload(_:)): Deleted.
(FullscreenState.stopLoading): Deleted.
(FullscreenState.callJavaScript(_:arguments:in:contentWorld:)): Deleted.
(FullscreenState.pdf(_:)): Deleted.
(FullscreenState.webArchiveData): Deleted.
(FullscreenState.pauseAllMediaPlayback): Deleted.
(FullscreenState.mediaPlaybackState): Deleted.
(FullscreenState.setAllMediaPlaybackSuspended(_:)): Deleted.
(FullscreenState.closeAllMediaPresentations): Deleted.
(FullscreenState.setCameraCaptureState(_:)): Deleted.
(FullscreenState.setMicrophoneCaptureState(_:)): Deleted.
(FullscreenState.startDownload(using:)): Deleted.
(FullscreenState.resumeDownload(fromResumeData:)): Deleted.
* Source/WebKit/UIProcess/Cocoa/Foundation+Extras.swift: Copied from
Source/WebKit/_WebKit_SwiftUI/Foundation+Extras.swift.
* Source/WebKit/UIProcess/Cocoa/WKDownloadDelegateAdapter.swift: Renamed from
Source/WebKit/UIProcess/API/Swift/WKDownloadDelegateAdapter.swift.
(WKDownloadDelegateAdapter.owner):
(WKDownloadDelegateAdapter.downloadDidFinish(_:)):
(WKDownloadDelegateAdapter.download(_:didReceivePlaceholderURL:)):
(WKDownloadDelegateAdapter.download(_:didFailWithError:resumeData:)):
(WKDownloadDelegateAdapter.download(_:didReceiveFinalURL:)):
(WKDownloadDelegateAdapter.download(_:decideDestinationUsing:suggestedFilename:)):
(WKDownloadDelegateAdapter.download(_:willPerformHTTPRedirection:newRequest:)):
(WKDownloadDelegateAdapter.download(_:respondTo:URLCredential:)):
(WKDownloadDelegateAdapter.placeholderPolicy(forDownload:URL:)):
* Source/WebKit/UIProcess/Cocoa/WKNavigationDelegateAdapter.swift: Renamed from
Source/WebKit/UIProcess/API/Swift/WKNavigationDelegateAdapter.swift.
(WKNavigationDelegateAdapter.owner):
(WKNavigationDelegateAdapter.navigationDecider):
(WKNavigationDelegateAdapter.yieldNavigationProgress(_:cocoaNavigation:)):
(WKNavigationDelegateAdapter.yieldDownloadProgress(_:download:)):
(WKNavigationDelegateAdapter.webView(_:didStartProvisionalNavigation:)):
(WKNavigationDelegateAdapter.webView(_:didReceiveServerRedirectForProvisionalNavigation:)):
(WKNavigationDelegateAdapter.webView(_:didCommit:)):
(WKNavigationDelegateAdapter.webView(_:didFinish:)):
(WKNavigationDelegateAdapter.webView(_:didFailProvisionalNavigation:withError:)):
(WKNavigationDelegateAdapter.webView(_:didFail:withError:)):
(WKNavigationDelegateAdapter.webView(_:navigationAction:didBecome:)):
(WKNavigationDelegateAdapter.webView(_:navigationResponse:didBecome:)):
(WKNavigationDelegateAdapter._webView(_:contextMenuDidCreateDownload:)):
(WKNavigationDelegateAdapter._webView(_:backForwardListItemAdded:removed:)):
(WKNavigationDelegateAdapter.webView(_:decidePolicyFor:preferences:WKWebpagePreferences:)):
(WKNavigationDelegateAdapter.webView(_:decidePolicyFor:)):
(WKNavigationDelegateAdapter.webView(_:respondTo:URLCredential:)):
* Source/WebKit/UIProcess/Cocoa/WKScrollGeometryAdapter.swift: Renamed from
Source/WebKit/UIProcess/API/Swift/WKScrollGeometryAdapter.swift.
* Source/WebKit/UIProcess/Cocoa/WKUIDelegateAdapter.swift: Renamed from
Source/WebKit/UIProcess/API/Swift/WKUIDelegateAdapter.swift.
(WKUIDelegateAdapter.owner):
(WKUIDelegateAdapter.menuBuilder):
(WKUIDelegateAdapter.webView(_:runJavaScriptAlertPanelWithMessage:initiatedByFrame:)):
(WKUIDelegateAdapter.webView(_:runJavaScriptConfirmPanelWithMessage:initiatedByFrame:)):
(WKUIDelegateAdapter.webView(_:runJavaScriptTextInputPanelWithPrompt:defaultText:initiatedByFrame:)):
(WKUIDelegateAdapter.webView(_:runOpenPanelWith:initiatedByFrame:)):
(WKUIDelegateAdapter.webView(_:requestDeviceOrientationAndMotionPermissionFor:initiatedByFrame:)):
(WKUIDelegateAdapter.webView(_:decideMediaCapturePermissionsFor:initiatedBy:type:)):
(WKUIDelegateAdapter._webView(_:getContextMenuFromProposedMenu:forElement:userInfo:)):
(WKUIDelegateAdapter._webView(_:geometryDidChange:)):
* Source/WebKit/UIProcess/Cocoa/WebPageWebView.swift: Added.
(WebPageWebView.delegate):
(WebPageWebView.findInteraction(_:didBegin:)):
(WebPageWebView.findInteraction(_:didEnd:)):
(WebPageWebView.supportsTextReplacement):
(WebPageWebView.geometryDidChange(_:)):
(Delegate.findInteraction(_:didBegin:)):
(Delegate.findInteraction(_:didEnd:)):
(Delegate.supportsTextReplacement):
(Delegate.geometryDidChange(_:)):
(WebPageWebView.alwaysBounceVertical):
(WebPageWebView.alwaysBounceHorizontal):
(WebPageWebView.bouncesVertically):
(WebPageWebView.bouncesHorizontally):
(WebPageWebView.allowsMagnification):
(WebPageWebView.setContentOffset(_:animated:)):
(WebPageWebView.scrollTo(_:animated:)):
* Source/WebKit/WebKit.xcodeproj/project.pbxproj:
* Source/WebKit/_WebKit_SwiftUI/API/View+WebViewModifiers.swift: Renamed from
Source/WebKit/_WebKit_SwiftUI/View+WebViewModifiers.swift.
(View.webViewBackForwardNavigationGestures(_:)):
(View.webViewMagnificationGestures(_:)):
(View.webViewLinkPreviews(_:)):
(View.webViewAllowsElementFullscreen(_:)):
(View.webViewFindNavigator(_:)):
(View.webViewFindDisabled(_:)):
(View.webViewReplaceDisabled(_:)):
(View.webViewContentBackground(_:)):
(View.webViewScrollPosition(_:)):
* Source/WebKit/_WebKit_SwiftUI/API/WebPage+SwiftUI.swift: Renamed from
Source/WebKit/_WebKit_SwiftUI/WebPage+SwiftUI.swift.
(WebPage.themeColor):
(WebPage.snapshot(_:)):
* Source/WebKit/_WebKit_SwiftUI/API/WebPageNavigationAction+SwiftUI.swift:
Renamed from
Source/WebKit/_WebKit_SwiftUI/WebPageNavigationAction+SwiftUI.swift.
(WebPage.modifierFlags):
* Source/WebKit/_WebKit_SwiftUI/API/WebView.swift: Renamed from
Source/WebKit/_WebKit_SwiftUI/WebView.swift.
(WebView.body):
* Source/WebKit/_WebKit_SwiftUI/Implementation/CocoaWebViewAdapter.swift:
Renamed from Source/WebKit/_WebKit_SwiftUI/CocoaWebViewAdapter.swift.
(CocoaWebViewAdapter.isFindNavigatorVisible):
(CocoaWebViewAdapter.findInteraction):
(CocoaWebViewAdapter.isFindBarVisible):
(CocoaWebViewAdapter.findBarView):
(CocoaWebViewAdapter.findContext):
(CocoaWebViewAdapter.scrollPosition):
(CocoaWebViewAdapter.performFindPanelAction(_:)):
(CocoaWebViewAdapter.findBarDidBecomeVisible):
(CocoaWebViewAdapter.findBarDidBecomeHidden):
(CocoaWebViewAdapter.onScrollGeometryChange):
(CocoaWebViewAdapter.webViewConstraints):
(CocoaWebViewAdapter.findBarConstraints):
(CocoaWebViewAdapter.webViewHeightConstraint):
(CocoaWebViewAdapter.removeConstraints):
(CocoaWebViewAdapter.activateConstraints):
(CocoaWebViewAdapter.webView):
(CocoaWebViewAdapter.contentView):
(CocoaWebViewAdapter.findBarViewDidChangeHeight):
(CocoaWebViewAdapter.findInteraction(_:didBegin:)):
(CocoaWebViewAdapter.findInteraction(_:didEnd:)):
(CocoaWebViewAdapter.supportsTextReplacement):
(CocoaWebViewAdapter.geometryDidChange(_:)):
* Source/WebKit/_WebKit_SwiftUI/Implementation/EnvironmentValues+Extras.swift:
Copied from Source/WebKit/_WebKit_SwiftUI/Foundation+Extras.swift.
(EnvironmentValues.webViewFindContext):
(EnvironmentValues.webViewContextMenuContext):
(EnvironmentValues.webViewContentBackground):
* Source/WebKit/_WebKit_SwiftUI/Implementation/Foundation+Extras.swift: Copied
from Source/WebKit/_WebKit_SwiftUI/Foundation+Extras.swift.
(onNextMainRunLoop(do:)):
* Source/WebKit/_WebKit_SwiftUI/Implementation/PlatformTextSearching.swift:
Renamed from Source/WebKit/_WebKit_SwiftUI/PlatformTextSearching.swift.
(PlatformTextSearching.isFindNavigatorVisible):
(PlatformTextSearching.findInteraction):
(PlatformFindInteraction.presentFindNavigator(_:)):
(PlatformFindInteraction.dismissFindNavigator):
(NSTextFinderAdapter.presentFindNavigator(_:)):
(NSTextFinderAdapter.dismissFindNavigator):
(UIFindInteractionAdapter.presentFindNavigator(_:)):
(UIFindInteractionAdapter.dismissFindNavigator):
* Source/WebKit/_WebKit_SwiftUI/Implementation/SwiftUI+Extras.swift: Renamed
from Source/WebKit/_WebKit_SwiftUI/SwiftUI+Extras.swift.
(Transaction.isAnimated):
* Source/WebKit/_WebKit_SwiftUI/Implementation/ViewModifierContexts.swift:
Renamed from Source/WebKit/_WebKit_SwiftUI/ViewModifierContexts.swift.
(Change.transform):
(Change.action):
(changes):
(apply(from:to:)):
(FindContext.isPresented):
(ScrollPositionContext.position):
* Source/WebKit/_WebKit_SwiftUI/Implementation/ViewModifiers.swift: Renamed
from Source/WebKit/_WebKit_SwiftUI/Foundation+Extras.swift.
(OnScrollGeometryChangeModifier.body(_:)):
* Source/WebKit/_WebKit_SwiftUI/Implementation/WebViewRepresentable.swift:
Renamed from Source/WebKit/_WebKit_SwiftUI/WebViewRepresentable.swift.
(WebViewRepresentable.makePlatformView(_:)):
(WebViewRepresentable.updatePlatformView(_:context:)):
(WebViewRepresentable.makeCoordinator):
(WebViewRepresentable.sizeThatFits(_:platformView:context:)):
(WebViewCoordinator.configuration):
(WebViewCoordinator.update(_:configuration:context:)):
(WebViewCoordinator.updateScrollPosition(_:context:)):
(WebViewCoordinator.updateFindInteraction(_:context:)):
(WebViewRepresentable.makeUIView(_:)):
(WebViewRepresentable.updateUIView(_:context:)):
(WebViewRepresentable.sizeThatFits(_:uiView:context:)):
(WebViewRepresentable.makeNSView(_:)):
(WebViewRepresentable.updateNSView(_:context:)):
(WebViewRepresentable.sizeThatFits(_:nsView:context:)):
Canonical link: https://commits.webkit.org/291543@main
To unsubscribe from these emails, change your notification settings at
https://github.com/WebKit/WebKit/settings/notifications
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
