Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: 6b884b71e2361eb9bdbf586b61e9605bddc6b495
https://github.com/WebKit/WebKit/commit/6b884b71e2361eb9bdbf586b61e9605bddc6b495
Author: Jamie Murphy <[email protected]>
Date: 2025-09-16 (Tue, 16 Sep 2025)
Changed paths:
M Source/WebKit/Shared/Extensions/WebExtensionSQLiteStore.cpp
M Source/WebKit/Shared/Extensions/WebExtensionSQLiteStore.h
M Source/WebKit/Sources.txt
A
Source/WebKit/UIProcess/Extensions/API/WebExtensionContextAPIDeclarativeNetRequest.cpp
M
Source/WebKit/UIProcess/Extensions/Cocoa/API/WebExtensionContextAPIDeclarativeNetRequestCocoa.mm
M Source/WebKit/UIProcess/Extensions/Cocoa/WebExtensionContextCocoa.mm
A
Source/WebKit/UIProcess/Extensions/Cocoa/WebExtensionDeclarativeNetRequestSQLiteStoreCocoa.mm
R
Source/WebKit/UIProcess/Extensions/Cocoa/_WKWebExtensionDeclarativeNetRequestSQLiteStore.h
R
Source/WebKit/UIProcess/Extensions/Cocoa/_WKWebExtensionDeclarativeNetRequestSQLiteStore.mm
M Source/WebKit/UIProcess/Extensions/WebExtensionContext.h
A
Source/WebKit/UIProcess/Extensions/WebExtensionDeclarativeNetRequestSQLiteStore.cpp
A
Source/WebKit/UIProcess/Extensions/WebExtensionDeclarativeNetRequestSQLiteStore.h
M Source/WebKit/UIProcess/Extensions/WebExtensionStorageSQLiteStore.h
M Source/WebKit/WebKit.xcodeproj/project.pbxproj
M Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj
A Tools/TestWebKitAPI/Tests/WebKitCocoa/DeclarativeNetRequestRules.db
A Tools/TestWebKitAPI/Tests/WebKitCocoa/DeclarativeNetRequestRules.db-shm
A Tools/TestWebKitAPI/Tests/WebKitCocoa/DeclarativeNetRequestRules.db-wal
M
Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebExtensionAPIDeclarativeNetRequest.mm
Log Message:
-----------
Port _WKWebExtensionDeclarativeNetRequestSQLiteStore to C++
https://bugs.webkit.org/show_bug.cgi?id=296080
Reviewed by Timothy Hatcher.
Following previous work with C++ SQLite databases, this ports
the Declarative Net Request SQLite store to C++ and removes the previous
Cocoa-only implementation.
* Source/WebKit/Shared/Extensions/WebExtensionSQLiteStore.cpp:
(WebKit::WebExtensionSQLiteStore::createSavepoint):
(WebKit::WebExtensionSQLiteStore::commitSavepoint):
(WebKit::WebExtensionSQLiteStore::rollbackToSavepoint):
* Source/WebKit/Shared/Extensions/WebExtensionSQLiteStore.h:
* Source/WebKit/Sources.txt:
*
Source/WebKit/UIProcess/Extensions/API/WebExtensionContextAPIDeclarativeNetRequest.cpp:
Added.
(WebKit::WebExtensionContext::isDeclarativeNetRequestMessageAllowed):
(WebKit::WebExtensionContext::declarativeNetRequestGetEnabledRulesets):
(WebKit::WebExtensionContext::declarativeNetRequestValidateRulesetIdentifiers):
(WebKit::WebExtensionContext::declarativeNetRequestDynamicRulesStore):
(WebKit::WebExtensionContext::declarativeNetRequestSessionRulesStore):
(WebKit::WebExtensionContext::updateDeclarativeNetRequestRulesInStorage):
(WebKit::WebExtensionContext::declarativeNetRequestGetDynamicRules):
(WebKit::WebExtensionContext::declarativeNetRequestUpdateDynamicRules):
(WebKit::WebExtensionContext::declarativeNetRequestGetSessionRules):
(WebKit::WebExtensionContext::declarativeNetRequestUpdateSessionRules):
*
Source/WebKit/UIProcess/Extensions/Cocoa/API/WebExtensionContextAPIDeclarativeNetRequestCocoa.mm:
(WebKit::WebExtensionContext::isDeclarativeNetRequestMessageAllowed): Deleted.
(WebKit::WebExtensionContext::declarativeNetRequestGetEnabledRulesets): Deleted.
(WebKit::WebExtensionContext::declarativeNetRequestValidateRulesetIdentifiers):
Deleted.
(WebKit::WebExtensionContext::declarativeNetRequestDynamicRulesStore): Deleted.
(WebKit::WebExtensionContext::declarativeNetRequestSessionRulesStore): Deleted.
(WebKit::WebExtensionContext::updateDeclarativeNetRequestRulesInStorage):
Deleted.
(WebKit::WebExtensionContext::declarativeNetRequestGetDynamicRules): Deleted.
(WebKit::WebExtensionContext::declarativeNetRequestUpdateDynamicRules): Deleted.
(WebKit::WebExtensionContext::declarativeNetRequestGetSessionRules): Deleted.
(WebKit::WebExtensionContext::declarativeNetRequestUpdateSessionRules): Deleted.
* Source/WebKit/UIProcess/Extensions/Cocoa/WebExtensionContextCocoa.mm:
(WebKit::WebExtensionContext::loadDeclarativeNetRequestRules):
*
Source/WebKit/UIProcess/Extensions/Cocoa/WebExtensionDeclarativeNetRequestSQLiteStoreCocoa.mm:
Added.
(WebKit::WebExtensionDeclarativeNetRequestSQLiteStore::migrateData):
*
Source/WebKit/UIProcess/Extensions/Cocoa/_WKWebExtensionDeclarativeNetRequestSQLiteStore.h:
Removed.
*
Source/WebKit/UIProcess/Extensions/Cocoa/_WKWebExtensionDeclarativeNetRequestSQLiteStore.mm:
Removed.
* Source/WebKit/UIProcess/Extensions/WebExtensionContext.h:
*
Source/WebKit/UIProcess/Extensions/WebExtensionDeclarativeNetRequestSQLiteStore.cpp:
(WebKit::WebExtensionDeclarativeNetRequestSQLiteStore::WebExtensionDeclarativeNetRequestSQLiteStore):
(WebKit::ruleIdMapToString):
(WebKit::WebExtensionDeclarativeNetRequestSQLiteStore::updateRulesByRemovingIDs):
(WebKit::WebExtensionDeclarativeNetRequestSQLiteStore::addRules):
(WebKit::WebExtensionDeclarativeNetRequestSQLiteStore::deleteRules):
(WebKit::WebExtensionDeclarativeNetRequestSQLiteStore::getRulesWithRuleIDs):
(WebKit::WebExtensionDeclarativeNetRequestSQLiteStore::getRulesWithRuleIDsInternal):
(WebKit::WebExtensionDeclarativeNetRequestSQLiteStore::getKeysAndValuesFromRowIterator):
(WebKit::WebExtensionDeclarativeNetRequestSQLiteStore::insertRule):
(WebKit::WebExtensionDeclarativeNetRequestSQLiteStore::currentDatabaseSchemaVersion):
(WebKit::WebExtensionDeclarativeNetRequestSQLiteStore::databaseURL):
(WebKit::WebExtensionDeclarativeNetRequestSQLiteStore::createFreshDatabaseSchema):
(WebKit::WebExtensionDeclarativeNetRequestSQLiteStore::migrateToCurrentSchemaVersionIfNeeded):
(WebKit::WebExtensionDeclarativeNetRequestSQLiteStore::resetDatabaseSchema):
(WebKit::WebExtensionDeclarativeNetRequestSQLiteStore::isDatabaseEmpty):
*
Source/WebKit/UIProcess/Extensions/WebExtensionDeclarativeNetRequestSQLiteStore.h:
* Source/WebKit/UIProcess/Extensions/WebExtensionStorageSQLiteStore.h:
* Source/WebKit/WebKit.xcodeproj/project.pbxproj:
* Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
* Tools/TestWebKitAPI/Tests/WebKitCocoa/DeclarativeNetRequestRules.db: Added.
* Tools/TestWebKitAPI/Tests/WebKitCocoa/DeclarativeNetRequestRules.db-shm:
Added.
* Tools/TestWebKitAPI/Tests/WebKitCocoa/DeclarativeNetRequestRules.db-wal:
Added.
*
Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebExtensionAPIDeclarativeNetRequest.mm:
(TestWebKitAPI::TEST(WKWebExtensionAPIDeclarativeNetRequest,
MigrateDeclarativeNetRequestDataToNewFormat)):
Canonical link: https://commits.webkit.org/300056@main
To unsubscribe from these emails, change your notification settings at
https://github.com/WebKit/WebKit/settings/notifications
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
