206100 2020-01-10 14:57:02 -0800 Make http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-sub-frame-under-top-frame-origins* use resource/util.js 2020-01-13 13:20:49 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Local Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=206035 https://bugs.webkit.org/show_bug.cgi?id=205522 https://bugs.webkit.org/show_bug.cgi?id=206188 InRadar P2 Normal --- 1 wilander wilander commit-queue webkit-bug-importer oldest_to_newest 1605321 0 wilander 2020-01-10 14:57:02 -0800 The two test cases http/tests/resourceLoadStatistics/classify-as-non-prevalent-based-on-sub-frame-under-top-frame-origins* should use resources/util.js. 1605323 1 webkit-bug-importer 2020-01-10 14:57:23 -0800 <rdar://problem/58492335> 1605325 2 387380 wilander 2020-01-10 15:07:33 -0800 Created attachment 387380 Patch for landing 1605444 3 387380 commit-queue 2020-01-10 17:53:03 -0800 Comment on attachment 387380 Patch for landing Clearing flags on attachment: 387380 Committed r254386: <https://trac.webkit.org/changeset/254386> 1605445 4 commit-queue 2020-01-10 17:53:04 -0800 All reviewed patches have been landed. Closing bug. 1606025 5 wilander 2020-01-13 13:20:49 -0800 Making further changes to address flakiness in https://bugs.webkit.org/show_bug.cgi?id=206188. 387380 2020-01-10 15:07:33 -0800 2020-01-10 17:53:03 -0800 Patch for landing bug-206100-20200110150732.patch text/plain 5636 wilander U3VidmVyc2lvbiBSZXZpc2lvbjogMjU0MzYzCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggOTk4MjhjZmI4ZDkzMDE2ZTAzZTZk MGQ5MzJmMzJiZmExMDIxN2Y1YS4uZjExZGY3ZWJmYzk3M2E0Mzk3MTYzZDU0NTM4YjIwZTRhYzdj OWFjZiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIwLTAxLTEwICBKb2huIFdpbGFuZGVyICA8 d2lsYW5kZXJAYXBwbGUuY29tPgorCisgICAgICAgIE1ha2UgaHR0cC90ZXN0cy9yZXNvdXJjZUxv YWRTdGF0aXN0aWNzL2NsYXNzaWZ5LWFzLW5vbi1wcmV2YWxlbnQtYmFzZWQtb24tc3ViLWZyYW1l LXVuZGVyLXRvcC1mcmFtZS1vcmlnaW5zKiB1c2UgcmVzb3VyY2UvdXRpbC5qcworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA2MTAwCisgICAgICAgIDxy ZGFyOi8vcHJvYmxlbS81ODQ5MjMzNT4KKworICAgICAgICBVbnJldmlld2VkIHRlc3QgZ2FyZGVu aW5nLgorCisgICAgICAgICogaHR0cC90ZXN0cy9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzL2NsYXNz aWZ5LWFzLW5vbi1wcmV2YWxlbnQtYmFzZWQtb24tc3ViLWZyYW1lLXVuZGVyLXRvcC1mcmFtZS1v cmlnaW5zLWRhdGFiYXNlLmh0bWw6CisgICAgICAgICogaHR0cC90ZXN0cy9yZXNvdXJjZUxvYWRT dGF0aXN0aWNzL2NsYXNzaWZ5LWFzLW5vbi1wcmV2YWxlbnQtYmFzZWQtb24tc3ViLWZyYW1lLXVu ZGVyLXRvcC1mcmFtZS1vcmlnaW5zLmh0bWw6CisgICAgICAgICAgICBUaGVzZSB0d28gdGVzdHMg bm93IHVzZSBzZXRFbmFibGVGZWF0dXJlKCkgaW4gcmVzb3VyY2VzL3V0aWwuanMgd2hpY2ggbWFr ZXMgc3VyZSAKKyAgICAgICAgICAgIHRlc3RSdW5uZXIuc2V0U3RhdGlzdGljc05vdGlmeVBhZ2Vz V2hlbkRhdGFSZWNvcmRzV2VyZVNjYW5uZWQoKSBpcyBjYWxsZWQgd2l0aAorICAgICAgICAgICAg ZmFsc2UgYmVmb3JlIGVuZGluZyB0aGUgdGVzdC4KKwogMjAyMC0wMS0xMCAgQnJlbnQgRnVsZ2hh bSAgPGJmdWxnaGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgY29tLmFwcGxlLmxvY2F0 aW9uZC5yZWdpc3RyYXRpb24gZnJvbSB0aGUgV2ViQ29udGVudCBzYW5kYm94CmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3Jlc291cmNlTG9hZFN0YXRpc3RpY3MvY2xhc3NpZnkt YXMtbm9uLXByZXZhbGVudC1iYXNlZC1vbi1zdWItZnJhbWUtdW5kZXItdG9wLWZyYW1lLW9yaWdp bnMtZGF0YWJhc2UuaHRtbCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvcmVzb3VyY2VMb2FkU3Rh dGlzdGljcy9jbGFzc2lmeS1hcy1ub24tcHJldmFsZW50LWJhc2VkLW9uLXN1Yi1mcmFtZS11bmRl ci10b3AtZnJhbWUtb3JpZ2lucy1kYXRhYmFzZS5odG1sCmluZGV4IGI4NTQwOTA4ZWQ4MGQxMzRl NzM4MDQ5NmEyNzUwNWFkMDA1Yzk3YmEuLmNhMmVjNmQ5Mzc1NGY4MTdlMGQ1M2MxYjI0ZjZhMzVj ODc1ZTU0ZjIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvcmVzb3VyY2VMb2Fk U3RhdGlzdGljcy9jbGFzc2lmeS1hcy1ub24tcHJldmFsZW50LWJhc2VkLW9uLXN1Yi1mcmFtZS11 bmRlci10b3AtZnJhbWUtb3JpZ2lucy1kYXRhYmFzZS5odG1sCisrKyBiL0xheW91dFRlc3RzL2h0 dHAvdGVzdHMvcmVzb3VyY2VMb2FkU3RhdGlzdGljcy9jbGFzc2lmeS1hcy1ub24tcHJldmFsZW50 LWJhc2VkLW9uLXN1Yi1mcmFtZS11bmRlci10b3AtZnJhbWUtb3JpZ2lucy1kYXRhYmFzZS5odG1s CkBAIC00LDggKzQsOSBAQAogICAgIDxtZXRhIGNoYXJzZXQ9IlVURi04Ij4KICAgICA8dGl0bGU+ VGVzdHMgZm9yIENsYXNzaWZpY2F0aW9uIEJhc2VkIG9uIFN1YiBGcmFtZSBVbmRlciBUb3AgRnJh bWUgT3JpZ2luczwvdGl0bGU+CiAgICAgPHNjcmlwdCBzcmM9Ii9qcy10ZXN0LXJlc291cmNlcy9q cy10ZXN0LmpzIj48L3NjcmlwdD4KKyAgICA8c2NyaXB0IHNyYz0icmVzb3VyY2VzL3V0aWwuanMi Pjwvc2NyaXB0PgogPC9oZWFkPgotPGJvZHk+Cis8Ym9keSBvbmxvYWQ9InJ1bigpIj4KIDxzY3Jp cHQ+CiAgICAgY29uc3QgaG9zdFVuZGVyVGVzdCA9ICIxMjcuMC4wLjE6ODAwMCI7CiAgICAgY29u c3Qgc3RhdGlzdGljc1VybCA9ICJodHRwOi8vIiArIGhvc3RVbmRlclRlc3QgKyAiL3RlbXAiOwpA QCAtMTksMTQgKzIwLDEyIEBACiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIHRlc3RQYXNzZWQo Ikhvc3QgZGlkIG5vdCBnZXQgY2xhc3NpZmllZCBhcyBwcmV2YWxlbnQgcmVzb3VyY2UuIik7CiAK LSAgICAgICAgdGVzdFJ1bm5lci5zdGF0aXN0aWNzUmVzZXRUb0NvbnNpc3RlbnRTdGF0ZShmdW5j dGlvbigpIHsKKyAgICAgICAgc2V0RW5hYmxlRmVhdHVyZShmYWxzZSwgZnVuY3Rpb24oKSB7CiAg ICAgICAgICAgICB0ZXN0UnVubmVyLm5vdGlmeURvbmUoKTsKICAgICAgICAgfSk7CiAgICAgfQog CiAgICAgZnVuY3Rpb24gcnVuVGVzdFJ1bm5lclRlc3QoKSB7Ci0gICAgICAgIHRlc3RSdW5uZXIu c2V0U3RhdGlzdGljc05vdGlmeVBhZ2VzV2hlbkRhdGFSZWNvcmRzV2VyZVNjYW5uZWQodHJ1ZSk7 Ci0KICAgICAgICAgdGVzdFJ1bm5lci5zZXRTdGF0aXN0aWNzUHJldmFsZW50UmVzb3VyY2Uoc3Rh dGlzdGljc1VybCwgZmFsc2UsIGZ1bmN0aW9uKCkgewogICAgICAgICAgICAgaWYgKHRlc3RSdW5u ZXIuaXNTdGF0aXN0aWNzUHJldmFsZW50UmVzb3VyY2Uoc3RhdGlzdGljc1VybCkpCiAgICAgICAg ICAgICAgICAgdGVzdEZhaWxlZCgiSG9zdCBkaWQgbm90IGdldCBzZXQgYXMgbm9uLXByZXZhbGVu dCByZXNvdXJjZS4iKTsKQEAgLTQyLDExICs0MSwxMiBAQAogICAgICAgICB9KTsKICAgICB9CiAK LSAgICBpZiAoZG9jdW1lbnQubG9jYXRpb24uaG9zdCA9PT0gaG9zdFVuZGVyVGVzdCAmJiB3aW5k b3cudGVzdFJ1bm5lciAmJiB3aW5kb3cuaW50ZXJuYWxzKSB7Ci0gICAgICAgIHRlc3RSdW5uZXIu c2V0VXNlSVRQRGF0YWJhc2UodHJ1ZSk7Ci0gICAgICAgIHRlc3RSdW5uZXIud2FpdFVudGlsRG9u ZSgpOwotICAgICAgICBpbnRlcm5hbHMuc2V0UmVzb3VyY2VMb2FkU3RhdGlzdGljc0VuYWJsZWQo dHJ1ZSk7Ci0gICAgICAgIHJ1blRlc3RSdW5uZXJUZXN0KCk7CisgICAgZnVuY3Rpb24gcnVuKCkg eworICAgICAgICBpZiAoZG9jdW1lbnQubG9jYXRpb24uaG9zdCA9PT0gaG9zdFVuZGVyVGVzdCAm JiB3aW5kb3cudGVzdFJ1bm5lciAmJiB3aW5kb3cuaW50ZXJuYWxzKSB7CisgICAgICAgICAgICB0 ZXN0UnVubmVyLnNldFVzZUlUUERhdGFiYXNlKHRydWUpOworICAgICAgICAgICAgdGVzdFJ1bm5l ci53YWl0VW50aWxEb25lKCk7CisgICAgICAgICAgICBzZXRFbmFibGVGZWF0dXJlKHRydWUsIHJ1 blRlc3RSdW5uZXJUZXN0KTsKKyAgICAgICAgfQogICAgIH0KIDwvc2NyaXB0PgogPC9ib2R5Pgpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9yZXNvdXJjZUxvYWRTdGF0aXN0aWNz L2NsYXNzaWZ5LWFzLW5vbi1wcmV2YWxlbnQtYmFzZWQtb24tc3ViLWZyYW1lLXVuZGVyLXRvcC1m cmFtZS1vcmlnaW5zLmh0bWwgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3Jlc291cmNlTG9hZFN0 YXRpc3RpY3MvY2xhc3NpZnktYXMtbm9uLXByZXZhbGVudC1iYXNlZC1vbi1zdWItZnJhbWUtdW5k ZXItdG9wLWZyYW1lLW9yaWdpbnMuaHRtbAppbmRleCA5Y2UxM2RmNjc4MmIyNzg0NmVhOGUxN2Rl OTc4NzVlM2U2MzFhM2MxLi5kOTFkZTk0MjY5OGY3NzExMjYwNmYxODUwM2Y5YzJmOTc3NWNkYmU5 IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3Jlc291cmNlTG9hZFN0YXRpc3Rp Y3MvY2xhc3NpZnktYXMtbm9uLXByZXZhbGVudC1iYXNlZC1vbi1zdWItZnJhbWUtdW5kZXItdG9w LWZyYW1lLW9yaWdpbnMuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3Jlc291cmNl TG9hZFN0YXRpc3RpY3MvY2xhc3NpZnktYXMtbm9uLXByZXZhbGVudC1iYXNlZC1vbi1zdWItZnJh bWUtdW5kZXItdG9wLWZyYW1lLW9yaWdpbnMuaHRtbApAQCAtNCw4ICs0LDkgQEAKICAgICA8bWV0 YSBjaGFyc2V0PSJVVEYtOCI+CiAgICAgPHRpdGxlPlRlc3RzIGZvciBDbGFzc2lmaWNhdGlvbiBC YXNlZCBvbiBTdWIgRnJhbWUgVW5kZXIgVG9wIEZyYW1lIE9yaWdpbnM8L3RpdGxlPgogICAgIDxz Y3JpcHQgc3JjPSIvanMtdGVzdC1yZXNvdXJjZXMvanMtdGVzdC5qcyI+PC9zY3JpcHQ+CisgICAg PHNjcmlwdCBzcmM9InJlc291cmNlcy91dGlsLmpzIj48L3NjcmlwdD4KIDwvaGVhZD4KLTxib2R5 PgorPGJvZHkgb25sb2FkPSJydW4oKSI+CiA8c2NyaXB0PgogICAgIGNvbnN0IGhvc3RVbmRlclRl c3QgPSAiMTI3LjAuMC4xOjgwMDAiOwogICAgIGNvbnN0IHN0YXRpc3RpY3NVcmwgPSAiaHR0cDov LyIgKyBob3N0VW5kZXJUZXN0ICsgIi90ZW1wIjsKQEAgLTE5LDE0ICsyMCwxMiBAQAogICAgICAg ICBlbHNlCiAgICAgICAgICAgICB0ZXN0UGFzc2VkKCJIb3N0IGRpZCBub3QgZ2V0IGNsYXNzaWZp ZWQgYXMgcHJldmFsZW50IHJlc291cmNlLiIpOwogCi0gICAgICAgIHRlc3RSdW5uZXIuc3RhdGlz dGljc1Jlc2V0VG9Db25zaXN0ZW50U3RhdGUoZnVuY3Rpb24oKSB7CisgICAgICAgIHNldEVuYWJs ZUZlYXR1cmUoZmFsc2UsIGZ1bmN0aW9uKCkgewogICAgICAgICAgICAgdGVzdFJ1bm5lci5ub3Rp ZnlEb25lKCk7CiAgICAgICAgIH0pOwogICAgIH0KIAogICAgIGZ1bmN0aW9uIHJ1blRlc3RSdW5u ZXJUZXN0KCkgewotICAgICAgICB0ZXN0UnVubmVyLnNldFN0YXRpc3RpY3NOb3RpZnlQYWdlc1do ZW5EYXRhUmVjb3Jkc1dlcmVTY2FubmVkKHRydWUpOwotCiAgICAgICAgIHRlc3RSdW5uZXIuc2V0 U3RhdGlzdGljc1ByZXZhbGVudFJlc291cmNlKHN0YXRpc3RpY3NVcmwsIGZhbHNlLCBmdW5jdGlv bigpIHsKICAgICAgICAgICAgIGlmICh0ZXN0UnVubmVyLmlzU3RhdGlzdGljc1ByZXZhbGVudFJl c291cmNlKHN0YXRpc3RpY3NVcmwpKQogICAgICAgICAgICAgICAgIHRlc3RGYWlsZWQoIkhvc3Qg ZGlkIG5vdCBnZXQgc2V0IGFzIG5vbi1wcmV2YWxlbnQgcmVzb3VyY2UuIik7CkBAIC00MiwxMCAr NDEsMTEgQEAKICAgICAgICAgfSk7CiAgICAgfQogCi0gICAgaWYgKGRvY3VtZW50LmxvY2F0aW9u Lmhvc3QgPT09IGhvc3RVbmRlclRlc3QgJiYgd2luZG93LnRlc3RSdW5uZXIgJiYgd2luZG93Lmlu dGVybmFscykgewotICAgICAgICB0ZXN0UnVubmVyLndhaXRVbnRpbERvbmUoKTsKLSAgICAgICAg aW50ZXJuYWxzLnNldFJlc291cmNlTG9hZFN0YXRpc3RpY3NFbmFibGVkKHRydWUpOwotICAgICAg ICBydW5UZXN0UnVubmVyVGVzdCgpOworICAgIGZ1bmN0aW9uIHJ1bigpIHsKKyAgICAgICAgaWYg KGRvY3VtZW50LmxvY2F0aW9uLmhvc3QgPT09IGhvc3RVbmRlclRlc3QgJiYgd2luZG93LnRlc3RS dW5uZXIgJiYgd2luZG93LmludGVybmFscykgeworICAgICAgICAgICAgdGVzdFJ1bm5lci53YWl0 VW50aWxEb25lKCk7CisgICAgICAgICAgICBzZXRFbmFibGVGZWF0dXJlKHRydWUsIHJ1blRlc3RS dW5uZXJUZXN0KTsKKyAgICAgICAgfQogICAgIH0KIDwvc2NyaXB0PgogPC9ib2R5Pgo=