214401 2020-07-16 03:31:15 -0700 Fix ITP data summary when using the memory store and blocking all third-party cookies 2020-07-21 05:19:15 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 213493 1 cgarcia webkit-unassigned katherine_cheney mcatanzaro webkit-bug-importer wilander youennf oldest_to_newest 1672081 0 cgarcia 2020-07-16 03:31:15 -0700 The memory store behaves differently than the database one, it only includes prevalent resources in the list, while the database store includes all resources when cooking blocking policy is All. 1672083 1 404432 cgarcia 2020-07-16 03:34:05 -0700 Created attachment 404432 Patch 1672093 2 404432 mcatanzaro 2020-07-16 05:52:00 -0700 Comment on attachment 404432 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=404432&action=review I'm pretty sure this change is correct. Let's give John a day or two to do the final review, though, since it's his code. > Source/WebKit/ChangeLog:3 > + Fix ITP data summary when using the memory satre and blocking all third-party cookies memory store 1673087 3 katherine_cheney 2020-07-20 08:56:40 -0700 Great catch! I am the engineer who added the ITP data summary, this change looks good. It would be nice to also update the ITP data summary test case in this patch before landing, looks like it is missing the piece of code which turns off database mode. You can turn it off by adding: static bool doneFlag = false; [dataStore _setUseITPDatabase:false completionHandler: ^(void) { doneFlag = true; }]; TestWebKitAPI::Util::run(&doneFlag); right after calling [dataStore _setResourceLoadStatisticsEnabled:YES] in the GetResourceLoadStatisticsDataSummary test in TestWebKitAPI/Tests/WebKitCocoa/ResourceLoadStatistics.mm. The test should fail before your change, and pass after. 1673405 4 404805 cgarcia 2020-07-21 03:08:42 -0700 Created attachment 404805 Patch for landing 1673416 5 cgarcia 2020-07-21 05:19:00 -0700 Committed r264650: <https://trac.webkit.org/changeset/264650> 1673417 6 webkit-bug-importer 2020-07-21 05:19:15 -0700 <rdar://problem/65878342> 404432 2020-07-16 03:34:05 -0700 2020-07-21 03:08:42 -0700 Patch wk2-itp-summary.diff text/plain 2156 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggMmJmYTU5YmJlMjRhLi5jZDUyMjgwYmUyNmYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMTcgQEAKKzIwMjAtMDctMTYgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2Fs aWEuY29tPgorCisgICAgICAgIEZpeCBJVFAgZGF0YSBzdW1tYXJ5IHdoZW4gdXNpbmcgdGhlIG1l bW9yeSBzYXRyZSBhbmQgYmxvY2tpbmcgYWxsIHRoaXJkLXBhcnR5IGNvb2tpZXMKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNDQwMQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBtZW1vcnkgc3RvcmUg YmVoYXZlcyBkaWZmZXJlbnRseSB0aGFuIHRoZSBkYXRhYmFzZSBvbmUsIGl0IG9ubHkgaW5jbHVk ZXMgcHJldmFsZW50IHJlc291cmNlcyBpbiB0aGUgbGlzdCwKKyAgICAgICAgd2hpbGUgdGhlIGRh dGFiYXNlIHN0b3JlIGluY2x1ZGVzIGFsbCByZXNvdXJjZXMgd2hlbiBjb29raW5nIGJsb2NraW5n IHBvbGljeSBpcyBBbGwuCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1Jl c291cmNlTG9hZFN0YXRpc3RpY3NNZW1vcnlTdG9yZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OlJl c291cmNlTG9hZFN0YXRpc3RpY3NNZW1vcnlTdG9yZTo6YWdncmVnYXRlZFRoaXJkUGFydHlEYXRh IGNvbnN0KTogT25seSBjaGVjayBpc1ByZXZhbGVudFJlc291cmNlIGlmCisgICAgICAgIHRoaXJk IHBhcnR5IGNvb2tpZSBibG9ja2luZyBtb2RlIGlzIG5vdCBBbGwgdG8gZGVjaWRlIHdoZXRoZXIg dG8gaW5jbHVkZSB0aGUgZG9tYWluIGluIHRoZSByZXBvcnQuCisKIDIwMjAtMDctMTUgIFBlciBB cm5lIFZvbGxhbiAgPHB2b2xsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJl dmVydCBwYXJ0IG9mIHIyNjQzODUuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQ cm9jZXNzL0NsYXNzaWZpZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljc01lbW9yeVN0b3JlLmNwcCBi L1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvQ2xhc3NpZmllci9SZXNvdXJjZUxvYWRTdGF0 aXN0aWNzTWVtb3J5U3RvcmUuY3BwCmluZGV4IDAyOWM1NDVlMTExYS4uOTQyZmVkNjMyNDZiIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0NsYXNzaWZpZXIvUmVzb3Vy Y2VMb2FkU3RhdGlzdGljc01lbW9yeVN0b3JlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdv cmtQcm9jZXNzL0NsYXNzaWZpZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljc01lbW9yeVN0b3JlLmNw cApAQCAtMTM5LDcgKzEzOSw3IEBAIFZlY3RvcjxXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3Rv cmU6OlRoaXJkUGFydHlEYXRhPiBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzTWVtCiAKICAgICBWZWN0 b3I8V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpUaGlyZFBhcnR5RGF0YT4gdGhpcmRQ YXJ0eURhdGFMaXN0OwogICAgIGZvciAoYXV0byYgc3RhdGlzdGljIDogbV9yZXNvdXJjZVN0YXRp c3RpY3NNYXAudmFsdWVzKCkpIHsKLSAgICAgICAgaWYgKGhhc0JlZW5UaGlyZFBhcnR5KHN0YXRp c3RpYykgJiYgc3RhdGlzdGljLmlzUHJldmFsZW50UmVzb3VyY2UpCisgICAgICAgIGlmIChoYXNC ZWVuVGhpcmRQYXJ0eShzdGF0aXN0aWMpICYmICh0aGlyZFBhcnR5Q29va2llQmxvY2tpbmdNb2Rl KCkgPT0gVGhpcmRQYXJ0eUNvb2tpZUJsb2NraW5nTW9kZTo6QWxsIHx8IHN0YXRpc3RpYy5pc1By ZXZhbGVudFJlc291cmNlKSkKICAgICAgICAgICAgIHRoaXJkUGFydHlEYXRhTGlzdC5hcHBlbmQo V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpUaGlyZFBhcnR5RGF0YSB7IHN0YXRpc3Rp Yy5yZWdpc3RyYWJsZURvbWFpbiwgZ2V0VGhpcmRQYXJ0eURhdGFGb3JTcGVjaWZpY0ZpcnN0UGFy dHlEb21haW5zKHN0YXRpc3RpYykgfSk7CiAgICAgfQogICAgIHN0ZDo6c29ydCh0aGlyZFBhcnR5 RGF0YUxpc3QucmJlZ2luKCksIHRoaXJkUGFydHlEYXRhTGlzdC5yZW5kKCkpOwo= 404805 2020-07-21 03:08:42 -0700 2020-07-21 03:08:42 -0700 Patch for landing wk2-itp-memory-summary.diff text/plain 3613 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggZTY4NTNkOWU1MGFmLi5hYjNkMjQ3ZTdhYzUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMTcgQEAKKzIwMjAtMDctMjEgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2Fs aWEuY29tPgorCisgICAgICAgIEZpeCBJVFAgZGF0YSBzdW1tYXJ5IHdoZW4gdXNpbmcgdGhlIG1l bW9yeSBzYXRyZSBhbmQgYmxvY2tpbmcgYWxsIHRoaXJkLXBhcnR5IGNvb2tpZXMKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNDQwMQorCisgICAgICAg IFJldmlld2VkIGJ5IE1pY2hhZWwgQ2F0YW56YXJvLgorCisgICAgICAgIFRoZSBtZW1vcnkgc3Rv cmUgYmVoYXZlcyBkaWZmZXJlbnRseSB0aGFuIHRoZSBkYXRhYmFzZSBvbmUsIGl0IG9ubHkgaW5j bHVkZXMgcHJldmFsZW50IHJlc291cmNlcyBpbiB0aGUgbGlzdCwKKyAgICAgICAgd2hpbGUgdGhl IGRhdGFiYXNlIHN0b3JlIGluY2x1ZGVzIGFsbCByZXNvdXJjZXMgd2hlbiBjb29raW5nIGJsb2Nr aW5nIHBvbGljeSBpcyBBbGwuCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVy L1Jlc291cmNlTG9hZFN0YXRpc3RpY3NNZW1vcnlTdG9yZS5jcHA6CisgICAgICAgIChXZWJLaXQ6 OlJlc291cmNlTG9hZFN0YXRpc3RpY3NNZW1vcnlTdG9yZTo6YWdncmVnYXRlZFRoaXJkUGFydHlE YXRhIGNvbnN0KTogT25seSBjaGVjayBpc1ByZXZhbGVudFJlc291cmNlIGlmCisgICAgICAgIHRo aXJkIHBhcnR5IGNvb2tpZSBibG9ja2luZyBtb2RlIGlzIG5vdCBBbGwgdG8gZGVjaWRlIHdoZXRo ZXIgdG8gaW5jbHVkZSB0aGUgZG9tYWluIGluIHRoZSByZXBvcnQuCisKIDIwMjAtMDctMjEgIENh cmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHVEtd IFByZXBhcmUgdW5pdCB0ZXN0cyBmb3IgR1RLNApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9O ZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NNZW1vcnlTdG9y ZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL0NsYXNzaWZpZXIvUmVzb3VyY2VM b2FkU3RhdGlzdGljc01lbW9yeVN0b3JlLmNwcAppbmRleCAwMjljNTQ1ZTExMWEuLjk0MmZlZDYz MjQ2YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVy L1Jlc291cmNlTG9hZFN0YXRpc3RpY3NNZW1vcnlTdG9yZS5jcHAKKysrIGIvU291cmNlL1dlYktp dC9OZXR3b3JrUHJvY2Vzcy9DbGFzc2lmaWVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NNZW1vcnlT dG9yZS5jcHAKQEAgLTEzOSw3ICsxMzksNyBAQCBWZWN0b3I8V2ViUmVzb3VyY2VMb2FkU3RhdGlz dGljc1N0b3JlOjpUaGlyZFBhcnR5RGF0YT4gUmVzb3VyY2VMb2FkU3RhdGlzdGljc01lbQogCiAg ICAgVmVjdG9yPFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6VGhpcmRQYXJ0eURhdGE+ IHRoaXJkUGFydHlEYXRhTGlzdDsKICAgICBmb3IgKGF1dG8mIHN0YXRpc3RpYyA6IG1fcmVzb3Vy Y2VTdGF0aXN0aWNzTWFwLnZhbHVlcygpKSB7Ci0gICAgICAgIGlmIChoYXNCZWVuVGhpcmRQYXJ0 eShzdGF0aXN0aWMpICYmIHN0YXRpc3RpYy5pc1ByZXZhbGVudFJlc291cmNlKQorICAgICAgICBp ZiAoaGFzQmVlblRoaXJkUGFydHkoc3RhdGlzdGljKSAmJiAodGhpcmRQYXJ0eUNvb2tpZUJsb2Nr aW5nTW9kZSgpID09IFRoaXJkUGFydHlDb29raWVCbG9ja2luZ01vZGU6OkFsbCB8fCBzdGF0aXN0 aWMuaXNQcmV2YWxlbnRSZXNvdXJjZSkpCiAgICAgICAgICAgICB0aGlyZFBhcnR5RGF0YUxpc3Qu YXBwZW5kKFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6VGhpcmRQYXJ0eURhdGEgeyBz dGF0aXN0aWMucmVnaXN0cmFibGVEb21haW4sIGdldFRoaXJkUGFydHlEYXRhRm9yU3BlY2lmaWNG aXJzdFBhcnR5RG9tYWlucyhzdGF0aXN0aWMpIH0pOwogICAgIH0KICAgICBzdGQ6OnNvcnQodGhp cmRQYXJ0eURhdGFMaXN0LnJiZWdpbigpLCB0aGlyZFBhcnR5RGF0YUxpc3QucmVuZCgpKTsKZGlm ZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBhNjVjMmJm NjY2MzQuLjc4ZTdmNTdmNWQ5NyAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rv b2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIwLTA3LTIxICBDYXJsb3MgR2FyY2lh IENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KKworICAgICAgICBGaXggSVRQIGRhdGEgc3Vt bWFyeSB3aGVuIHVzaW5nIHRoZSBtZW1vcnkgc3RvcmUgYW5kIGJsb2NraW5nIGFsbCB0aGlyZC1w YXJ0eSBjb29raWVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMTQ0MDEKKworICAgICAgICBSZXZpZXdlZCBieSBNaWNoYWVsIENhdGFuemFyby4KKwor ICAgICAgICBGaXggR2V0UmVzb3VyY2VMb2FkU3RhdGlzdGljc0RhdGFTdW1tYXJ5IHRlc3QgdG8g YWN0dWFsbHkgdXNlIHRoZSBtZW1vcnkgc3RvcmUuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJ L1Rlc3RzL1dlYktpdENvY29hL1Jlc291cmNlTG9hZFN0YXRpc3RpY3MubW06CisgICAgICAgIChU RVNUKToKKwogMjAyMC0wNy0yMSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxp YS5jb20+CiAKICAgICAgICAgW0dUS10gUHJlcGFyZSB1bml0IHRlc3RzIGZvciBHVEs0CmRpZmYg LS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Jlc291cmNlTG9h ZFN0YXRpc3RpY3MubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Jl c291cmNlTG9hZFN0YXRpc3RpY3MubW0KaW5kZXggZDNhNjNhNzAzYjU4Li4xN2JjN2Y1ZDc0NDgg MTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUmVzb3Vy Y2VMb2FkU3RhdGlzdGljcy5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktp dENvY29hL1Jlc291cmNlTG9hZFN0YXRpc3RpY3MubW0KQEAgLTk3MCw2ICs5NzAsMTMgQEAgVEVT VChSZXNvdXJjZUxvYWRTdGF0aXN0aWNzLCBHZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGF0YVN1 bW1hcnkpCiAgICAgW2RhdGFTdG9yZSBfc2V0UmVzb3VyY2VMb2FkU3RhdGlzdGljc0VuYWJsZWQ6 WUVTXTsKIAogICAgIHN0YXRpYyBib29sIGRvbmVGbGFnID0gZmFsc2U7CisgICAgW2RhdGFTdG9y ZSBfc2V0VXNlSVRQRGF0YWJhc2U6ZmFsc2UgY29tcGxldGlvbkhhbmRsZXI6IF4odm9pZCkgewor ICAgICAgICBkb25lRmxhZyA9IHRydWU7CisgICAgfV07CisKKyAgICBUZXN0V2ViS2l0QVBJOjpV dGlsOjpydW4oJmRvbmVGbGFnKTsKKworICAgIGRvbmVGbGFnID0gZmFsc2U7CiAgICAgW2RhdGFT dG9yZSBfY2xlYXJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzOl4odm9pZCkgewogICAgICAgICBkb25l RmxhZyA9IHRydWU7CiAgICAgfV07Cg==