213534 2020-06-23 14:39:42 -0700 [WinCairo] Cannot build without resource load statistics 2020-06-26 10:17:15 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 stephan.szabo stephan.szabo achristensen aperez clopez don.olmstead webkit-bug-importer youennf oldest_to_newest 1665548 0 stephan.szabo 2020-06-23 14:39:42 -0700 Seemingly after https://bugs.webkit.org/show_bug.cgi?id=213291 builds without ENABLE(RESOURCE_LOAD_STATISTICS) started to fail on wincairo with errors about uses of things behind the enable from outside. Initial errors were: D:\github\webkit\Source\WebKit\UIProcess/WebsiteData/WebsiteDataStore.cpp(1013): error C2039: 'resourceLoadStatisticsRegistrableDomains': is not a member of 'WebKit::WebsiteDataRecord' D:\github\webkit\Source\WebKit\UIProcess\WebsiteData\WebsiteDataStore.h(86): note: see declaration of 'WebKit::WebsiteDataRecord' D:\github\webkit\Source\WebKit\UIProcess/WebsiteData/WebsiteDataStore.cpp(1013): error C2530: 'registrableDomain': references must be initialized D:\github\webkit\Source\WebKit\UIProcess/WebsiteData/WebsiteDataStore.cpp(1013): error C3531: 'registrableDomain': a symbol whose type contains 'auto' must have an initializer D:\github\webkit\Source\WebKit\UIProcess/WebsiteData/WebsiteDataStore.cpp(1013): error C2143: syntax error: missing ';' before ':' D:\github\webkit\Source\WebKit\UIProcess/WebsiteData/WebsiteDataStore.cpp(1013): error C2143: syntax error: missing ';' before ')' 1665551 1 402594 stephan.szabo 2020-06-23 14:47:27 -0700 Created attachment 402594 Patch I'm not sure if just using the old code in the not resource load statistics enabled case is the best option but it gets past the compile-time errors. 1665802 2 402594 achristensen 2020-06-24 11:21:03 -0700 Comment on attachment 402594 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=402594&action=review > Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.cpp:75 > +#if ENABLE(RESOURCE_LOAD_STATISTICS) WKWebsiteDataStoreRemoveITPDataForDomain should probably just do nothing or immediately call the callback if RESOURCE_LOAD_STATISTICS is not enabled, because there's nothing to do. > Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp:1013 > +#if ENABLE(RESOURCE_LOAD_STATISTICS) Ditto. I think it's ok to just do nothing here if RESOURCE_LOAD_STATISTICS is not enabled. 1666079 3 402743 stephan.szabo 2020-06-25 10:14:58 -0700 Created attachment 402743 Patch Updated to call the callback immediately in the API case and to do nothing in the other when the flag isn't set. 1666507 4 ews-feeder 2020-06-26 10:16:29 -0700 Committed r263568: <https://trac.webkit.org/changeset/263568> All reviewed patches have been landed. Closing bug and clearing flags on attachment 402743. 1666508 5 webkit-bug-importer 2020-06-26 10:17:14 -0700 <rdar://problem/64811452> 1666509 6 webkit-bug-importer 2020-06-26 10:17:15 -0700 <rdar://problem/64811453> 402594 2020-06-23 14:47:27 -0700 2020-06-25 10:14:58 -0700 Patch 213534.1.diff text/plain 2750 stephan.szabo ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggY2RlZjcwYmFiZjcuLjA4MDAzN2E5NTQyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsx LDE3IEBACisyMDIwLTA2LTIzICBTdGVwaGFuIFN6YWJvICA8c3RlcGhhbi5zemFib0Bzb255LmNv bT4KKworICAgICAgICBbV2luQ2Fpcm9dIENhbm5vdCBidWlsZCB3aXRob3V0IHJlc291cmNlIGxv YWQgc3RhdGlzdGljcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjEzNTM0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgQnVpbGQgZml4IGZvciAhRU5BQkxFKFJFU09VUkNFX0xPQURfU1RBVElTVElDUyksCisg ICAgICAgIHVzaW5nIHRoZSBvbGQgY29kZSBmcm9tIGJlZm9yZSBidWcgMjEzMjkxIGluCisgICAg ICAgIHBsYWNlcyB0aGF0IHdlcmUgZmFpbGluZy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkv Qy9XS1dlYnNpdGVEYXRhU3RvcmVSZWYuY3BwOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJzaXRl RGF0YS9XZWJzaXRlRGF0YVN0b3JlLmNwcDoKKwogMjAyMC0wNi0yMiAgQ2FybG9zIEdhcmNpYSBD YW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS11bV1BFXSBBZGQgQVBJ IHRvIGNvbmZpZ3VyZSBhbmQgaGFuZGxlIERPTSBjYWNoZSB0byBXZWJLaXRXZWJzaXRlRGF0YU1h bmFnZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9DL1dLV2Vic2l0 ZURhdGFTdG9yZVJlZi5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9XS1dlYnNp dGVEYXRhU3RvcmVSZWYuY3BwCmluZGV4IDUyZjE5ZjA0ZDBkLi4xNDEyN2Y3MTlhZCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0MvV0tXZWJzaXRlRGF0YVN0b3JlUmVm LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9XS1dlYnNpdGVEYXRhU3Rv cmVSZWYuY3BwCkBAIC03Miw3ICs3MiwxMSBAQCB2b2lkIFdLV2Vic2l0ZURhdGFTdG9yZVJlbW92 ZUlUUERhdGFGb3JEb21haW4oV0tXZWJzaXRlRGF0YVN0b3JlUmVmIGRhdGFTdG9yZVJlZgogewog ICAgIFdlYktpdDo6V2Vic2l0ZURhdGFSZWNvcmQgZGF0YVJlY29yZDsKICAgICBkYXRhUmVjb3Jk LnR5cGVzLmFkZChXZWJLaXQ6OldlYnNpdGVEYXRhVHlwZTo6UmVzb3VyY2VMb2FkU3RhdGlzdGlj cyk7CisjaWYgRU5BQkxFKFJFU09VUkNFX0xPQURfU1RBVElTVElDUykKICAgICBkYXRhUmVjb3Jk LmFkZFJlc291cmNlTG9hZFN0YXRpc3RpY3NSZWdpc3RyYWJsZURvbWFpbihXZWJDb3JlOjpSZWdp c3RyYWJsZURvbWFpbjo6dW5jaGVja2VkQ3JlYXRlRnJvbUhvc3QoV2ViS2l0Ojp0b0ltcGwoaG9z dCktPnN0cmluZygpKSk7CisjZWxzZQorICAgIGRhdGFSZWNvcmQuZGlzcGxheU5hbWUgPSBXZWJL aXQ6OnRvSW1wbChob3N0KS0+c3RyaW5nKCk7CisjZW5kaWYKICAgICBWZWN0b3I8V2ViS2l0OjpX ZWJzaXRlRGF0YVJlY29yZD4gZGF0YVJlY29yZHMgPSB7IFdURk1vdmUoZGF0YVJlY29yZCkgfTsK IAogICAgIE9wdGlvblNldDxXZWJLaXQ6OldlYnNpdGVEYXRhVHlwZT4gZGF0YVR5cGVzID0gV2Vi S2l0OjpXZWJzaXRlRGF0YVR5cGU6OlJlc291cmNlTG9hZFN0YXRpc3RpY3M7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmNw cCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUu Y3BwCmluZGV4IDQ3NDRmNGYxZGM5Li5mOGExY2E1ODEwYSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5jcHAKKysrIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5jcHAKQEAg LTEwMTAsOCArMTAxMCwxMiBAQCB2b2lkIFdlYnNpdGVEYXRhU3RvcmU6OnJlbW92ZURhdGEoT3B0 aW9uU2V0PFdlYnNpdGVEYXRhVHlwZT4gZGF0YVR5cGVzLCBjb25zdCBWZQogICAgICAgICAgICAg ICAgICAgICBjb29raWVIb3N0TmFtZXMuYXBwZW5kKGhvc3ROYW1lKTsKICAgICAgICAgICAgICAg ICBmb3IgKGF1dG8mIGhvc3ROYW1lIDogZGF0YVJlY29yZC5IU1RTQ2FjaGVIb3N0TmFtZXMpCiAg ICAgICAgICAgICAgICAgICAgIEhTVFNDYWNoZUhvc3ROYW1lcy5hcHBlbmQoaG9zdE5hbWUpOwor I2lmIEVOQUJMRShSRVNPVVJDRV9MT0FEX1NUQVRJU1RJQ1MpCiAgICAgICAgICAgICAgICAgZm9y IChhdXRvJiByZWdpc3RyYWJsZURvbWFpbiA6IGRhdGFSZWNvcmQucmVzb3VyY2VMb2FkU3RhdGlz dGljc1JlZ2lzdHJhYmxlRG9tYWlucykKICAgICAgICAgICAgICAgICAgICAgcmVnaXN0cmFibGVE b21haW5zLmFwcGVuZChyZWdpc3RyYWJsZURvbWFpbik7CisjZWxzZQorICAgICAgICAgICAgICAg IHJlZ2lzdHJhYmxlRG9tYWlucy5hcHBlbmQoV2ViQ29yZTo6UmVnaXN0cmFibGVEb21haW46OnVu Y2hlY2tlZENyZWF0ZUZyb21Ib3N0KGRhdGFSZWNvcmQuZGlzcGxheU5hbWUpKTsKKyNlbmRpZgog ICAgICAgICAgICAgfQogCiAgICAgICAgICAgICBjYWxsYmFja0FnZ3JlZ2F0b3ItPmFkZFBlbmRp bmdDYWxsYmFjaygpOwo= 402743 2020-06-25 10:14:58 -0700 2020-06-26 10:16:30 -0700 Patch 213534.2.diff text/plain 2923 stephan.szabo ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggY2RlZjcwYmFiZjcuLmFmZTIwNDE0Zjc0IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsx LDE1IEBACisyMDIwLTA2LTIzICBTdGVwaGFuIFN6YWJvICA8c3RlcGhhbi5zemFib0Bzb255LmNv bT4KKworICAgICAgICBbV2luQ2Fpcm9dIENhbm5vdCBidWlsZCB3aXRob3V0IHJlc291cmNlIGxv YWQgc3RhdGlzdGljcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjEzNTM0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgQnVpbGQgZml4IGZvciAhRU5BQkxFKFJFU09VUkNFX0xPQURfU1RBVElTVElDUykKKwor ICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9XS1dlYnNpdGVEYXRhU3RvcmVSZWYuY3BwOgorICAg ICAgICAqIFVJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmNwcDoKKwogMjAy MC0wNi0yMiAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAg ICAgICAgW0dUS11bV1BFXSBBZGQgQVBJIHRvIGNvbmZpZ3VyZSBhbmQgaGFuZGxlIERPTSBjYWNo ZSB0byBXZWJLaXRXZWJzaXRlRGF0YU1hbmFnZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0FQSS9DL1dLV2Vic2l0ZURhdGFTdG9yZVJlZi5jcHAgYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9BUEkvQy9XS1dlYnNpdGVEYXRhU3RvcmVSZWYuY3BwCmluZGV4IDUyZjE5ZjA0 ZDBkLi4yZjY0MjFjNGJiYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJ L0MvV0tXZWJzaXRlRGF0YVN0b3JlUmVmLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9BUEkvQy9XS1dlYnNpdGVEYXRhU3RvcmVSZWYuY3BwCkBAIC03MCw2ICs3MCw3IEBAIFdLV2Vi c2l0ZURhdGFTdG9yZVJlZiBXS1dlYnNpdGVEYXRhU3RvcmVDcmVhdGVXaXRoQ29uZmlndXJhdGlv bihXS1dlYnNpdGVEYXRhU3RvCiAKIHZvaWQgV0tXZWJzaXRlRGF0YVN0b3JlUmVtb3ZlSVRQRGF0 YUZvckRvbWFpbihXS1dlYnNpdGVEYXRhU3RvcmVSZWYgZGF0YVN0b3JlUmVmLCBXS1N0cmluZ1Jl ZiBob3N0LCB2b2lkKiBjb250ZXh0LCBXS1dlYnNpdGVEYXRhU3RvcmVSZW1vdmVJVFBEYXRhRm9y RG9tYWluRnVuY3Rpb24gY2FsbGJhY2spCiB7CisjaWYgRU5BQkxFKFJFU09VUkNFX0xPQURfU1RB VElTVElDUykKICAgICBXZWJLaXQ6OldlYnNpdGVEYXRhUmVjb3JkIGRhdGFSZWNvcmQ7CiAgICAg ZGF0YVJlY29yZC50eXBlcy5hZGQoV2ViS2l0OjpXZWJzaXRlRGF0YVR5cGU6OlJlc291cmNlTG9h ZFN0YXRpc3RpY3MpOwogICAgIGRhdGFSZWNvcmQuYWRkUmVzb3VyY2VMb2FkU3RhdGlzdGljc1Jl Z2lzdHJhYmxlRG9tYWluKFdlYkNvcmU6OlJlZ2lzdHJhYmxlRG9tYWluOjp1bmNoZWNrZWRDcmVh dGVGcm9tSG9zdChXZWJLaXQ6OnRvSW1wbChob3N0KS0+c3RyaW5nKCkpKTsKQEAgLTc5LDYgKzgw LDkgQEAgdm9pZCBXS1dlYnNpdGVEYXRhU3RvcmVSZW1vdmVJVFBEYXRhRm9yRG9tYWluKFdLV2Vi c2l0ZURhdGFTdG9yZVJlZiBkYXRhU3RvcmVSZWYKICAgICBXZWJLaXQ6OnRvSW1wbChkYXRhU3Rv cmVSZWYpLT5yZW1vdmVEYXRhKGRhdGFUeXBlcywgZGF0YVJlY29yZHMsIFtjb250ZXh0LCBjYWxs YmFja10gewogICAgICAgICBjYWxsYmFjayhjb250ZXh0KTsKICAgICB9KTsKKyNlbHNlCisgICAg Y2FsbGJhY2soY29udGV4dCk7CisjZW5kaWYKIH0KIAogdm9pZCBXS1dlYnNpdGVEYXRhU3RvcmVE b2VzU3RhdGlzdGljc0RvbWFpbklERXhpc3RJbkRhdGFiYXNlKFdLV2Vic2l0ZURhdGFTdG9yZVJl ZiBkYXRhU3RvcmVSZWYsIGludCBkb21haW5JRCwgdm9pZCogY29udGV4dCwgV0tXZWJzaXRlRGF0 YVN0b3JlRG9lc1N0YXRpc3RpY3NEb21haW5JREV4aXN0SW5EYXRhYmFzZUZ1bmN0aW9uIGNhbGxi YWNrKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vi c2l0ZURhdGFTdG9yZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9X ZWJzaXRlRGF0YVN0b3JlLmNwcAppbmRleCA0NzQ0ZjRmMWRjOS4uOWM2MTE0YzkwZDkgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3Rv cmUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVE YXRhU3RvcmUuY3BwCkBAIC0xMDEwLDggKzEwMTAsMTAgQEAgdm9pZCBXZWJzaXRlRGF0YVN0b3Jl OjpyZW1vdmVEYXRhKE9wdGlvblNldDxXZWJzaXRlRGF0YVR5cGU+IGRhdGFUeXBlcywgY29uc3Qg VmUKICAgICAgICAgICAgICAgICAgICAgY29va2llSG9zdE5hbWVzLmFwcGVuZChob3N0TmFtZSk7 CiAgICAgICAgICAgICAgICAgZm9yIChhdXRvJiBob3N0TmFtZSA6IGRhdGFSZWNvcmQuSFNUU0Nh Y2hlSG9zdE5hbWVzKQogICAgICAgICAgICAgICAgICAgICBIU1RTQ2FjaGVIb3N0TmFtZXMuYXBw ZW5kKGhvc3ROYW1lKTsKKyNpZiBFTkFCTEUoUkVTT1VSQ0VfTE9BRF9TVEFUSVNUSUNTKQogICAg ICAgICAgICAgICAgIGZvciAoYXV0byYgcmVnaXN0cmFibGVEb21haW4gOiBkYXRhUmVjb3JkLnJl c291cmNlTG9hZFN0YXRpc3RpY3NSZWdpc3RyYWJsZURvbWFpbnMpCiAgICAgICAgICAgICAgICAg ICAgIHJlZ2lzdHJhYmxlRG9tYWlucy5hcHBlbmQocmVnaXN0cmFibGVEb21haW4pOworI2VuZGlm CiAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgIGNhbGxiYWNrQWdncmVnYXRvci0+YWRkUGVu ZGluZ0NhbGxiYWNrKCk7Cg==