[webkit-changes] [WebKit/WebKit] 7d98f2: Replace URL::isLocalFile() with URL::protocolIsFile()

Anne van Kesteren noreply at github.com
Thu May 25 08:07:52 PDT 2023


  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: 7d98f2cb5754ff4e12eb2ae74eff12f1ccf3665b
      https://github.com/WebKit/WebKit/commit/7d98f2cb5754ff4e12eb2ae74eff12f1ccf3665b
  Author: Anne van Kesteren <annevk at annevk.nl>
  Date:   2023-05-25 (Thu, 25 May 2023)

  Changed paths:
    M Source/JavaScriptCore/API/JSScript.mm
    M Source/JavaScriptCore/jsc.cpp
    M Source/WTF/wtf/URL.cpp
    M Source/WTF/wtf/URL.h
    M Source/WTF/wtf/URLParser.cpp
    M Source/WebCore/Modules/model-element/scenekit/SceneKitModelLoader.mm
    M Source/WebCore/dom/Document.cpp
    M Source/WebCore/dom/Element.cpp
    M Source/WebCore/editing/cocoa/WebContentReaderCocoa.mm
    M Source/WebCore/editing/ios/EditorIOS.mm
    M Source/WebCore/html/HTMLMediaElement.cpp
    M Source/WebCore/html/URLDecomposition.cpp
    M Source/WebCore/loader/DocumentThreadableLoader.cpp
    M Source/WebCore/page/ContextMenuController.cpp
    M Source/WebCore/page/History.cpp
    M Source/WebCore/page/Page.cpp
    M Source/WebCore/page/SecurityOrigin.cpp
    M Source/WebCore/page/csp/ContentSecurityPolicy.cpp
    M Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp
    M Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
    M Source/WebCore/platform/gtk/DragDataGtk.cpp
    M Source/WebCore/platform/network/ResourceHandle.cpp
    M Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm
    M Source/WebCore/platform/network/curl/CurlContext.cpp
    M Source/WebCore/platform/network/curl/CurlRequest.cpp
    M Source/WebCore/platform/win/PasteboardWin.cpp
    M Source/WebCore/testing/Internals.cpp
    M Source/WebCore/workers/Worker.cpp
    M Source/WebKit/NetworkProcess/NetworkResourceLoadParameters.cpp
    M Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm
    M Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp
    M Source/WebKit/UIProcess/WebPageProxy.cpp
    M Source/WebKit/UIProcess/WebProcessProxy.cpp
    M Source/WebKit/WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp
    M Source/WebKit/WebProcess/WebCoreSupport/WebResourceLoadObserver.cpp
    M Source/WebKit/WebProcess/WebPage/WebPage.cpp
    M Tools/WebKitTestRunner/InjectedBundle/atspi/AccessibilityUIElementAtspi.cpp

  Log Message:
  -----------
  Replace URL::isLocalFile() with URL::protocolIsFile()
https://bugs.webkit.org/show_bug.cgi?id=257316
rdar://109824173

Reviewed by Michael Catanzaro.

This makes it consistent with URL::protocolIsBlob().

* Source/JavaScriptCore/API/JSScript.mm:
(validateBytecodeCachePath):
(+[JSScript scriptOfType:memoryMappedFromASCIIFile:withSourceURL:andBytecodeCache:inVirtualMachine:error:]):
* Source/JavaScriptCore/jsc.cpp:
(GlobalObject::moduleLoaderImportModule):
(GlobalObject::moduleLoaderResolve):
(GlobalObject::moduleLoaderFetch):
(computeFilePath):
* Source/WTF/wtf/URL.cpp:
(WTF::URL::hasSpecialScheme const):
(WTF::URL::hasLocalScheme const):
(WTF::URL::fileSystemPath const):
(WTF::URL::setProtocol):
(WTF::URL::setPath):
(WTF::portAllowed):
(WTF::URL::isLocalFile const): Deleted.
(WTF::URL::protocolIsAbout const): Deleted.
* Source/WTF/wtf/URL.h:
(WTF::URL::protocolIsAbout const):
(WTF::URL::protocolIsFile const):
* Source/WTF/wtf/URLParser.cpp:
(WTF::URLParser::copyBaseWindowsDriveLetter):
(WTF::URLParser::URLParser):
(WTF::URLParser::parse):
* Source/WebCore/Modules/model-element/scenekit/SceneKitModelLoader.mm:
(WebCore::mimeTypeUtilizingFileExtensionOverridingForLocalFiles):
* Source/WebCore/dom/Document.cpp:
(WebCore::Document::isCookieAverse const):
* Source/WebCore/dom/Element.cpp:
(WebCore::Element::resolveURLStringIfNeeded const):
* Source/WebCore/editing/cocoa/WebContentReaderCocoa.mm:
(WebCore::WebContentReader::readHTML):
(WebCore::WebContentMarkupReader::readHTML):
* Source/WebCore/editing/ios/EditorIOS.mm:
(WebCore::Editor::writeImageToPasteboard):
* Source/WebCore/html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::loadResource):
* Source/WebCore/html/URLDecomposition.cpp:
(WebCore::URLDecomposition::setUsername):
(WebCore::URLDecomposition::setPassword):
(WebCore::URLDecomposition::setHost):
(WebCore::URLDecomposition::setHostname):
(WebCore::URLDecomposition::setPort):
* Source/WebCore/loader/DocumentThreadableLoader.cpp:
(WebCore::DocumentThreadableLoader::loadRequest):
* Source/WebCore/page/ContextMenuController.cpp:
(WebCore::ContextMenuController::populate):
(WebCore::ContextMenuController::checkOrEnableIfNeeded const):
* Source/WebCore/page/History.cpp:
(WebCore::History::stateObjectAdded):
* Source/WebCore/page/Page.cpp:
(WebCore::Page::hasLocalDataForURL):
* Source/WebCore/page/SecurityOrigin.cpp:
(WebCore::SecurityOrigin::shouldIgnoreHost):
(WebCore::SecurityOrigin::createNonLocalWithAllowedFilePath):
(WebCore::SecurityOrigin::canDisplay const):
* Source/WebCore/page/csp/ContentSecurityPolicy.cpp:
(WebCore::shouldReportProtocolOnly):
* Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:
(WebCore::MediaPlayerPrivateAVFoundation::canSaveMediaData const):
* Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
(WebCore::MediaPlayerPrivateGStreamer::setPlaybinURL):
(WebCore::MediaPlayerPrivateGStreamer::canSaveMediaData const):
* Source/WebCore/platform/gtk/DragDataGtk.cpp:
(WebCore::DragData::asURL const):
* Source/WebCore/platform/network/ResourceHandle.cpp:
(WebCore::ResourceHandle::shouldContentSniffURL):
* Source/WebCore/platform/network/cocoa/ResourceRequestCocoa.mm:
(WebCore::ResourceRequest::doUpdatePlatformRequest):
* Source/WebCore/platform/network/curl/CurlContext.cpp:
(WebCore::CurlHandle::setUrl):
* Source/WebCore/platform/network/curl/CurlRequest.cpp:
(WebCore::CurlRequest::start):
(WebCore::CurlRequest::invokeDidReceiveResponseForFile):
* Source/WebCore/platform/win/PasteboardWin.cpp:
(WebCore::fileSystemPathFromURLOrTitle):
(WebCore::createGlobalHDropContent):
* Source/WebCore/testing/Internals.cpp:
(WebCore::Internals::createFile):
* Source/WebCore/workers/Worker.cpp:
(WebCore::Worker::didReceiveResponse):
* Source/WebKit/NetworkProcess/NetworkResourceLoadParameters.cpp:
(WebKit::NetworkResourceLoadParameters::NetworkResourceLoadParameters):
(WebKit::NetworkResourceLoadParameters::sandboxExtensionIflocalFile const):
* Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm:
(WebKit::NetworkDataTaskCocoa::NetworkDataTaskCocoa):
* Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp:
(WebKit::NetworkDataTaskSoup::createRequest):
* Source/WebKit/UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::maybeInitializeSandboxExtensionHandle):
(WebKit::WebPageProxy::loadRequestWithNavigationShared):
(WebKit::WebPageProxy::loadFile):
(WebKit::WebPageProxy::loadAlternateHTML):
(WebKit::shouldTreatURLProtocolAsAppBound):
(WebKit::WebPageProxy::receivedNavigationPolicyDecision):
(WebKit::WebPageProxy::continueNavigationInNewProcess):
(WebKit::WebPageProxy::decidePolicyForNavigationActionAsyncShared):
(WebKit::WebPageProxy::backForwardAddItemShared):
(WebKit::WebPageProxy::checkURLReceivedFromCurrentOrPreviousWebProcess):
* Source/WebKit/UIProcess/WebProcessProxy.cpp:
(WebKit::WebProcessProxy::assumeReadAccessToBaseURL):
(WebKit::WebProcessProxy::hasAssumedReadAccessToURL const):
(WebKit::WebProcessProxy::checkURLReceivedFromWebProcess):
(WebKit::WebProcessProxy::addPreviouslyApprovedFileURL):
(WebKit::WebProcessProxy::wasPreviouslyApprovedFileURL const):
* Source/WebKit/WebProcess/GPU/media/MediaPlayerPrivateRemote.cpp:
(WebKit::MediaPlayerPrivateRemote::load):
* Source/WebKit/WebProcess/WebCoreSupport/WebResourceLoadObserver.cpp:
(WebKit::WebResourceLoadObserver::logUserInteractionWithReducedTimeResolution):
* Source/WebKit/WebProcess/WebPage/WebPage.cpp:
(WebKit::dumpHistoryItem):
(WebKit::WebPage::SandboxExtensionTracker::shouldReuseCommittedSandboxExtension):
(WebKit::WebPage::shouldSkipDecidePolicyForResponse const):
* Tools/WebKitTestRunner/InjectedBundle/atspi/AccessibilityUIElementAtspi.cpp:
(WTR::AccessibilityUIElement::url):

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




More information about the webkit-changes mailing list