234768 2021-12-31 10:02:12 -0800 Reduce repetition in Internals "set page activity state" methods 2021-12-31 22:05:20 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 tyler_w tyler_w darin webkit-bug-importer oldest_to_newest 1827347 0 tyler_w 2021-12-31 10:02:12 -0800 I want to add another one of these methods in a future patch and noticed they could be simplified. 1827348 1 448126 tyler_w 2021-12-31 10:06:27 -0800 Created attachment 448126 Patch 1827350 2 448127 tyler_w 2021-12-31 10:52:53 -0800 Created attachment 448127 Patch 1827393 3 ews-feeder 2021-12-31 22:04:44 -0800 Committed r287498 (245633@main): <https://commits.webkit.org/245633@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 448127. 1827394 4 webkit-bug-importer 2021-12-31 22:05:20 -0800 <rdar://problem/87038183> 448126 2021-12-31 10:06:27 -0800 2021-12-31 10:52:51 -0800 Patch bug-234768-20211231120626.patch text/plain 4583 tyler_w U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3NDkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGI0ZmVlMzQzOWZmMWNi ZDZmZThjODcwNWJmYmFlMTBjN2NkMjkzMC4uOTZkYzlkOWUwMGY4M2M1OWM4N2UzMGRhN2UzZThj ZDVjZDFjYWNiNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIxLTEyLTMxICBUeWxl ciBXaWxjb2NrICA8dHlsZXJfd0BhcHBsZS5jb20+CisKKyAgICAgICAgUmVkdWNlIHJlcGV0aXRp b24gaW4gSW50ZXJuYWxzICJzZXQgcGFnZSBhY3Rpdml0eSBzdGF0ZSIgbWV0aG9kcworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM0NzY4CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgYHNldFBhZ2VWaXNpYmls aXR5YCwgYHNldFBhZ2VJc0ZvY3VzZWRBbmRBY3RpdmVgLCBhbmQgCisgICAgICAgIGBzZXRQYWdl SXNJbldpbmRvd2AgYWxsIG1vZGlmeSBwYWdlIGFjdGl2aXR5IHN0YXRlLCBhbmQgcmVwZWF0IGEg bG90CisgICAgICAgIG9mIHRoZSBzYW1lIGxvZ2ljIHRvIGRvIHNvLiBUaGlzIHBhdGNoIHJlZmFj dG9ycyB0aGlzIGludG8gYSBjb21tb24KKyAgICAgICAgYHNldFBhZ2VBY3Rpdml0eVN0YXRlYCBt ZXRob2QuCisKKyAgICAgICAgKiB0ZXN0aW5nL0ludGVybmFscy5jcHA6CisgICAgICAgIChXZWJD b3JlOjpJbnRlcm5hbHM6OnNldFBhZ2VWaXNpYmlsaXR5KToKKyAgICAgICAgKFdlYkNvcmU6Oklu dGVybmFsczo6c2V0UGFnZUlzRm9jdXNlZEFuZEFjdGl2ZSk6CisgICAgICAgIChXZWJDb3JlOjpJ bnRlcm5hbHM6OnNldFBhZ2VJc0luV2luZG93KToKKyAgICAgICAgUmVmYWN0b3IgdG8gdXNlIG5l dyBzZXRQYWdlQWN0aXZpdHlTdGF0ZSBtZXRob2QuCisgICAgICAgIChXZWJDb3JlOjpJbnRlcm5h bHM6OnNldFBhZ2VBY3Rpdml0eVN0YXRlKToKKyAgICAgICAgQWRkZWQuCisgICAgICAgICogdGVz dGluZy9JbnRlcm5hbHMuaDoKKwogMjAyMS0xMi0zMSAgQWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBs ZS5jb20+CiAKICAgICAgICAgW0xGQ11bSUZDXSBUYWtlIGdyYXBoZW1lIGNsdXN0ZXJzIGludG8g YWNjb3VudCB3aGVuIGtlZXBpbmcgdGhlIGZpcnN0ICJjaGFyYWN0ZXIiIG9uIHRoZSBsaW5lCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5jcHAKaW5kZXggM2MyNzRjNTA2MjMwOGVlY2UxNWQ3 ZmFmN2RlMTU3MjI1OGNkNGE0ZC4uODQyY2I0YWU2ODdhNzM0YzNlMDE2NWRjZmEwOGU1OWJhOWZh MGM2MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmNwcApAQCAtMjgsNyArMjgsNiBA QAogI2luY2x1ZGUgIkludGVybmFscy5oIgogCiAjaW5jbHVkZSAiQVhPYmplY3RDYWNoZS5oIgot I2luY2x1ZGUgIkFjdGl2aXR5U3RhdGUuaCIKICNpbmNsdWRlICJBZGRFdmVudExpc3RlbmVyT3B0 aW9ucy5oIgogI2luY2x1ZGUgIkFuaW1hdGlvblRpbWVsaW5lLmgiCiAjaW5jbHVkZSAiQXBwbGlj YXRpb25DYWNoZVN0b3JhZ2UuaCIKQEAgLTUzNDgsNTAgKzUzNDcsMzIgQEAgYm9vbCBJbnRlcm5h bHM6OnJlcXVlc3RlZE1ldGFsKFdlYkdMUmVuZGVyaW5nQ29udGV4dCYgY29udGV4dCkKIAogdm9p ZCBJbnRlcm5hbHM6OnNldFBhZ2VWaXNpYmlsaXR5KGJvb2wgaXNWaXNpYmxlKQogewotICAgIGF1 dG8qIGRvY3VtZW50ID0gY29udGV4dERvY3VtZW50KCk7Ci0gICAgaWYgKCFkb2N1bWVudCB8fCAh ZG9jdW1lbnQtPnBhZ2UoKSkKLSAgICAgICAgcmV0dXJuOwotICAgIGF1dG8mIHBhZ2UgPSAqZG9j dW1lbnQtPnBhZ2UoKTsKLSAgICBhdXRvIHN0YXRlID0gcGFnZS5hY3Rpdml0eVN0YXRlKCk7Ci0K LSAgICBpZiAoIWlzVmlzaWJsZSkKLSAgICAgICAgc3RhdGUucmVtb3ZlKEFjdGl2aXR5U3RhdGU6 OklzVmlzaWJsZSk7Ci0gICAgZWxzZQotICAgICAgICBzdGF0ZS5hZGQoQWN0aXZpdHlTdGF0ZTo6 SXNWaXNpYmxlKTsKLQotICAgIHBhZ2Uuc2V0QWN0aXZpdHlTdGF0ZShzdGF0ZSk7CisgICAgc2V0 UGFnZUFjdGl2aXR5U3RhdGUoeyBBY3Rpdml0eVN0YXRlOjpJc1Zpc2libGUgfSwgaXNWaXNpYmxl KTsKIH0KIAogdm9pZCBJbnRlcm5hbHM6OnNldFBhZ2VJc0ZvY3VzZWRBbmRBY3RpdmUoYm9vbCBp c0ZvY3VzZWRBbmRBY3RpdmUpCiB7Ci0gICAgYXV0byogZG9jdW1lbnQgPSBjb250ZXh0RG9jdW1l bnQoKTsKLSAgICBpZiAoIWRvY3VtZW50IHx8ICFkb2N1bWVudC0+cGFnZSgpKQotICAgICAgICBy ZXR1cm47Ci0gICAgYXV0byYgcGFnZSA9ICpkb2N1bWVudC0+cGFnZSgpOwotICAgIGF1dG8gc3Rh dGUgPSBwYWdlLmFjdGl2aXR5U3RhdGUoKTsKLQotICAgIGlmICghaXNGb2N1c2VkQW5kQWN0aXZl KQotICAgICAgICBzdGF0ZS5yZW1vdmUoeyBBY3Rpdml0eVN0YXRlOjpJc0ZvY3VzZWQsIEFjdGl2 aXR5U3RhdGU6OldpbmRvd0lzQWN0aXZlIH0pOwotICAgIGVsc2UKLSAgICAgICAgc3RhdGUuYWRk KHsgQWN0aXZpdHlTdGF0ZTo6SXNGb2N1c2VkLCBBY3Rpdml0eVN0YXRlOjpXaW5kb3dJc0FjdGl2 ZSB9KTsKLQotICAgIHBhZ2Uuc2V0QWN0aXZpdHlTdGF0ZShzdGF0ZSk7CisgICAgc2V0UGFnZUFj dGl2aXR5U3RhdGUoeyBBY3Rpdml0eVN0YXRlOjpJc0ZvY3VzZWQsIEFjdGl2aXR5U3RhdGU6Oldp bmRvd0lzQWN0aXZlIH0sIGlzRm9jdXNlZEFuZEFjdGl2ZSk7CiB9CiAKIHZvaWQgSW50ZXJuYWxz OjpzZXRQYWdlSXNJbldpbmRvdyhib29sIGlzSW5XaW5kb3cpCiB7Ci0gICAgYXV0byogZG9jdW1l bnQgPSBjb250ZXh0RG9jdW1lbnQoKTsKLSAgICBpZiAoIWRvY3VtZW50IHx8ICFkb2N1bWVudC0+ cGFnZSgpKQorICAgIHNldFBhZ2VBY3Rpdml0eVN0YXRlKHsgQWN0aXZpdHlTdGF0ZTo6SXNJbldp bmRvdyB9LCBpc0luV2luZG93KTsKK30KKwordm9pZCBJbnRlcm5hbHM6OnNldFBhZ2VBY3Rpdml0 eVN0YXRlKE9wdGlvblNldDxBY3Rpdml0eVN0YXRlOjpGbGFnPiBzdGF0ZXNUb0NoYW5nZSwgYm9v bCBuZXdWYWx1ZSkKK3sKKyAgICBhdXRvKiBwYWdlID0gY29udGV4dERvY3VtZW50KCkgPyBjb250 ZXh0RG9jdW1lbnQoKS0+cGFnZSgpIDogbnVsbHB0cjsKKyAgICBpZiAoIXBhZ2UpCiAgICAgICAg IHJldHVybjsKLSAgICBhdXRvJiBwYWdlID0gKmRvY3VtZW50LT5wYWdlKCk7Ci0gICAgYXV0byBz dGF0ZSA9IHBhZ2UuYWN0aXZpdHlTdGF0ZSgpOworICAgIGF1dG8gc3RhdGUgPSBwYWdlLT5hY3Rp dml0eVN0YXRlKCk7CiAKLSAgICBpZiAoIWlzSW5XaW5kb3cpCi0gICAgICAgIHN0YXRlLnJlbW92 ZSh7IEFjdGl2aXR5U3RhdGU6OklzSW5XaW5kb3cgfSk7CisgICAgaWYgKCFuZXdWYWx1ZSkKKyAg ICAgICAgc3RhdGUucmVtb3ZlKHN0YXRlc1RvQ2hhbmdlKTsKICAgICBlbHNlCi0gICAgICAgIHN0 YXRlLmFkZCh7IEFjdGl2aXR5U3RhdGU6OklzSW5XaW5kb3cgfSk7CisgICAgICAgIHN0YXRlLmFk ZChzdGF0ZXNUb0NoYW5nZSk7CiAKLSAgICBwYWdlLnNldEFjdGl2aXR5U3RhdGUoc3RhdGUpOwor ICAgIHBhZ2UtPnNldEFjdGl2aXR5U3RhdGUoc3RhdGUpOwogfQogCiBib29sIEludGVybmFsczo6 aXNQYWdlQWN0aXZlKCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Rlc3Rpbmcv SW50ZXJuYWxzLmggYi9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5oCmluZGV4IDky YzU3Y2NmMjk0ZWY5MWU2YWE0ZTBjZmM2ZDhjYWRjZmYzYzZhMGUuLjZlNmI2ZWUyNWJjNDA1NzY2 MTRlMzg3MWQwYzE1ZjUzOThkZjJmYTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Rlc3Rp bmcvSW50ZXJuYWxzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuaApA QCAtMjYsNiArMjYsNyBAQAogCiAjcHJhZ21hIG9uY2UKIAorI2luY2x1ZGUgIkFjdGl2aXR5U3Rh dGUuaCIKICNpbmNsdWRlICJDU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb24uaCIKICNpbmNsdWRl ICJDb250ZXh0RGVzdHJ1Y3Rpb25PYnNlcnZlci5oIgogI2luY2x1ZGUgIkNvb2tpZS5oIgpAQCAt MTIzNSw2ICsxMjM2LDggQEAgcHJpdmF0ZToKICAgICBEb2N1bWVudCogY29udGV4dERvY3VtZW50 KCkgY29uc3Q7CiAgICAgRnJhbWUqIGZyYW1lKCkgY29uc3Q7CiAKKyAgICB2b2lkIHNldFBhZ2VB Y3Rpdml0eVN0YXRlKE9wdGlvblNldDxBY3Rpdml0eVN0YXRlOjpGbGFnPiBzdGF0ZXNUb0NoYW5n ZSwgYm9vbCBuZXdWYWx1ZSk7CisKICAgICBFeGNlcHRpb25PcjxSZW5kZXJlZERvY3VtZW50TWFy a2VyKj4gbWFya2VyQXQoTm9kZSYsIGNvbnN0IFN0cmluZyYgbWFya2VyVHlwZSwgdW5zaWduZWQg aW5kZXgpOwogICAgIEV4Y2VwdGlvbk9yPFNjcm9sbGFibGVBcmVhKj4gc2Nyb2xsYWJsZUFyZWFG b3JOb2RlKE5vZGUqKSBjb25zdDsKIAo= 448127 2021-12-31 10:52:53 -0800 2021-12-31 22:04:45 -0800 Patch bug-234768-20211231125252.patch text/plain 4603 tyler_w U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3NDkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGI0ZmVlMzQzOWZmMWNi ZDZmZThjODcwNWJmYmFlMTBjN2NkMjkzMC4uZWYzNmQ0YzQ1YjE2YmZjNWQzYmJlMjgzYmQyYzUy ZmE5ZmY4OTk5MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIxLTEyLTMxICBUeWxl ciBXaWxjb2NrICA8dHlsZXJfd0BhcHBsZS5jb20+CisKKyAgICAgICAgUmVkdWNlIHJlcGV0aXRp b24gaW4gSW50ZXJuYWxzICJzZXQgcGFnZSBhY3Rpdml0eSBzdGF0ZSIgbWV0aG9kcworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM0NzY4CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgYHNldFBhZ2VWaXNpYmls aXR5YCwgYHNldFBhZ2VJc0ZvY3VzZWRBbmRBY3RpdmVgLCBhbmQgCisgICAgICAgIGBzZXRQYWdl SXNJbldpbmRvd2AgYWxsIG1vZGlmeSBwYWdlIGFjdGl2aXR5IHN0YXRlLCBhbmQgcmVwZWF0IGEg bG90CisgICAgICAgIG9mIHRoZSBzYW1lIGxvZ2ljIHRvIGRvIHNvLiBUaGlzIHBhdGNoIHJlZmFj dG9ycyB0aGlzIGludG8gYSBjb21tb24KKyAgICAgICAgYHVwZGF0ZVBhZ2VBY3Rpdml0eVN0YXRl YCBtZXRob2QuCisKKyAgICAgICAgKiB0ZXN0aW5nL0ludGVybmFscy5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpJbnRlcm5hbHM6OnNldFBhZ2VWaXNpYmlsaXR5KToKKyAgICAgICAgKFdlYkNvcmU6 OkludGVybmFsczo6c2V0UGFnZUlzRm9jdXNlZEFuZEFjdGl2ZSk6CisgICAgICAgIChXZWJDb3Jl OjpJbnRlcm5hbHM6OnNldFBhZ2VJc0luV2luZG93KToKKyAgICAgICAgUmVmYWN0b3IgdG8gdXNl IHRoZSBuZXcgdXBkYXRlUGFnZUFjdGl2aXR5U3RhdGUgbWV0aG9kLgorICAgICAgICAoV2ViQ29y ZTo6SW50ZXJuYWxzOjp1cGRhdGVQYWdlQWN0aXZpdHlTdGF0ZSk6CisgICAgICAgIEFkZGVkLgor ICAgICAgICAqIHRlc3RpbmcvSW50ZXJuYWxzLmg6CisKIDIwMjEtMTItMzEgIEFsYW4gQnVqdGFz ICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10gVGFrZSBncmFwaGVtZSBj bHVzdGVycyBpbnRvIGFjY291bnQgd2hlbiBrZWVwaW5nIHRoZSBmaXJzdCAiY2hhcmFjdGVyIiBv biB0aGUgbGluZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMu Y3BwIGIvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuY3BwCmluZGV4IDNjMjc0YzUw NjIzMDhlZWNlMTVkN2ZhZjdkZTE1NzIyNThjZDRhNGQuLjgwNGMzNmU2YWExMjVjZGNkOGMyM2Nl NGUyNjRiMzlkNTY2YWJmNjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50 ZXJuYWxzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5jcHAKQEAg LTI4LDcgKzI4LDYgQEAKICNpbmNsdWRlICJJbnRlcm5hbHMuaCIKIAogI2luY2x1ZGUgIkFYT2Jq ZWN0Q2FjaGUuaCIKLSNpbmNsdWRlICJBY3Rpdml0eVN0YXRlLmgiCiAjaW5jbHVkZSAiQWRkRXZl bnRMaXN0ZW5lck9wdGlvbnMuaCIKICNpbmNsdWRlICJBbmltYXRpb25UaW1lbGluZS5oIgogI2lu Y2x1ZGUgIkFwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlLmgiCkBAIC01MzQ4LDUwICs1MzQ3LDMyIEBA IGJvb2wgSW50ZXJuYWxzOjpyZXF1ZXN0ZWRNZXRhbChXZWJHTFJlbmRlcmluZ0NvbnRleHQmIGNv bnRleHQpCiAKIHZvaWQgSW50ZXJuYWxzOjpzZXRQYWdlVmlzaWJpbGl0eShib29sIGlzVmlzaWJs ZSkKIHsKLSAgICBhdXRvKiBkb2N1bWVudCA9IGNvbnRleHREb2N1bWVudCgpOwotICAgIGlmICgh ZG9jdW1lbnQgfHwgIWRvY3VtZW50LT5wYWdlKCkpCi0gICAgICAgIHJldHVybjsKLSAgICBhdXRv JiBwYWdlID0gKmRvY3VtZW50LT5wYWdlKCk7Ci0gICAgYXV0byBzdGF0ZSA9IHBhZ2UuYWN0aXZp dHlTdGF0ZSgpOwotCi0gICAgaWYgKCFpc1Zpc2libGUpCi0gICAgICAgIHN0YXRlLnJlbW92ZShB Y3Rpdml0eVN0YXRlOjpJc1Zpc2libGUpOwotICAgIGVsc2UKLSAgICAgICAgc3RhdGUuYWRkKEFj dGl2aXR5U3RhdGU6OklzVmlzaWJsZSk7Ci0KLSAgICBwYWdlLnNldEFjdGl2aXR5U3RhdGUoc3Rh dGUpOworICAgIHVwZGF0ZVBhZ2VBY3Rpdml0eVN0YXRlKEFjdGl2aXR5U3RhdGU6OklzVmlzaWJs ZSwgaXNWaXNpYmxlKTsKIH0KIAogdm9pZCBJbnRlcm5hbHM6OnNldFBhZ2VJc0ZvY3VzZWRBbmRB Y3RpdmUoYm9vbCBpc0ZvY3VzZWRBbmRBY3RpdmUpCiB7Ci0gICAgYXV0byogZG9jdW1lbnQgPSBj b250ZXh0RG9jdW1lbnQoKTsKLSAgICBpZiAoIWRvY3VtZW50IHx8ICFkb2N1bWVudC0+cGFnZSgp KQotICAgICAgICByZXR1cm47Ci0gICAgYXV0byYgcGFnZSA9ICpkb2N1bWVudC0+cGFnZSgpOwot ICAgIGF1dG8gc3RhdGUgPSBwYWdlLmFjdGl2aXR5U3RhdGUoKTsKLQotICAgIGlmICghaXNGb2N1 c2VkQW5kQWN0aXZlKQotICAgICAgICBzdGF0ZS5yZW1vdmUoeyBBY3Rpdml0eVN0YXRlOjpJc0Zv Y3VzZWQsIEFjdGl2aXR5U3RhdGU6OldpbmRvd0lzQWN0aXZlIH0pOwotICAgIGVsc2UKLSAgICAg ICAgc3RhdGUuYWRkKHsgQWN0aXZpdHlTdGF0ZTo6SXNGb2N1c2VkLCBBY3Rpdml0eVN0YXRlOjpX aW5kb3dJc0FjdGl2ZSB9KTsKLQotICAgIHBhZ2Uuc2V0QWN0aXZpdHlTdGF0ZShzdGF0ZSk7Cisg ICAgdXBkYXRlUGFnZUFjdGl2aXR5U3RhdGUoeyBBY3Rpdml0eVN0YXRlOjpJc0ZvY3VzZWQsIEFj dGl2aXR5U3RhdGU6OldpbmRvd0lzQWN0aXZlIH0sIGlzRm9jdXNlZEFuZEFjdGl2ZSk7CiB9CiAK IHZvaWQgSW50ZXJuYWxzOjpzZXRQYWdlSXNJbldpbmRvdyhib29sIGlzSW5XaW5kb3cpCiB7Ci0g ICAgYXV0byogZG9jdW1lbnQgPSBjb250ZXh0RG9jdW1lbnQoKTsKLSAgICBpZiAoIWRvY3VtZW50 IHx8ICFkb2N1bWVudC0+cGFnZSgpKQorICAgIHVwZGF0ZVBhZ2VBY3Rpdml0eVN0YXRlKEFjdGl2 aXR5U3RhdGU6OklzSW5XaW5kb3csIGlzSW5XaW5kb3cpOworfQorCit2b2lkIEludGVybmFsczo6 dXBkYXRlUGFnZUFjdGl2aXR5U3RhdGUoT3B0aW9uU2V0PEFjdGl2aXR5U3RhdGU6OkZsYWc+IHN0 YXRlc1RvQ2hhbmdlLCBib29sIG5ld1ZhbHVlKQoreworICAgIGF1dG8qIHBhZ2UgPSBjb250ZXh0 RG9jdW1lbnQoKSA/IGNvbnRleHREb2N1bWVudCgpLT5wYWdlKCkgOiBudWxscHRyOworICAgIGlm ICghcGFnZSkKICAgICAgICAgcmV0dXJuOwotICAgIGF1dG8mIHBhZ2UgPSAqZG9jdW1lbnQtPnBh Z2UoKTsKLSAgICBhdXRvIHN0YXRlID0gcGFnZS5hY3Rpdml0eVN0YXRlKCk7CisgICAgYXV0byBz dGF0ZSA9IHBhZ2UtPmFjdGl2aXR5U3RhdGUoKTsKIAotICAgIGlmICghaXNJbldpbmRvdykKLSAg ICAgICAgc3RhdGUucmVtb3ZlKHsgQWN0aXZpdHlTdGF0ZTo6SXNJbldpbmRvdyB9KTsKKyAgICBp ZiAoIW5ld1ZhbHVlKQorICAgICAgICBzdGF0ZS5yZW1vdmUoc3RhdGVzVG9DaGFuZ2UpOwogICAg IGVsc2UKLSAgICAgICAgc3RhdGUuYWRkKHsgQWN0aXZpdHlTdGF0ZTo6SXNJbldpbmRvdyB9KTsK KyAgICAgICAgc3RhdGUuYWRkKHN0YXRlc1RvQ2hhbmdlKTsKIAotICAgIHBhZ2Uuc2V0QWN0aXZp dHlTdGF0ZShzdGF0ZSk7CisgICAgcGFnZS0+c2V0QWN0aXZpdHlTdGF0ZShzdGF0ZSk7CiB9CiAK IGJvb2wgSW50ZXJuYWxzOjppc1BhZ2VBY3RpdmUoKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuaCBiL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50 ZXJuYWxzLmgKaW5kZXggOTJjNTdjY2YyOTRlZjkxZTZhYTRlMGNmYzZkOGNhZGNmZjNjNmEwZS4u ZmY2YmQ4MTkwOThhZjM5YzJjZDYyZGE5MzNmOGFjNjY2NjBlMmRjNSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS90ZXN0 aW5nL0ludGVybmFscy5oCkBAIC0yNiw2ICsyNiw3IEBACiAKICNwcmFnbWEgb25jZQogCisjaW5j bHVkZSAiQWN0aXZpdHlTdGF0ZS5oIgogI2luY2x1ZGUgIkNTU0NvbXB1dGVkU3R5bGVEZWNsYXJh dGlvbi5oIgogI2luY2x1ZGUgIkNvbnRleHREZXN0cnVjdGlvbk9ic2VydmVyLmgiCiAjaW5jbHVk ZSAiQ29va2llLmgiCkBAIC0xMjM1LDYgKzEyMzYsOCBAQCBwcml2YXRlOgogICAgIERvY3VtZW50 KiBjb250ZXh0RG9jdW1lbnQoKSBjb25zdDsKICAgICBGcmFtZSogZnJhbWUoKSBjb25zdDsKIAor ICAgIHZvaWQgdXBkYXRlUGFnZUFjdGl2aXR5U3RhdGUoT3B0aW9uU2V0PEFjdGl2aXR5U3RhdGU6 OkZsYWc+IHN0YXRlc1RvQ2hhbmdlLCBib29sIG5ld1ZhbHVlKTsKKwogICAgIEV4Y2VwdGlvbk9y PFJlbmRlcmVkRG9jdW1lbnRNYXJrZXIqPiBtYXJrZXJBdChOb2RlJiwgY29uc3QgU3RyaW5nJiBt YXJrZXJUeXBlLCB1bnNpZ25lZCBpbmRleCk7CiAgICAgRXhjZXB0aW9uT3I8U2Nyb2xsYWJsZUFy ZWEqPiBzY3JvbGxhYmxlQXJlYUZvck5vZGUoTm9kZSopIGNvbnN0OwogCg==