[webkit-changes] [WebKit/WebKit] 8668ed: Rename references to "captive portal mode" in WebK...

Wenson Hsieh noreply at github.com
Mon Oct 17 21:31:13 PDT 2022 

  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: 8668ed77138a6e98d69d0cb8854b1c2254d54a17
      https://github.com/WebKit/WebKit/commit/8668ed77138a6e98d69d0cb8854b1c2254d54a17
  Author: Wenson Hsieh <wenson_hsieh at apple.com>
  Date:   2022-10-17 (Mon, 17 Oct 2022)

  Changed paths:
    M Source/WTF/Scripts/Preferences/WebPreferences.yaml
    M Source/WebKit/GPUProcess/GPUConnectionToWebProcess.cpp
    M Source/WebKit/GPUProcess/GPUConnectionToWebProcess.h
    M Source/WebKit/GPUProcess/media/RemoteAudioDestinationManager.cpp
    M Source/WebKit/Shared/GPUProcessConnectionParameters.h
    M Source/WebKit/Shared/WebProcessCreationParameters.cpp
    M Source/WebKit/Shared/WebProcessCreationParameters.h
    M Source/WebKit/UIProcess/API/APIPageConfiguration.cpp
    M Source/WebKit/UIProcess/API/APIPageConfiguration.h
    M Source/WebKit/UIProcess/API/APIWebsitePolicies.cpp
    M Source/WebKit/UIProcess/API/APIWebsitePolicies.h
    M Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm
    M Source/WebKit/UIProcess/API/Cocoa/WKWebpagePreferences.mm
    M Source/WebKit/UIProcess/API/Cocoa/WKWebpagePreferencesInternal.h
    M Source/WebKit/UIProcess/API/Cocoa/_WKSystemPreferences.mm
    M Source/WebKit/UIProcess/API/Cocoa/_WKSystemPreferencesInternal.h
    M Source/WebKit/UIProcess/API/ios/WKWebViewIOS.mm
    R Source/WebKit/UIProcess/CaptivePortalModeObserver.h
    M Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm
    M Source/WebKit/UIProcess/Launcher/ProcessLauncher.h
    M Source/WebKit/UIProcess/Launcher/cocoa/ProcessLauncherCocoa.mm
    A Source/WebKit/UIProcess/LockdownModeObserver.h
    M Source/WebKit/UIProcess/SuspendedPageProxy.cpp
    M Source/WebKit/UIProcess/SuspendedPageProxy.h
    M Source/WebKit/UIProcess/WebPageProxy.cpp
    M Source/WebKit/UIProcess/WebPageProxy.h
    M Source/WebKit/UIProcess/WebProcessCache.cpp
    M Source/WebKit/UIProcess/WebProcessCache.h
    M Source/WebKit/UIProcess/WebProcessPool.cpp
    M Source/WebKit/UIProcess/WebProcessPool.h
    M Source/WebKit/UIProcess/WebProcessProxy.cpp
    M Source/WebKit/UIProcess/WebProcessProxy.h
    M Source/WebKit/WebKit.xcodeproj/project.pbxproj
    M Source/WebKit/WebProcess/WebPage/WebPage.cpp
    M Source/WebKit/WebProcess/WebProcess.cpp
    M Source/WebKit/WebProcess/WebProcess.h
    M Tools/TestWebKitAPI/SourcesCocoa.txt
    M Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj
    R Tools/TestWebKitAPI/Tests/WebKitCocoa/CaptivePortalModeFonts.mm
    R Tools/TestWebKitAPI/Tests/WebKitCocoa/CaptivePortalPDF.html
    M Tools/TestWebKitAPI/Tests/WebKitCocoa/Download.mm
    A Tools/TestWebKitAPI/Tests/WebKitCocoa/LockdownModeFonts.mm
    A Tools/TestWebKitAPI/Tests/WebKitCocoa/LockdownModePDF.html
    M Tools/TestWebKitAPI/Tests/WebKitCocoa/MediaLoading.mm
    M Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm
    M Tools/TestWebKitAPI/Tests/WebKitCocoa/UIDelegate.mm

  Log Message:
  -----------
  Rename references to "captive portal mode" in WebKit to "Lockdown mode"
https://bugs.webkit.org/show_bug.cgi?id=246648

Reviewed by Geoffrey Garen and Chris Dumez.

Mechanically rename all "captive portal" code in WebKit to Lockdown mode instead, to reflect the
true purpose of this code. Note that we avoid renaming:

- Exported SPI or API methods.
- The child process name ("com.apple.WebKit.WebContent.CaptivePortal")

...to avoid breaking any clients (Apple-internal or third party) that may be relying on these
existing names.

* Source/WTF/Scripts/Preferences/WebPreferences.yaml:
* Source/WebCore/loader/appcache/ApplicationCacheHost.cpp:
(WebCore::ApplicationCacheHost::maybeLoadFallbackSynchronously):
* Source/WebKit/GPUProcess/GPUConnectionToWebProcess.cpp:
(WebKit::GPUConnectionToWebProcess::createGraphicsContextGL):
(WebKit::GPUConnectionToWebProcess::releaseGraphicsContextGL):
* Source/WebKit/GPUProcess/GPUConnectionToWebProcess.h:
(WebKit::GPUConnectionToWebProcess::isLockdownModeEnabled const):
(WebKit::GPUConnectionToWebProcess::isCaptivePortalModeEnabled const): Deleted.
* Source/WebKit/GPUProcess/media/RemoteAudioDestinationManager.cpp:
(WebKit::RemoteAudioDestinationManager::createAudioDestination):
(WebKit::RemoteAudioDestinationManager::deleteAudioDestination):
(WebKit::RemoteAudioDestinationManager::startAudioDestination):
(WebKit::RemoteAudioDestinationManager::stopAudioDestination):
* Source/WebKit/Shared/GPUProcessConnectionParameters.h:
(WebKit::GPUProcessConnectionParameters::encode const):
(WebKit::GPUProcessConnectionParameters::decode):
* Source/WebKit/Shared/WebProcessCreationParameters.cpp:
(WebKit::WebProcessCreationParameters::encode const):
(WebKit::WebProcessCreationParameters::decode):
* Source/WebKit/Shared/WebProcessCreationParameters.h:
* Source/WebKit/UIProcess/API/APIPageConfiguration.cpp:
(API::PageConfiguration::lockdownModeEnabled const):
(API::PageConfiguration::isLockdownModeExplicitlySet const):
(API::PageConfiguration::captivePortalModeEnabled const): Deleted.
(API::PageConfiguration::isCaptivePortalModeExplicitlySet const): Deleted.
* Source/WebKit/UIProcess/API/APIPageConfiguration.h:
* Source/WebKit/UIProcess/API/APIWebsitePolicies.cpp:
(API::WebsitePolicies::copy const):
(API::WebsitePolicies::lockdownModeEnabled const):
(API::WebsitePolicies::captivePortalModeEnabled const): Deleted.
* Source/WebKit/UIProcess/API/APIWebsitePolicies.h:
* Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm:
(+[WKProcessPool _setCaptivePortalModeEnabledGloballyForTesting:]):
(+[WKProcessPool _lockdownModeEnabledGloballyForTesting]):
(+[WKProcessPool _clearCaptivePortalModeEnabledGloballyForTesting]):
* Source/WebKit/UIProcess/API/Cocoa/WKWebpagePreferences.mm:
(-[WKWebpagePreferences init]):
(-[WKWebpagePreferences _setCaptivePortalModeEnabled:]):
(-[WKWebpagePreferences _captivePortalModeEnabled]):
(-[WKWebpagePreferences isLockdownModeEnabled]):
(-[WKWebpagePreferences setLockdownModeEnabled:]):
* Source/WebKit/UIProcess/API/Cocoa/WKWebpagePreferencesInternal.h:
* Source/WebKit/UIProcess/API/Cocoa/_WKSystemPreferences.mm:
(+[_WKSystemPreferences isCaptivePortalModeEnabled]):
(+[_WKSystemPreferences setCaptivePortalModeEnabled:]):
(+[_WKSystemPreferences setCaptivePortalModeIgnored:ignore:]):
* Source/WebKit/UIProcess/API/Cocoa/_WKSystemPreferencesInternal.h:
* Source/WebKit/UIProcess/API/ios/WKWebViewIOS.mm:
(-[WKWebView didMoveToWindow]):
(isLockdownModeWarningNeeded):
(-[WKWebView _presentLockdownMode]):
(-[WKWebView _presentLockdownModeAlertIfNeeded]):
(-[WKWebView _presentCaptivePortalMode]): Deleted.
(-[WKWebView _presentCaptivePortalModeAlertIfNeeded]): Deleted.
* Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm:
(WebKit::cachedLockdownModeEnabledGlobally):
(WebKit::WebProcessPool::lockdownModeConfigUpdateCallback):
(WebKit::WebProcessPool::registerNotificationObservers):
(WebKit::WebProcessPool::unregisterNotificationObservers):
(WebKit::lockdownModeObservers):
(WebKit::isLockdownModeEnabledGloballyForTesting):
(WebKit::isLockdownModeEnabledBySystemIgnoringCaching):
(WebKit::WebProcessPool::lockdownModeStateChanged):
(WebKit::addLockdownModeObserver):
(WebKit::removeLockdownModeObserver):
(WebKit::lockdownModeEnabledBySystem):
(WebKit::setLockdownModeEnabledGloballyForTesting):
(WebKit::WebProcessPool::notifyPreferencesChanged):
(WebKit::cachedCaptivePortalModeEnabledGlobally): Deleted.
(WebKit::WebProcessPool::captivePortalModeConfigUpdateCallback): Deleted.
(WebKit::captivePortalModeObservers): Deleted.
(WebKit::isCaptivePortalModeEnabledGloballyForTesting): Deleted.
(WebKit::isCaptivePortalModeEnabledBySystemIgnoringCaching): Deleted.
(WebKit::WebProcessPool::captivePortalModeStateChanged): Deleted.
(WebKit::addCaptivePortalModeObserver): Deleted.
(WebKit::removeCaptivePortalModeObserver): Deleted.
(WebKit::captivePortalModeEnabledBySystem): Deleted.
(WebKit::setCaptivePortalModeEnabledGloballyForTesting): Deleted.
* Source/WebKit/UIProcess/Launcher/ProcessLauncher.h:
(WebKit::ProcessLauncher::Client::shouldEnableLockdownMode const):
(WebKit::ProcessLauncher::Client::shouldEnableCaptivePortalMode const): Deleted.
* Source/WebKit/UIProcess/Launcher/cocoa/ProcessLauncherCocoa.mm:
(WebKit::webContentServiceName):
(WebKit::ProcessLauncher::launchProcess):
* Source/WebKit/UIProcess/LockdownModeObserver.h: Renamed from Source/WebKit/UIProcess/CaptivePortalModeObserver.h.
(WebKit::LockdownModeObserver::~LockdownModeObserver):
* Source/WebKit/UIProcess/SuspendedPageProxy.cpp:
(WebKit::SuspendedPageProxy::findReusableSuspendedPageProcess):
* Source/WebKit/UIProcess/SuspendedPageProxy.h:
* Source/WebKit/UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::launchProcess):
(WebKit::WebPageProxy::receivedNavigationPolicyDecision):
(WebKit::WebPageProxy::decidePolicyForResponseShared):
(WebKit::WebPageProxy::triggerBrowsingContextGroupSwitchForNavigation):
(WebKit::WebPageProxy::shouldEnableLockdownMode const):
(WebKit::WebPageProxy::shouldEnableCaptivePortalMode const): Deleted.
* Source/WebKit/UIProcess/WebPageProxy.h:
* Source/WebKit/UIProcess/WebProcessCache.cpp:
(WebKit::WebProcessCache::takeProcess):
* Source/WebKit/UIProcess/WebProcessCache.h:
* Source/WebKit/UIProcess/WebProcessPool.cpp:
(WebKit::WebProcessPool::createGPUProcessConnection):
(WebKit::WebProcessPool::createNewWebProcess):
(WebKit::WebProcessPool::tryTakePrewarmedProcess):
(WebKit::WebProcessPool::initializeNewWebProcess):
(WebKit::WebProcessPool::prewarmProcess):
(WebKit::WebProcessPool::processForRegistrableDomain):
(WebKit::WebProcessPool::createWebPage):
(WebKit::WebProcessPool::processForNavigation):
(WebKit::WebProcessPool::processForNavigationInternal):
(WebKit::addLockdownModeObserver):
(WebKit::removeLockdownModeObserver):
(WebKit::lockdownModeEnabledBySystem):
(WebKit::setLockdownModeEnabledGloballyForTesting):
(WebKit::addCaptivePortalModeObserver): Deleted.
(WebKit::removeCaptivePortalModeObserver): Deleted.
(WebKit::captivePortalModeEnabledBySystem): Deleted.
(WebKit::setCaptivePortalModeEnabledGloballyForTesting): Deleted.
* Source/WebKit/UIProcess/WebProcessPool.h:
* Source/WebKit/UIProcess/WebProcessProxy.cpp:
(WebKit::WebProcessProxy::create):
(WebKit::WebProcessProxy::createForRemoteWorkers):
(WebKit::WebProcessProxy::WebProcessProxy):
* Source/WebKit/UIProcess/WebProcessProxy.h:
(WebKit::WebProcessProxy::lockdownMode const):
(WebKit::WebProcessProxy::captivePortalMode const): Deleted.
* Source/WebKit/WebKit.xcodeproj/project.pbxproj:
* Source/WebKit/WebProcess/WebPage/WebPage.cpp:
(WebKit::adjustSettingsForLockdownMode):
(WebKit::WebPage::updatePreferences):
(adjustCoreGraphicsForCaptivePortal): Deleted.

Remove this helper method, and move the function calls to the call site in
`adjustSettingsForLockdownMode`. Additionally add a FIXME, regarding the placement of these function
calls.

(WebKit::adjustSettingsForCaptivePortal): Deleted.
* Source/WebKit/WebProcess/WebProcess.cpp:
(WebKit::WebProcess::initializeWebProcess):
* Source/WebKit/WebProcess/WebProcess.h:
(WebKit::WebProcess::isLockdownModeEnabled const):
(WebKit::WebProcess::isCaptivePortalModeEnabled const): Deleted.
* Tools/TestWebKitAPI/SourcesCocoa.txt:
* Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
* Tools/TestWebKitAPI/Tests/WebKitCocoa/CaptivePortalPDF.html:
* Tools/TestWebKitAPI/Tests/WebKitCocoa/Download.mm:
* Tools/TestWebKitAPI/Tests/WebKitCocoa/LockdownModeFonts.mm: Renamed from Tools/TestWebKitAPI/Tests/WebKitCocoa/CaptivePortalModeFonts.mm.
(TestWebKitAPI::TEST):
* Tools/TestWebKitAPI/Tests/WebKitCocoa/MediaLoading.mm:
(TestWebKitAPI::TEST):
* Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:
(-[LockdownModeKVO observeValueForKeyPath:ofObject:change:context:]):
(-[CaptivePortalModeKVO observeValueForKeyPath:ofObject:change:context:]): Deleted.
(-[CaptivePortalMessageHandler userContentController:didReceiveScriptMessage:]): Deleted.
* Tools/TestWebKitAPI/Tests/WebKitCocoa/UIDelegate.mm:

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

More information about the webkit-changes mailing list