202440 2019-10-01 16:53:06 -0700 Properly mark canceled resources in NetworkActivityTracker 2019-10-02 10:43:10 -0700 1 1 1 Unclassified WebKit Page Loading WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 krollin krollin beidson bfulgham cdumez commit-queue thorton webkit-bug-importer oldest_to_newest 1575806 0 krollin 2019-10-01 16:53:06 -0700 The nw_activity facility tracking resource loads did not originally have support for reporting resources that were canceled. It now has that support (since late MacOS 14-aligned SDKs), so add support for it in NetworkActivityTracker and use it in places where we were previously reporting the status of canceled resources as "None". 1575807 1 krollin 2019-10-01 16:53:17 -0700 <rdar://problem/55843651> 1575809 2 379969 krollin 2019-10-01 16:56:56 -0700 Created attachment 379969 Patch 1576020 3 379969 bfulgham 2019-10-02 09:23:19 -0700 Comment on attachment 379969 Patch Looks good. r=me. 1576051 4 379969 commit-queue 2019-10-02 10:43:08 -0700 Comment on attachment 379969 Patch Clearing flags on attachment: 379969 Committed r250614: <https://trac.webkit.org/changeset/250614> 1576052 5 commit-queue 2019-10-02 10:43:10 -0700 All reviewed patches have been landed. Closing bug. 379969 2019-10-01 16:56:56 -0700 2019-10-02 10:43:08 -0700 Patch bug-202440-20191001165655.patch text/plain 6306 krollin U3VidmVyc2lvbiBSZXZpc2lvbjogMjUwNTc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDM0YmE5Yjc5NjkyY2I3NDIx ZWZmZThhYTAyZGVlNWY2ODBhZGUzMGMuLjc5NWRlNDQxYzk2NzlhYjA2MTJmZDRlZWVkNjQ3OWJm MmZjMzQ3YTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMTktMTAtMDEgIEtlaXRoIFJv bGxpbiAgPGtyb2xsaW5AYXBwbGUuY29tPgorCisgICAgICAgIFByb3Blcmx5IG1hcmsgY2FuY2Vs ZWQgcmVzb3VyY2VzIGluIE5ldHdvcmtBY3Rpdml0eVRyYWNrZXIKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMjQ0MAorICAgICAgICA8cmRhcjovL3By b2JsZW0vNTU4NDM2NTE+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgVGhlIG53X2FjdGl2aXR5IGZhY2lsaXR5IHRyYWNraW5nIHJlc291cmNlIGxvYWRz IGRpZCBub3Qgb3JpZ2luYWxseQorICAgICAgICBoYXZlIHN1cHBvcnQgZm9yIHJlcG9ydGluZyBy ZXNvdXJjZXMgdGhhdCB3ZXJlIGNhbmNlbGVkLiBJdCBub3cgaGFzCisgICAgICAgIHRoYXQgc3Vw cG9ydCAoc2luY2UgbGF0ZSBNYWNPUyAxNC1hbGlnbmVkIFNES3MpLCBzbyBhZGQgc3VwcG9ydCBm b3IgaXQKKyAgICAgICAgaW4gTmV0d29ya0FjdGl2aXR5VHJhY2tlciBhbmQgdXNlIGl0IGluIHBs YWNlcyB3aGVyZSB3ZSB3ZXJlCisgICAgICAgIHByZXZpb3VzbHkgcmVwb3J0aW5nIHRoZSBzdGF0 dXMgb2YgY2FuY2VsZWQgcmVzb3VyY2VzIGFzICJOb25lIi4KKworICAgICAgICAqIE5ldHdvcmtQ cm9jZXNzL05ldHdvcmtBY3Rpdml0eVRyYWNrZXIuaDoKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vz cy9OZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzcy5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5l dHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzOjpzdG9wQWxsTmV0d29ya0FjdGl2aXR5VHJhY2tp bmcpOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzczo6c3Rv cEFsbE5ldHdvcmtBY3Rpdml0eVRyYWNraW5nRm9yUGFnZSk6CisgICAgICAgICogTmV0d29ya1By b2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29y a1Jlc291cmNlTG9hZGVyOjpjbGVhbnVwKToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9jb2Nv YS9OZXR3b3JrQWN0aXZpdHlUcmFja2VyQ29jb2EubW06CisgICAgICAgIChXZWJLaXQ6Ok5ldHdv cmtBY3Rpdml0eVRyYWNrZXI6OmNvbXBsZXRlKToKKwogMjAxOS0xMC0wMSAgQWxleCBDaHJpc3Rl bnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIEZpeCBHVEsgYnVpbGQg YWZ0ZXIgcjI1MDU1OApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9O ZXR3b3JrQWN0aXZpdHlUcmFja2VyLmggYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05l dHdvcmtBY3Rpdml0eVRyYWNrZXIuaAppbmRleCBmMmEwNjk0ZWVmZmJmMTU0MGQ4YTFlZWNkMjVj ZTZmNDRmMWNlMTA0Li4yODhkMWQwMTcxZjRmOWI4MDdmYWY1ODE5NmFlOWE1NDVlMjkxZjU1IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtBY3Rpdml0eVRy YWNrZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtBY3Rpdml0 eVRyYWNrZXIuaApAQCAtNjIsNiArNjIsNyBAQCBwdWJsaWM6CiAgICAgICAgIE5vbmUsCiAgICAg ICAgIFN1Y2Nlc3MsCiAgICAgICAgIEZhaWx1cmUsCisgICAgICAgIENhbmNlbCwKICAgICB9Owog CiAgICAgTmV0d29ya0FjdGl2aXR5VHJhY2tlcigpID0gZGVmYXVsdDsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3Mu Y3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrQ29ubmVjdGlvblRvV2Vi UHJvY2Vzcy5jcHAKaW5kZXggN2VlZTdlMDQ2Nzk2Yzg2MDliMWI3MzNhNTI3Njg2NWM1M2NkMWM0 Zi4uNjgwYWZlNWJhMzNlNjQ5NGUxZjRiNzc3NDkzZDIwZTI5MjFmNWFlMCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vz cy5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrQ29ubmVjdGlv blRvV2ViUHJvY2Vzcy5jcHAKQEAgLTgyMiw3ICs4MjIsNyBAQCB2b2lkIE5ldHdvcmtDb25uZWN0 aW9uVG9XZWJQcm9jZXNzOjpzdG9wVHJhY2tpbmdSZXNvdXJjZUxvYWQoUmVzb3VyY2VMb2FkSWRl bnRpZgogdm9pZCBOZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzczo6c3RvcEFsbE5ldHdvcmtB Y3Rpdml0eVRyYWNraW5nKCkKIHsKICAgICBmb3IgKGF1dG8mIGFjdGl2aXR5VHJhY2tlciA6IG1f bmV0d29ya0FjdGl2aXR5VHJhY2tlcnMpCi0gICAgICAgIGFjdGl2aXR5VHJhY2tlci5uZXR3b3Jr QWN0aXZpdHkuY29tcGxldGUoTmV0d29ya0FjdGl2aXR5VHJhY2tlcjo6Q29tcGxldGlvbkNvZGU6 Ok5vbmUpOworICAgICAgICBhY3Rpdml0eVRyYWNrZXIubmV0d29ya0FjdGl2aXR5LmNvbXBsZXRl KE5ldHdvcmtBY3Rpdml0eVRyYWNrZXI6OkNvbXBsZXRpb25Db2RlOjpDYW5jZWwpOwogCiAgICAg bV9uZXR3b3JrQWN0aXZpdHlUcmFja2Vycy5jbGVhcigpOwogfQpAQCAtODMxLDcgKzgzMSw3IEBA IHZvaWQgTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3M6OnN0b3BBbGxOZXR3b3JrQWN0aXZp dHlUcmFja2luZ0ZvclBhZ2UoUGFnZUlkCiB7CiAgICAgZm9yIChhdXRvJiBhY3Rpdml0eVRyYWNr ZXIgOiBtX25ldHdvcmtBY3Rpdml0eVRyYWNrZXJzKSB7CiAgICAgICAgIGlmIChhY3Rpdml0eVRy YWNrZXIucGFnZUlEID09IHBhZ2VJRCkKLSAgICAgICAgICAgIGFjdGl2aXR5VHJhY2tlci5uZXR3 b3JrQWN0aXZpdHkuY29tcGxldGUoTmV0d29ya0FjdGl2aXR5VHJhY2tlcjo6Q29tcGxldGlvbkNv ZGU6Ok5vbmUpOworICAgICAgICAgICAgYWN0aXZpdHlUcmFja2VyLm5ldHdvcmtBY3Rpdml0eS5j b21wbGV0ZShOZXR3b3JrQWN0aXZpdHlUcmFja2VyOjpDb21wbGV0aW9uQ29kZTo6Q2FuY2VsKTsK ICAgICB9CiAKICAgICBtX25ldHdvcmtBY3Rpdml0eVRyYWNrZXJzLnJlbW92ZUFsbE1hdGNoaW5n KFsmXShjb25zdCBhdXRvJiBhY3Rpdml0eVRyYWNrZXIpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmNwcCBiL1NvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmNwcAppbmRleCAxMWNj NzZjZGIzNjNiYWVhNjNjNzhiNTIxNDQ5M2JhN2FlOGRlM2UzLi40MTg3NWMzZjA3NjVkNmVkMjMw ZWM2ZGYwYmY3MWU0NTY5OTM2ZTJmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQ cm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3 b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuY3BwCkBAIC0zMjMsMTAgKzMyMywyMyBA QCB2b2lkIE5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6Y2xlYW51cChMb2FkUmVzdWx0IHJlc3VsdCkK IHsKICAgICBBU1NFUlQoUnVuTG9vcDo6aXNNYWluKCkpOwogCi0gICAgbV9jb25uZWN0aW9uLT5z dG9wVHJhY2tpbmdSZXNvdXJjZUxvYWQobV9wYXJhbWV0ZXJzLmlkZW50aWZpZXIsCi0gICAgICAg IHJlc3VsdCA9PSBMb2FkUmVzdWx0OjpTdWNjZXNzID8gTmV0d29ya0FjdGl2aXR5VHJhY2tlcjo6 Q29tcGxldGlvbkNvZGU6OlN1Y2Nlc3MgOgotICAgICAgICByZXN1bHQgPT0gTG9hZFJlc3VsdDo6 RmFpbHVyZSA/IE5ldHdvcmtBY3Rpdml0eVRyYWNrZXI6OkNvbXBsZXRpb25Db2RlOjpGYWlsdXJl IDoKLSAgICAgICAgTmV0d29ya0FjdGl2aXR5VHJhY2tlcjo6Q29tcGxldGlvbkNvZGU6Ok5vbmUp OworICAgIE5ldHdvcmtBY3Rpdml0eVRyYWNrZXI6OkNvbXBsZXRpb25Db2RlIGNvZGU7CisgICAg c3dpdGNoIChyZXN1bHQpIHsKKyAgICBjYXNlIExvYWRSZXN1bHQ6OlVua25vd246CisgICAgICAg IGNvZGUgPSBOZXR3b3JrQWN0aXZpdHlUcmFja2VyOjpDb21wbGV0aW9uQ29kZTo6VW5kZWZpbmVk OworICAgICAgICBicmVhazsKKyAgICBjYXNlIExvYWRSZXN1bHQ6OlN1Y2Nlc3M6CisgICAgICAg IGNvZGUgPSBOZXR3b3JrQWN0aXZpdHlUcmFja2VyOjpDb21wbGV0aW9uQ29kZTo6U3VjY2VzczsK KyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBMb2FkUmVzdWx0OjpGYWlsdXJlOgorICAgICAgICBj b2RlID0gTmV0d29ya0FjdGl2aXR5VHJhY2tlcjo6Q29tcGxldGlvbkNvZGU6OkZhaWx1cmU7Cisg ICAgICAgIGJyZWFrOworICAgIGNhc2UgTG9hZFJlc3VsdDo6Q2FuY2VsOgorICAgICAgICBjb2Rl ID0gTmV0d29ya0FjdGl2aXR5VHJhY2tlcjo6Q29tcGxldGlvbkNvZGU6OkNhbmNlbDsKKyAgICAg ICAgYnJlYWs7CisgICAgfQorCisgICAgbV9jb25uZWN0aW9uLT5zdG9wVHJhY2tpbmdSZXNvdXJj ZUxvYWQobV9wYXJhbWV0ZXJzLmlkZW50aWZpZXIsIGNvZGUpOwogCiAgICAgbV9idWZmZXJpbmdU aW1lci5zdG9wKCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mv Y29jb2EvTmV0d29ya0FjdGl2aXR5VHJhY2tlckNvY29hLm1tIGIvU291cmNlL1dlYktpdC9OZXR3 b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrQWN0aXZpdHlUcmFja2VyQ29jb2EubW0KaW5kZXggZDM3 MDVhNTkzZGM0NWUwNTQxMTFlZTI1NGUyYzM3MGQ4OGY0NjhiZS4uMzI5MDFjNTIwY2Y5NmNkNWY2 ZTBhZTgxYjQ0MzczMWYzYTZmMGVhMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3Jr UHJvY2Vzcy9jb2NvYS9OZXR3b3JrQWN0aXZpdHlUcmFja2VyQ29jb2EubW0KKysrIGIvU291cmNl L1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrQWN0aXZpdHlUcmFja2VyQ29jb2Eu bW0KQEAgLTYyLDExICs2MiwyNCBAQCB2b2lkIE5ldHdvcmtBY3Rpdml0eVRyYWNrZXI6OmNvbXBs ZXRlKENvbXBsZXRpb25Db2RlIGNvZGUpCiAgICAgbV9pc0NvbXBsZXRlZCA9IHRydWU7CiAKICAg ICBBU1NFUlQobV9uZXR3b3JrQWN0aXZpdHkuZ2V0KCkpOwotICAgIGF1dG8gcmVhc29uID0KLSAg ICAgICAgY29kZSA9PSBDb21wbGV0aW9uQ29kZTo6Tm9uZSA/IG53X2FjdGl2aXR5X2NvbXBsZXRp b25fcmVhc29uX25vbmUgOgotICAgICAgICBjb2RlID09IENvbXBsZXRpb25Db2RlOjpTdWNjZXNz ID8gbndfYWN0aXZpdHlfY29tcGxldGlvbl9yZWFzb25fc3VjY2VzcyA6Ci0gICAgICAgIGNvZGUg PT0gQ29tcGxldGlvbkNvZGU6OkZhaWx1cmUgPyBud19hY3Rpdml0eV9jb21wbGV0aW9uX3JlYXNv bl9mYWlsdXJlIDoKLSAgICAgICAgbndfYWN0aXZpdHlfY29tcGxldGlvbl9yZWFzb25faW52YWxp ZDsKKyAgICBud19hY3Rpdml0eV9jb21wbGV0aW9uX3JlYXNvbl90IHJlYXNvbjsKKyAgICBzd2l0 Y2ggKGNvZGUpIHsKKyAgICBjYXNlIENvbXBsZXRpb25Db2RlOjpVbmRlZmluZWQ6CisgICAgICAg IHJlYXNvbiA9IG53X2FjdGl2aXR5X2NvbXBsZXRpb25fcmVhc29uX2ludmFsaWQ7CisgICAgICAg IGJyZWFrOworICAgIGNhc2UgQ29tcGxldGlvbkNvZGU6Ok5vbmU6CisgICAgICAgIHJlYXNvbiA9 IG53X2FjdGl2aXR5X2NvbXBsZXRpb25fcmVhc29uX25vbmU7CisgICAgICAgIGJyZWFrOworICAg IGNhc2UgQ29tcGxldGlvbkNvZGU6OlN1Y2Nlc3M6CisgICAgICAgIHJlYXNvbiA9IG53X2FjdGl2 aXR5X2NvbXBsZXRpb25fcmVhc29uX3N1Y2Nlc3M7CisgICAgICAgIGJyZWFrOworICAgIGNhc2Ug Q29tcGxldGlvbkNvZGU6OkZhaWx1cmU6CisgICAgICAgIHJlYXNvbiA9IG53X2FjdGl2aXR5X2Nv bXBsZXRpb25fcmVhc29uX2ZhaWx1cmU7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgQ29tcGxl dGlvbkNvZGU6OkNhbmNlbDoKKyAgICAgICAgcmVhc29uID0gbndfYWN0aXZpdHlfY29tcGxldGlv bl9yZWFzb25fY2FuY2VsbGVkOworICAgICAgICBicmVhazsKKyAgICB9CiAgICAgbndfYWN0aXZp dHlfY29tcGxldGVfd2l0aF9yZWFzb24obV9uZXR3b3JrQWN0aXZpdHkuZ2V0KCksIHJlYXNvbik7 CiAgICAgbV9uZXR3b3JrQWN0aXZpdHkuY2xlYXIoKTsKIH0K