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

Rename FrameLoaderClient to LocalFrameLoaderClient #13969

Conversation

achristensen07
Copy link
Contributor

@achristensen07 achristensen07 commented May 17, 2023

f0bec44

Rename FrameLoaderClient to LocalFrameLoaderClient
https://bugs.webkit.org/show_bug.cgi?id=256904

Reviewed by Chris Dumez.

This is preparation for sharing decidePolicyForNavigationAction between LocalFrame and RemoteFrame.

* Source/WebCore/Modules/websockets/WebSocket.cpp:
* Source/WebCore/accessibility/AccessibilityObjectInterface.h:
* Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
* Source/WebCore/bindings/js/ScriptController.cpp:
* Source/WebCore/bindings/js/ScriptControllerMac.mm:
* Source/WebCore/contentextensions/ContentExtensionsBackend.cpp:
* Source/WebCore/dom/DOMImplementation.cpp:
* Source/WebCore/dom/Document.cpp:
* Source/WebCore/dom/DocumentStorageAccess.cpp:
* Source/WebCore/editing/cocoa/WebContentReaderCocoa.mm:
* Source/WebCore/history/BackForwardCache.cpp:
* Source/WebCore/history/CachedFrame.cpp:
* Source/WebCore/history/CachedPage.cpp:
* Source/WebCore/html/HTMLAnchorElement.cpp:
* Source/WebCore/html/HTMLCanvasElement.cpp:
* Source/WebCore/html/HTMLFormElement.cpp:
* Source/WebCore/html/HTMLFrameSetElement.cpp:
* Source/WebCore/html/HTMLLinkElement.cpp:
* Source/WebCore/html/HTMLMediaElement.cpp:
* Source/WebCore/html/HTMLPlugInImageElement.cpp:
* Source/WebCore/html/ImageDocument.cpp:
* Source/WebCore/html/MediaDocument.cpp:
* Source/WebCore/html/ModelDocument.cpp:
* Source/WebCore/html/PluginDocument.cpp:
* Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp:
* Source/WebCore/html/parser/HTMLConstructionSite.cpp:
* Source/WebCore/loader/ContentFilter.cpp:
* Source/WebCore/loader/DocumentLoader.cpp:
* Source/WebCore/loader/DocumentThreadableLoader.cpp:
(WebCore::DocumentThreadableLoader::cancel):
* Source/WebCore/loader/DocumentWriter.cpp:
* Source/WebCore/loader/EmptyClients.cpp:
(WebCore::pageConfigurationWithEmptyClients):
* Source/WebCore/loader/EmptyFrameLoaderClient.h:
* Source/WebCore/loader/FrameLoader.cpp:
(WebCore::FrameLoader::FrameLoader):
(WebCore::FrameLoader::loadInSameDocument):
(WebCore::LocalFrameLoaderClient::hasHTMLView const):
(WebCore::FrameLoaderClient::hasHTMLView const): Deleted.
* Source/WebCore/loader/FrameLoader.h:
* Source/WebCore/loader/HistoryController.cpp:
(WebCore::FrameLoader::HistoryController::restoreScrollPositionAndViewState):
* Source/WebCore/loader/LinkLoader.cpp:
* Source/WebCore/loader/LocalFrameLoaderClient.h: Renamed from Source/WebCore/loader/FrameLoaderClient.h.
* Source/WebCore/loader/MediaResourceLoader.cpp:
* Source/WebCore/loader/MixedContentChecker.cpp:
* Source/WebCore/loader/MixedContentChecker.h:
* Source/WebCore/loader/NetscapePlugInStreamLoader.cpp:
* Source/WebCore/loader/PingLoader.cpp:
* Source/WebCore/loader/PolicyChecker.cpp:
* Source/WebCore/loader/PolicyChecker.h:
* Source/WebCore/loader/ProgressTracker.cpp:
* Source/WebCore/loader/ResourceLoadNotifier.cpp:
(WebCore::ResourceLoadNotifier::didFailToLoad):
(WebCore::ResourceLoadNotifier::dispatchWillSendRequest):
(WebCore::ResourceLoadNotifier::dispatchDidReceiveResponse):
(WebCore::ResourceLoadNotifier::dispatchDidReceiveData):
(WebCore::ResourceLoadNotifier::dispatchDidFinishLoading):
(WebCore::ResourceLoadNotifier::dispatchDidFailLoading):
* Source/WebCore/loader/ResourceLoader.cpp:
* Source/WebCore/loader/SubframeLoader.cpp:
* Source/WebCore/loader/SubframeLoader.h:
* Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp:
* Source/WebCore/loader/appcache/ApplicationCacheHost.cpp:
* Source/WebCore/loader/cache/CachedImage.cpp:
* Source/WebCore/loader/cache/CachedResource.cpp:
* Source/WebCore/loader/cache/CachedResourceLoader.cpp:
* Source/WebCore/loader/icon/IconLoader.cpp:
* Source/WebCore/loader/ios/LegacyPreviewLoader.mm:
* Source/WebCore/loader/mac/ResourceLoaderMac.mm:
* Source/WebCore/page/Chrome.cpp:
* Source/WebCore/page/ContextMenuController.cpp:
* Source/WebCore/page/DOMWindowExtension.cpp:
* Source/WebCore/page/History.cpp:
* Source/WebCore/page/LocalDOMWindow.cpp:
* Source/WebCore/page/LocalFrame.cpp:
(WebCore::LocalFrame::LocalFrame):
(WebCore::LocalFrame::createMainFrame):
(WebCore::LocalFrame::createSubframe):
(WebCore::LocalFrame::createSubframeHostedInAnotherProcess):
* Source/WebCore/page/LocalFrame.h:
* Source/WebCore/page/LocalFrameView.cpp:
* Source/WebCore/page/Navigator.cpp:
* Source/WebCore/page/Page.cpp:
(WebCore::createMainFrame):
* Source/WebCore/page/PageConfiguration.cpp:
(WebCore::PageConfiguration::PageConfiguration):
* Source/WebCore/page/PageConfiguration.h:
* Source/WebCore/page/PerformanceLogging.cpp:
* Source/WebCore/page/WebKitNamespace.cpp:
* Source/WebCore/platform/network/SynchronousLoaderClient.cpp:
(WebCore::SynchronousLoaderClient::shouldUseCredentialStorage):
(WebCore::SynchronousLoaderClient::canAuthenticateAgainstProtectionSpaceAsync):
* Source/WebCore/rendering/RenderEmbeddedObject.cpp:
* Source/WebCore/rendering/RenderLayer.cpp:
* Source/WebCore/style/StyleScopeRuleSets.cpp:
* Source/WebCore/workers/service/ServiceWorkerContainer.cpp:
* Source/WebCore/workers/service/ServiceWorkerGlobalScope.cpp:
* Source/WebCore/workers/service/ServiceWorkerProvider.cpp:
* Source/WebCore/workers/service/context/SWContextManager.cpp:
* Source/WebKit/WebProcess/Network/WebResourceLoader.cpp:
* Source/WebKit/WebProcess/Plugins/PluginView.cpp:
* Source/WebKit/WebProcess/Storage/RemoteWorkerFrameLoaderClient.h:
(isType):
* Source/WebKit/WebProcess/Storage/WebSWContextManagerConnection.cpp:
(WebKit::WebSWContextManagerConnection::installServiceWorker):
* Source/WebKit/WebProcess/Storage/WebSharedWorkerContextManagerConnection.cpp:
(WebKit::WebSharedWorkerContextManagerConnection::launchSharedWorker):
* Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
(WebKit::WebFrameLoaderClient::dispatchDidFailProvisionalLoad):
* Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.h:
(WebKit::toWebFrameLoaderClient):
* Source/WebKit/WebProcess/WebCoreSupport/WebResourceLoadObserver.cpp:
* Source/WebKit/WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm:
* Source/WebKit/WebProcess/WebPage/WebCookieJar.cpp:
* Source/WebKit/WebProcess/WebPage/WebFrame.h:
* Source/WebKit/WebProcess/WebPage/WebPage.cpp:
(WebKit::clientForMainFrame):
* Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm:
* Source/WebKitLegacy/ios/WebView/WebPDFViewIOS.mm:
* Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.h:
* Source/WebKitLegacy/mac/WebCoreSupport/WebFrameNetworkingContext.mm:
* Source/WebKitLegacy/mac/WebView/WebFrame.mm:
(kit):
* Source/WebKitLegacy/mac/WebView/WebHTMLRepresentation.mm:
* Source/WebKitLegacy/mac/WebView/WebView.mm:
(-[WebView _commonInitializationWithFrameName:groupName:]):
(-[WebView initSimpleHTMLDocumentWithStyle:frame:preferences:groupName:]):

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

f30303f

Misc iOS, tvOS & watchOS macOS Linux Windows
βœ… πŸ§ͺ style βœ… πŸ›  ios βœ… πŸ›  mac βœ… πŸ›  wpe   πŸ›  wincairo
βœ… πŸ§ͺ bindings βœ… πŸ›  ios-sim βœ… πŸ›  mac-AS-debug   πŸ§ͺ wpe-wk2
βœ… πŸ§ͺ webkitperl   πŸ§ͺ ios-wk2   πŸ§ͺ api-mac βœ… πŸ›  gtk
  πŸ§ͺ ios-wk2-wpt   πŸ§ͺ mac-wk1   πŸ§ͺ gtk-wk2
  πŸ§ͺ api-ios   πŸ§ͺ mac-wk2   πŸ§ͺ api-gtk
βœ… πŸ›  tv   πŸ§ͺ mac-AS-debug-wk2
βœ… πŸ›  tv-sim
βœ… πŸ›  watch
βœ… πŸ›  πŸ§ͺ unsafe-merge βœ… πŸ›  watch-sim

@achristensen07 achristensen07 self-assigned this May 17, 2023
@achristensen07 achristensen07 added the WebCore Misc. For miscellaneous bugs in the WebCore framework (and not JavaScriptCore or WebKit). label May 17, 2023
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label May 17, 2023
@achristensen07 achristensen07 force-pushed the eng/Rename-FrameLoaderClient-to-LocalFrameLoaderClient branch from be16793 to 4932232 Compare May 17, 2023 18:15
@achristensen07 achristensen07 removed the merging-blocked Applied to prevent a change from being merged label May 17, 2023
@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 54;
objectVersion = 51;
Copy link
Contributor

Choose a reason for hiding this comment

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

We should probably not be making this change.

@achristensen07 achristensen07 force-pushed the eng/Rename-FrameLoaderClient-to-LocalFrameLoaderClient branch from 4932232 to f30303f Compare May 17, 2023 19:52
@achristensen07 achristensen07 added the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label May 17, 2023
https://bugs.webkit.org/show_bug.cgi?id=256904

Reviewed by Chris Dumez.

This is preparation for sharing decidePolicyForNavigationAction between LocalFrame and RemoteFrame.

* Source/WebCore/Modules/websockets/WebSocket.cpp:
* Source/WebCore/accessibility/AccessibilityObjectInterface.h:
* Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
* Source/WebCore/bindings/js/ScriptController.cpp:
* Source/WebCore/bindings/js/ScriptControllerMac.mm:
* Source/WebCore/contentextensions/ContentExtensionsBackend.cpp:
* Source/WebCore/dom/DOMImplementation.cpp:
* Source/WebCore/dom/Document.cpp:
* Source/WebCore/dom/DocumentStorageAccess.cpp:
* Source/WebCore/editing/cocoa/WebContentReaderCocoa.mm:
* Source/WebCore/history/BackForwardCache.cpp:
* Source/WebCore/history/CachedFrame.cpp:
* Source/WebCore/history/CachedPage.cpp:
* Source/WebCore/html/HTMLAnchorElement.cpp:
* Source/WebCore/html/HTMLCanvasElement.cpp:
* Source/WebCore/html/HTMLFormElement.cpp:
* Source/WebCore/html/HTMLFrameSetElement.cpp:
* Source/WebCore/html/HTMLLinkElement.cpp:
* Source/WebCore/html/HTMLMediaElement.cpp:
* Source/WebCore/html/HTMLPlugInImageElement.cpp:
* Source/WebCore/html/ImageDocument.cpp:
* Source/WebCore/html/MediaDocument.cpp:
* Source/WebCore/html/ModelDocument.cpp:
* Source/WebCore/html/PluginDocument.cpp:
* Source/WebCore/html/canvas/WebGLRenderingContextBase.cpp:
* Source/WebCore/html/parser/HTMLConstructionSite.cpp:
* Source/WebCore/loader/ContentFilter.cpp:
* Source/WebCore/loader/DocumentLoader.cpp:
* Source/WebCore/loader/DocumentThreadableLoader.cpp:
(WebCore::DocumentThreadableLoader::cancel):
* Source/WebCore/loader/DocumentWriter.cpp:
* Source/WebCore/loader/EmptyClients.cpp:
(WebCore::pageConfigurationWithEmptyClients):
* Source/WebCore/loader/EmptyFrameLoaderClient.h:
* Source/WebCore/loader/FrameLoader.cpp:
(WebCore::FrameLoader::FrameLoader):
(WebCore::FrameLoader::loadInSameDocument):
(WebCore::LocalFrameLoaderClient::hasHTMLView const):
(WebCore::FrameLoaderClient::hasHTMLView const): Deleted.
* Source/WebCore/loader/FrameLoader.h:
* Source/WebCore/loader/HistoryController.cpp:
(WebCore::FrameLoader::HistoryController::restoreScrollPositionAndViewState):
* Source/WebCore/loader/LinkLoader.cpp:
* Source/WebCore/loader/LocalFrameLoaderClient.h: Renamed from Source/WebCore/loader/FrameLoaderClient.h.
* Source/WebCore/loader/MediaResourceLoader.cpp:
* Source/WebCore/loader/MixedContentChecker.cpp:
* Source/WebCore/loader/MixedContentChecker.h:
* Source/WebCore/loader/NetscapePlugInStreamLoader.cpp:
* Source/WebCore/loader/PingLoader.cpp:
* Source/WebCore/loader/PolicyChecker.cpp:
* Source/WebCore/loader/PolicyChecker.h:
* Source/WebCore/loader/ProgressTracker.cpp:
* Source/WebCore/loader/ResourceLoadNotifier.cpp:
(WebCore::ResourceLoadNotifier::didFailToLoad):
(WebCore::ResourceLoadNotifier::dispatchWillSendRequest):
(WebCore::ResourceLoadNotifier::dispatchDidReceiveResponse):
(WebCore::ResourceLoadNotifier::dispatchDidReceiveData):
(WebCore::ResourceLoadNotifier::dispatchDidFinishLoading):
(WebCore::ResourceLoadNotifier::dispatchDidFailLoading):
* Source/WebCore/loader/ResourceLoader.cpp:
* Source/WebCore/loader/SubframeLoader.cpp:
* Source/WebCore/loader/SubframeLoader.h:
* Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp:
* Source/WebCore/loader/appcache/ApplicationCacheHost.cpp:
* Source/WebCore/loader/cache/CachedImage.cpp:
* Source/WebCore/loader/cache/CachedResource.cpp:
* Source/WebCore/loader/cache/CachedResourceLoader.cpp:
* Source/WebCore/loader/icon/IconLoader.cpp:
* Source/WebCore/loader/ios/LegacyPreviewLoader.mm:
* Source/WebCore/loader/mac/ResourceLoaderMac.mm:
* Source/WebCore/page/Chrome.cpp:
* Source/WebCore/page/ContextMenuController.cpp:
* Source/WebCore/page/DOMWindowExtension.cpp:
* Source/WebCore/page/History.cpp:
* Source/WebCore/page/LocalDOMWindow.cpp:
* Source/WebCore/page/LocalFrame.cpp:
(WebCore::LocalFrame::LocalFrame):
(WebCore::LocalFrame::createMainFrame):
(WebCore::LocalFrame::createSubframe):
(WebCore::LocalFrame::createSubframeHostedInAnotherProcess):
* Source/WebCore/page/LocalFrame.h:
* Source/WebCore/page/LocalFrameView.cpp:
* Source/WebCore/page/Navigator.cpp:
* Source/WebCore/page/Page.cpp:
(WebCore::createMainFrame):
* Source/WebCore/page/PageConfiguration.cpp:
(WebCore::PageConfiguration::PageConfiguration):
* Source/WebCore/page/PageConfiguration.h:
* Source/WebCore/page/PerformanceLogging.cpp:
* Source/WebCore/page/WebKitNamespace.cpp:
* Source/WebCore/platform/network/SynchronousLoaderClient.cpp:
(WebCore::SynchronousLoaderClient::shouldUseCredentialStorage):
(WebCore::SynchronousLoaderClient::canAuthenticateAgainstProtectionSpaceAsync):
* Source/WebCore/rendering/RenderEmbeddedObject.cpp:
* Source/WebCore/rendering/RenderLayer.cpp:
* Source/WebCore/style/StyleScopeRuleSets.cpp:
* Source/WebCore/workers/service/ServiceWorkerContainer.cpp:
* Source/WebCore/workers/service/ServiceWorkerGlobalScope.cpp:
* Source/WebCore/workers/service/ServiceWorkerProvider.cpp:
* Source/WebCore/workers/service/context/SWContextManager.cpp:
* Source/WebKit/WebProcess/Network/WebResourceLoader.cpp:
* Source/WebKit/WebProcess/Plugins/PluginView.cpp:
* Source/WebKit/WebProcess/Storage/RemoteWorkerFrameLoaderClient.h:
(isType):
* Source/WebKit/WebProcess/Storage/WebSWContextManagerConnection.cpp:
(WebKit::WebSWContextManagerConnection::installServiceWorker):
* Source/WebKit/WebProcess/Storage/WebSharedWorkerContextManagerConnection.cpp:
(WebKit::WebSharedWorkerContextManagerConnection::launchSharedWorker):
* Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
(WebKit::WebFrameLoaderClient::dispatchDidFailProvisionalLoad):
* Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.h:
(WebKit::toWebFrameLoaderClient):
* Source/WebKit/WebProcess/WebCoreSupport/WebResourceLoadObserver.cpp:
* Source/WebKit/WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm:
* Source/WebKit/WebProcess/WebPage/WebCookieJar.cpp:
* Source/WebKit/WebProcess/WebPage/WebFrame.h:
* Source/WebKit/WebProcess/WebPage/WebPage.cpp:
(WebKit::clientForMainFrame):
* Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm:
* Source/WebKitLegacy/ios/WebView/WebPDFViewIOS.mm:
* Source/WebKitLegacy/mac/WebCoreSupport/WebFrameLoaderClient.h:
* Source/WebKitLegacy/mac/WebCoreSupport/WebFrameNetworkingContext.mm:
* Source/WebKitLegacy/mac/WebView/WebFrame.mm:
(kit):
* Source/WebKitLegacy/mac/WebView/WebHTMLRepresentation.mm:
* Source/WebKitLegacy/mac/WebView/WebView.mm:
(-[WebView _commonInitializationWithFrameName:groupName:]):
(-[WebView initSimpleHTMLDocumentWithStyle:frame:preferences:groupName:]):

Canonical link: https://commits.webkit.org/264170@main
@webkit-commit-queue webkit-commit-queue force-pushed the eng/Rename-FrameLoaderClient-to-LocalFrameLoaderClient branch from f30303f to f0bec44 Compare May 17, 2023 19:58
@webkit-commit-queue
Copy link
Collaborator

Committed 264170@main (f0bec44): https://commits.webkit.org/264170@main

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

@webkit-commit-queue webkit-commit-queue merged commit f0bec44 into WebKit:main May 17, 2023
@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 17, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
WebCore Misc. For miscellaneous bugs in the WebCore framework (and not JavaScriptCore or WebKit).
Projects
None yet
5 participants