Implement removeDataOfTypes to WKWebsiteDataStore #13605

kshukuwa · 2023-05-08T22:41:02Z

`1300c28`

Implement removeDataOfTypes to WKWebsiteDataStore
https://bugs.webkit.org/show_bug.cgi?id=256452

Reviewed by NOBODY (OOPS!).

Add a function to WKAPI similar to WKWebsiteDataStore::removeDataOfTypes
in the Cocoa port.

* Source/WebKit/Headers.cmake:
* Source/WebKit/Shared/API/c/WKBase.h:
* Source/WebKit/Sources.txt:
* Source/WebKit/SourcesCocoa.txt:
* Source/WebKit/UIProcess/API/C/WKAPICast.cpp: Added.
(WebKit::toWebsiteDataTypes):
(WebKit::toAPI):
* Source/WebKit/UIProcess/API/C/WKAPICast.h:
* Source/WebKit/UIProcess/API/C/WKWebsiteDataRecordRef.cpp: Copied from Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteScrollingTreeIOS.h.
(WKWebsiteDataRecordGetTypeID):
(WKWebsiteDataRecordGetDisplayName):
(WKWebsiteDataRecordGetDataTypes):
* Source/WebKit/UIProcess/API/C/WKWebsiteDataRecordRef.h: Added.
* Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.cpp:
(WKWebsiteDataStoreRemoveITPDataForDomain):
(WKWebsiteDataStoreStatisticsClearThroughWebsiteDataRemoval):
(WKWebsiteDataStoreRemoveAllFetchCaches):
(WKWebsiteDataStoreRemoveNetworkCache):
(WKWebsiteDataStoreRemoveMemoryCaches):
(WKWebsiteDataStoreRemoveFetchCacheForOrigin):
(WKWebsiteDataStoreRemoveAllIndexedDatabases):
(WKWebsiteDataStoreRemoveLocalStorage):
(WKWebsiteDataStoreRemoveAllServiceWorkerRegistrations):
(WKWebsiteDataStoreClearPrivateClickMeasurementsThroughWebsiteDataRemoval):
(WKWebsiteDataStoreClearStorage):
(WKWebsiteDataStoreAllWebsiteDataTypes):
(WKWebsiteDataStoreRemoveDataOfTypes):
(WKWebsiteDataStoreRemoveDataOfTypesWithValues):
* Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.h:
* Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteScrollingTreeIOS.cpp:
* Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteScrollingTreeIOS.h:
* Source/WebKit/UIProcess/RemoteLayerTree/mac/RemoteLayerTreeEventDispatcher.h:
* Source/WebKit/WebKit.xcodeproj/project.pbxproj:
* Tools/MiniBrowser/win/WebKitBrowserWindow.cpp:
(removeDataOfTypesCallback):
(WebKitBrowserWindow::clearWebsiteData):
(removeAllFetchCachesCallback): Deleted.
(removeNetworkCacheCallback): Deleted.
(removeMemoryCachesCallback): Deleted.
(removeAllServiceWorkerRegistrationsCallback): Deleted.
(removeAllIndexedDatabasesCallback): Deleted.
(removeLocalStorageCallback): Deleted.
* Tools/WebKitTestRunner/TestController.cpp:
(WTR::TestController::clearServiceWorkerRegistrations):
(WTR::TestController::clearDOMCache):
(WTR::TestController::clearDOMCaches):
(WTR::TestController::clearMemoryCache):
(WTR::TestController::clearIndexedDatabases):
(WTR::TestController::clearLocalStorage):
(WTR::TestController::clearStorage):
(WTR::TestController::clearStatisticsDataForDomain):
(WTR::TestController::statisticsClearThroughWebsiteDataRemoval):
(WTR::TestController::clearPrivateClickMeasurementsThroughWebsiteDataRemoval):
* Tools/WebKitTestRunner/TestInvocation.cpp:
(WTR::TestInvocation::didReceiveSynchronousMessageFromInjectedBundle):

1300c28

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
	✅ 🛠 watch-sim

webkit-early-warning-system · 2023-05-08T22:41:14Z

EWS run on previous version of this PR (hash 3a38799)

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	❌ 🧪 mac-wk2-stress
	❌ 🛠 watch
	❌ 🛠 watch-sim

webkit-early-warning-system · 2023-05-09T00:35:06Z

EWS run on previous version of this PR (hash 74e6747)

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	❌ 🧪 mac-wk2-stress
	❌ 🛠 watch
	❌ 🛠 watch-sim

achristensen07

I think this is mostly heading in a good direction, and hopefully my feedback can make it so I think it's completely heading in a good direction.

Source/WebKit/UIProcess/API/C/WKAPICast.h

Source/WebKit/UIProcess/API/APIWebsiteDataRecord.h

achristensen07 · 2023-05-10T17:34:12Z

Source/WebKit/UIProcess/API/C/WKWebsiteDataRecordRef.cpp

+    return WebKit::toAPI(API::WebsiteDataRecord::APIType);
+}
+
+WKWebsiteDataRecordRef WKWebsiteDataRecordCreate()


This shouldn't exist. Same with the setters. Instead, I think we should make something like WKWebsiteDataStore.allWebsiteDataTypes, which will probably require making a WKSetRef type like WKDictionaryRef.

Just kidding. I meant fetchDataRecordsOfTypes, which means we don't need a WKSetRef. We already have WKArrayRef.

Does that mean that WKWebsiteDataRecordRef is unnecessary?

It it probably necessary, but it should not be constructible or modifiable by API clients. It is a read-only object that is only constructed inside of WebKit.

Removed WKWebsiteDataStoreRemoveDataOfTypesWithDataRecord as WKWebsiteDataRecord is not available and created WK APIs like WKWebsiteDataStoreRemoveDataOfTypesWithValues instead. What do you think?

Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.cpp

Source/WebKit/UIProcess/API/C/WKWebsiteDataRecordRef.h

webkit-early-warning-system · 2023-05-19T09:34:40Z

EWS run on previous version of this PR (hash 8dbf1dc)

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	❌ 🧪 mac-wk2-stress
	❌ 🛠 watch
	❌ 🛠 watch-sim

kshukuwa · 2023-05-19T09:43:43Z

I will add new files to the xcode project.

webkit-early-warning-system · 2023-05-30T03:15:32Z

EWS run on previous version of this PR (hash 69ab19c)

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
	✅ 🛠 watch-sim

kshukuwa · 2023-05-30T05:11:08Z

The following files are not directly related to this fix. Adding WK???.cpp to the build target causes a build error related to Unified Sources, which has been fixed.

Source/WebKit/UIProcess/RemoteLayerTree/mac/RemoteLayerTreeEventDispatcher.h
Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteScrollingTreeIOS.h
Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteScrollingTreeIOS.cpp

webkit-early-warning-system · 2023-06-02T09:14:55Z

EWS run on previous version of this PR (hash d9a960a)

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
	✅ 🛠 watch-sim

https://bugs.webkit.org/show_bug.cgi?id=256452 Reviewed by NOBODY (OOPS!). Add a function to WKAPI similar to WKWebsiteDataStore::removeDataOfTypes in the Cocoa port. * Source/WebKit/Headers.cmake: * Source/WebKit/Shared/API/c/WKBase.h: * Source/WebKit/Sources.txt: * Source/WebKit/SourcesCocoa.txt: * Source/WebKit/UIProcess/API/C/WKAPICast.cpp: Added. (WebKit::toWebsiteDataTypes): (WebKit::toAPI): * Source/WebKit/UIProcess/API/C/WKAPICast.h: * Source/WebKit/UIProcess/API/C/WKWebsiteDataRecordRef.cpp: Copied from Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteScrollingTreeIOS.h. (WKWebsiteDataRecordGetTypeID): (WKWebsiteDataRecordGetDisplayName): (WKWebsiteDataRecordGetDataTypes): * Source/WebKit/UIProcess/API/C/WKWebsiteDataRecordRef.h: Added. * Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.cpp: (WKWebsiteDataStoreRemoveITPDataForDomain): (WKWebsiteDataStoreStatisticsClearThroughWebsiteDataRemoval): (WKWebsiteDataStoreRemoveAllFetchCaches): (WKWebsiteDataStoreRemoveNetworkCache): (WKWebsiteDataStoreRemoveMemoryCaches): (WKWebsiteDataStoreRemoveFetchCacheForOrigin): (WKWebsiteDataStoreRemoveAllIndexedDatabases): (WKWebsiteDataStoreRemoveLocalStorage): (WKWebsiteDataStoreRemoveAllServiceWorkerRegistrations): (WKWebsiteDataStoreClearPrivateClickMeasurementsThroughWebsiteDataRemoval): (WKWebsiteDataStoreClearStorage): (WKWebsiteDataStoreAllWebsiteDataTypes): (WKWebsiteDataStoreRemoveDataOfTypes): (WKWebsiteDataStoreRemoveDataOfTypesWithValues): * Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.h: * Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteScrollingTreeIOS.cpp: * Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteScrollingTreeIOS.h: * Source/WebKit/UIProcess/RemoteLayerTree/mac/RemoteLayerTreeEventDispatcher.h: * Source/WebKit/WebKit.xcodeproj/project.pbxproj: * Tools/MiniBrowser/win/WebKitBrowserWindow.cpp: (removeDataOfTypesCallback): (WebKitBrowserWindow::clearWebsiteData): (removeAllFetchCachesCallback): Deleted. (removeNetworkCacheCallback): Deleted. (removeMemoryCachesCallback): Deleted. (removeAllServiceWorkerRegistrationsCallback): Deleted. (removeAllIndexedDatabasesCallback): Deleted. (removeLocalStorageCallback): Deleted. * Tools/WebKitTestRunner/TestController.cpp: (WTR::TestController::clearServiceWorkerRegistrations): (WTR::TestController::clearDOMCache): (WTR::TestController::clearDOMCaches): (WTR::TestController::clearMemoryCache): (WTR::TestController::clearIndexedDatabases): (WTR::TestController::clearLocalStorage): (WTR::TestController::clearStorage): (WTR::TestController::clearStatisticsDataForDomain): (WTR::TestController::statisticsClearThroughWebsiteDataRemoval): (WTR::TestController::clearPrivateClickMeasurementsThroughWebsiteDataRemoval): * Tools/WebKitTestRunner/TestInvocation.cpp: (WTR::TestInvocation::didReceiveSynchronousMessageFromInjectedBundle):

webkit-early-warning-system · 2023-06-06T09:41:00Z

EWS run on current version of this PR (hash 1300c28)

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
🛠 🧪 jsc	🧪 api-ios	⏳ 🧪 mac-wk2	🧪 api-gtk
	🛠 tv	🧪 mac-AS-debug-wk2	🛠 jsc-armv7
	⏳ 🛠 tv-sim	⏳ 🧪 mac-wk2-stress	🧪 jsc-armv7-tests
	🛠 watch
	⏳ 🛠 watch-sim

webkit-early-warning-system · 2023-06-06T09:41:01Z

EWS run on current version of this PR (hash 1300c28)

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
	✅ 🛠 watch-sim

kshukuwa · 2023-06-06T09:42:25Z

@achristensen07
Could you please review it?

kshukuwa requested review from cdumez and JonWBedard as code owners May 8, 2023 22:41

webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label May 8, 2023

Ahmad-S792 assigned kshukuwa May 8, 2023

Ahmad-S792 added the WebKit2 Bugs relating to the WebKit2 API layer label May 8, 2023

kshukuwa force-pushed the eng/bug256452 branch from 3a38799 to 74e6747 Compare May 9, 2023 00:34

JonWBedard requested a review from achristensen07 May 10, 2023 17:08

achristensen07 reviewed May 10, 2023

View reviewed changes

kshukuwa force-pushed the eng/bug256452 branch from 74e6747 to 8dbf1dc Compare May 19, 2023 09:34

kshukuwa force-pushed the eng/bug256452 branch from 8dbf1dc to 69ab19c Compare May 30, 2023 03:15

kshukuwa requested a review from achristensen07 May 30, 2023 05:01

kshukuwa force-pushed the eng/bug256452 branch from 69ab19c to d9a960a Compare June 2, 2023 09:14

kshukuwa force-pushed the eng/bug256452 branch from d9a960a to 1300c28 Compare June 6, 2023 09:40

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Implement removeDataOfTypes to WKWebsiteDataStore #13605

Implement removeDataOfTypes to WKWebsiteDataStore #13605

kshukuwa commented May 8, 2023 •

edited by webkit-early-warning-system

webkit-early-warning-system commented May 8, 2023 •

edited

webkit-early-warning-system commented May 9, 2023 •

edited

achristensen07 left a comment

achristensen07 May 10, 2023

achristensen07 May 10, 2023

kshukuwa May 11, 2023

achristensen07 May 11, 2023

kshukuwa May 19, 2023

webkit-early-warning-system commented May 19, 2023 •

edited

kshukuwa commented May 19, 2023

webkit-early-warning-system commented May 30, 2023 •

edited

kshukuwa commented May 30, 2023

webkit-early-warning-system commented Jun 2, 2023 •

edited

webkit-early-warning-system commented Jun 6, 2023 •

edited

webkit-early-warning-system commented Jun 6, 2023 •

edited

kshukuwa commented Jun 6, 2023

Implement removeDataOfTypes to WKWebsiteDataStore #13605

Are you sure you want to change the base?

Implement removeDataOfTypes to WKWebsiteDataStore #13605

Conversation

kshukuwa commented May 8, 2023 • edited by webkit-early-warning-system

1300c28

webkit-early-warning-system commented May 8, 2023 • edited

webkit-early-warning-system commented May 9, 2023 • edited

achristensen07 left a comment

Choose a reason for hiding this comment

achristensen07 May 10, 2023

Choose a reason for hiding this comment

achristensen07 May 10, 2023

Choose a reason for hiding this comment

kshukuwa May 11, 2023

Choose a reason for hiding this comment

achristensen07 May 11, 2023

Choose a reason for hiding this comment

kshukuwa May 19, 2023

Choose a reason for hiding this comment

webkit-early-warning-system commented May 19, 2023 • edited

kshukuwa commented May 19, 2023

webkit-early-warning-system commented May 30, 2023 • edited

kshukuwa commented May 30, 2023

webkit-early-warning-system commented Jun 2, 2023 • edited

webkit-early-warning-system commented Jun 6, 2023 • edited

webkit-early-warning-system commented Jun 6, 2023 • edited

kshukuwa commented Jun 6, 2023

kshukuwa commented May 8, 2023 •

edited by webkit-early-warning-system

`1300c28`

webkit-early-warning-system commented May 8, 2023 •

edited

webkit-early-warning-system commented May 9, 2023 •

edited

webkit-early-warning-system commented May 19, 2023 •

edited

webkit-early-warning-system commented May 30, 2023 •

edited

webkit-early-warning-system commented Jun 2, 2023 •

edited

webkit-early-warning-system commented Jun 6, 2023 •

edited

webkit-early-warning-system commented Jun 6, 2023 •

edited