Branch: refs/heads/main Home: https://github.com/WebKit/WebKit Commit: 7d1d793c1d1794f1792401ae3f00583163457b3a https://github.com/WebKit/WebKit/commit/7d1d793c1d1794f1792401ae3f00583163457b3a Author: Timothy Hatcher <timo...@apple.com> Date: 2024-09-16 (Mon, 16 Sep 2024)
Changed paths: M Source/WebCore/en.lproj/Localizable.strings M Source/WebKit/Shared/Extensions/WebExtensionUtilities.mm M Source/WebKit/Sources.txt M Source/WebKit/UIProcess/API/Cocoa/WKWebExtensionMatchPattern.mm M Source/WebKit/UIProcess/Extensions/Cocoa/WebExtensionCocoa.mm M Source/WebKit/UIProcess/Extensions/Cocoa/WebExtensionContextCocoa.mm M Source/WebKit/UIProcess/Extensions/Cocoa/WebExtensionControllerCocoa.mm M Source/WebKit/UIProcess/Extensions/Cocoa/WebExtensionMatchPatternCocoa.mm M Source/WebKit/UIProcess/Extensions/Cocoa/WebExtensionTabCocoa.mm M Source/WebKit/UIProcess/Extensions/WebExtension.cpp A Source/WebKit/UIProcess/Extensions/WebExtensionMatchPattern.cpp M Source/WebKit/UIProcess/Extensions/WebExtensionMatchPattern.h M Source/WebKit/WebKit.xcodeproj/project.pbxproj M Source/WebKit/WebProcess/Extensions/Cocoa/_WKWebExtensionWebRequestFilter.mm M Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebExtensionAPIWebRequest.mm M Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebExtensionMatchPattern.mm Log Message: ----------- Move WebExtensionMatchPattern to cross-platform location. https://webkit.org/b/279734 rdar://problem/136037431 Reviewed by Brian Weinstein. Moved the bulk of the implementation as-is from `WebExtensionMatchPatternCocoa`. Changed the errors to be localized, since `API::Error` requires it. Also changed `expandedStrings()` to return a `Vector`. * Source/WebCore/en.lproj/Localizable.strings: Updated. * Source/WebKit/Shared/Extensions/WebExtensionUtilities.mm: (WebKit::toErrorString): Move `trimTrailingPeriod()` to the result of the format, so it catches trailing periods in trailing substitution strings. * Source/WebKit/Sources.txt: Added WebExtensionMatchPattern.cpp. * Source/WebKit/UIProcess/API/Cocoa/WKWebExtensionMatchPattern.mm: (-[WKWebExtensionMatchPattern initWithString:error:]): (-[WKWebExtensionMatchPattern initWithScheme:host:path:error:]): * Source/WebKit/UIProcess/Extensions/Cocoa/WebExtensionCocoa.mm: (WebKit::WebExtension::InjectedContentData::expandedIncludeMatchPatternStrings const): (WebKit::WebExtension::InjectedContentData::expandedExcludeMatchPatternStrings const): * Source/WebKit/UIProcess/Extensions/Cocoa/WebExtensionContextCocoa.mm: (WebKit::WebExtensionContext::corsDisablingPatterns): (WebKit::WebExtensionContext::addInjectedContent): * Source/WebKit/UIProcess/Extensions/Cocoa/WebExtensionControllerCocoa.mm: (WebKit::WebExtensionController::updateWebsitePoliciesForNavigation): * Source/WebKit/UIProcess/Extensions/Cocoa/WebExtensionMatchPatternCocoa.mm: (WebKit::toPatterns): (WebKit::toAPI): (WebKit::WebExtensionMatchPattern::extensionSchemes): Deleted. (WebKit::WebExtensionMatchPattern::validSchemes): Deleted. (WebKit::WebExtensionMatchPattern::supportedSchemes): Deleted. (WebKit::WebExtensionMatchPattern::patternsMatchURL): Deleted. (WebKit::WebExtensionMatchPattern::patternsMatchPattern): Deleted. (WebKit::patternCache): Deleted. (WebKit::WebExtensionMatchPattern::registerCustomURLScheme): Deleted. (WebKit::WebExtensionMatchPattern::isWebExtensionURL): Deleted. (WebKit::WebExtensionMatchPattern::getOrCreate): Deleted. (WebKit::WebExtensionMatchPattern::allURLsMatchPattern): Deleted. (WebKit::WebExtensionMatchPattern::allHostsAndSchemesMatchPattern): Deleted. (WebKit::WebExtensionMatchPattern::patternsMatchAllHosts): Deleted. (WebKit::error): Deleted. (WebKit::WebExtensionMatchPattern::WebExtensionMatchPattern): Deleted. (WebKit::WebExtensionMatchPattern::isSupported const): Deleted. (WebKit::WebExtensionMatchPattern::operator== const): Deleted. (WebKit::WebExtensionMatchPattern::scheme const): Deleted. (WebKit::WebExtensionMatchPattern::host const): Deleted. (WebKit::WebExtensionMatchPattern::path const): Deleted. (WebKit::WebExtensionMatchPattern::hostIsPublicSuffix const): Deleted. (WebKit::WebExtensionMatchPattern::stringWithScheme const): Deleted. (WebKit::WebExtensionMatchPattern::expandedStrings const): Deleted. (WebKit::WebExtensionMatchPattern::matchesAllHosts const): Deleted. (WebKit::WebExtensionMatchPattern::isValidScheme): Deleted. (WebKit::WebExtensionMatchPattern::matchesURL const): Deleted. (WebKit::WebExtensionMatchPattern::matchesPattern const): Deleted. (WebKit::WebExtensionMatchPattern::schemeMatches const): Deleted. (WebKit::WebExtensionMatchPattern::hostMatches const): Deleted. (WebKit::WebExtensionMatchPattern::pathMatches const): Deleted. (WebKit::toStrings): Deleted. * Source/WebKit/UIProcess/Extensions/Cocoa/WebExtensionTabCocoa.mm: (WebKit::WebExtensionTab::matches const): * Source/WebKit/UIProcess/Extensions/WebExtensionMatchPattern.cpp: Copied from Cocoa/WebExtensionMatchPatternCocoa.mm. (WebKit::WebExtensionMatchPattern::extensionSchemes): (WebKit::WebExtensionMatchPattern::validSchemes): (WebKit::WebExtensionMatchPattern::supportedSchemes): (WebKit::WebExtensionMatchPattern::patternsMatchURL): (WebKit::WebExtensionMatchPattern::patternsMatchPattern): (WebKit::patternCache): (WebKit::WebExtensionMatchPattern::registerCustomURLScheme): (WebKit::WebExtensionMatchPattern::isWebExtensionURL): (WebKit::WebExtensionMatchPattern::getOrCreate): (WebKit::WebExtensionMatchPattern::allURLsMatchPattern): (WebKit::WebExtensionMatchPattern::allHostsAndSchemesMatchPattern): (WebKit::WebExtensionMatchPattern::patternsMatchAllHosts): (WebKit::WebExtensionMatchPattern::createError): (WebKit::WebExtensionMatchPattern::WebExtensionMatchPattern): (WebKit::WebExtensionMatchPattern::isSupported const): (WebKit::WebExtensionMatchPattern::operator== const): (WebKit::WebExtensionMatchPattern::scheme const): (WebKit::WebExtensionMatchPattern::host const): (WebKit::WebExtensionMatchPattern::path const): (WebKit::WebExtensionMatchPattern::hostIsPublicSuffix const): (WebKit::WebExtensionMatchPattern::stringWithScheme const): (WebKit::WebExtensionMatchPattern::expandedStrings const): (WebKit::WebExtensionMatchPattern::matchesAllHosts const): (WebKit::WebExtensionMatchPattern::isValidScheme): (WebKit::WebExtensionMatchPattern::matchesURL const): (WebKit::WebExtensionMatchPattern::matchesPattern const): (WebKit::WebExtensionMatchPattern::schemeMatches const): (WebKit::WebExtensionMatchPattern::hostMatches const): (WebKit::WebExtensionMatchPattern::pathMatches const): (WebKit::toStrings): (WebKit::toPatterns): * Source/WebKit/UIProcess/Extensions/WebExtensionMatchPattern.h: (WebKit::WebExtensionMatchPattern::wrapper const): (WebKit::WebExtensionMatchPattern::WebExtensionMatchPattern): Deleted. (WebKit::WebExtensionMatchPattern::~WebExtensionMatchPattern): Deleted. * Source/WebKit/WebKit.xcodeproj/project.pbxproj: Added WebExtensionMatchPattern.cpp and WebExtension.cpp. * Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebExtensionMatchPattern.mm: (TestWebKitAPI::TEST(WKWebExtensionMatchPattern, PatternValidity)): Use `error.localizedDescription`. (TestWebKitAPI::TEST(WKWebExtensionMatchPattern, CustomURLScheme)): Ditto. * Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebExtensionAPIWebRequest.mm: (TestWebKitAPI::TEST(WKWebExtensionAPIWebRequest, Initialization)): Remove double period after fix in `toErrorString()`. Canonical link: https://commits.webkit.org/283710@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