149920 2015-10-08 02:46:39 -0700 [GTK] Stop using a nested main loop for popup menus 2015-10-08 03:07:21 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Local Build Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned gustavo svillar oldest_to_newest 1131582 0 cgarcia 2015-10-08 02:46:39 -0700 WebPageProxy used to expect the popup menus to run in a nested main loop and invalidated the object right after showing it. But this is nor longer the case, so there's no reason to keep using the nested main loop. 1131586 1 262683 cgarcia 2015-10-08 02:51:32 -0700 Created attachment 262683 Patch 1131591 2 262683 svillar 2015-10-08 03:03:26 -0700 Comment on attachment 262683 Patch let's nuke them all! 1131592 3 cgarcia 2015-10-08 03:07:21 -0700 Committed r190717: <http://trac.webkit.org/changeset/190717> 262683 2015-10-08 02:51:32 -0700 2015-10-08 03:03:26 -0700 Patch wk2-popup-menu-no-loop.diff text/plain 8808 cgarcia ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBlZDg1NTY2Li4wNTBmYTg5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTcgQEAKIDIwMTUtMTAt MDggIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCisgICAgICAg IFtHVEtdIFN0b3AgdXNpbmcgYSBuZXN0ZWQgbWFpbiBsb29wIGZvciBwb3B1cCBtZW51cworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ5OTIwCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVW5za2lwIHBsYXRm b3JtL2d0ay9mYXN0L2Zvcm1zL21lbnVsaXN0LXR5cGVhaGVhZC1maW5kLmh0bWwgdGhhdAorICAg ICAgICB3YXMgdGltaW5nIG91dCBiZWNhdXNlIG9mIHRoZSBuZXN0ZWQgbWFpbiBsb29wLgorCisg ICAgICAgICogcGxhdGZvcm0vZ3RrL1Rlc3RFeHBlY3RhdGlvbnM6CisKKzIwMTUtMTAtMDggIENh cmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCiAgICAgICAgIFVucmV2 aWV3ZWQgR1RLKyBnYXJkZW5pbmcuIE1hcmsgc2V2ZXJhbCBpbnNwZWN0b3IgdGVzdHMgYXMgc2xv dy4KIAogICAgICAgICAqIHBsYXRmb3JtL2d0ay9UZXN0RXhwZWN0YXRpb25zOgpkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0 cy9wbGF0Zm9ybS9ndGsvVGVzdEV4cGVjdGF0aW9ucwppbmRleCA5Y2ZkZTYwLi42Mzg2MDNiIDEw MDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvVGVzdEV4cGVjdGF0aW9ucworKysg Yi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvVGVzdEV4cGVjdGF0aW9ucwpAQCAtMTU4Niw3ICsx NTg2LDYgQEAgQnVnKEdUSykgaHR0cC90ZXN0cy9zZWN1cml0eS9jcm9zcy1vcmlnaW4teHNsLXJl ZGlyZWN0LUJMT0NLRUQuaHRtbCBbIEZhaWx1cmUgXQogQnVnKEdUSykgaHR0cC90ZXN0cy9zZWN1 cml0eS9zdG9yYWdlLWJsb2NraW5nLXN0cmVuZ3RoZW5lZC1wbHVnaW4uaHRtbCBbIEZhaWx1cmUg XQogQnVnKEdUSykgaHR0cC90ZXN0cy9zZWN1cml0eS9zdG9yYWdlLWJsb2NraW5nLXN0cmVuZ3Ro ZW5lZC1wcml2YXRlLWJyb3dzaW5nLXBsdWdpbi5odG1sIFsgRmFpbHVyZSBdCiBCdWcoR1RLKSBw bGF0Zm9ybS9ndGsvZmFzdC9ldmVudHMvZXZlbnQtc2VuZGVyLW1ldGFrZXkuaHRtbCBbIEZhaWx1 cmUgXQotQnVnKEdUSykgcGxhdGZvcm0vZ3RrL2Zhc3QvZm9ybXMvbWVudWxpc3QtdHlwZWFoZWFk LWZpbmQuaHRtbCBbIEZhaWx1cmUgXQogQnVnKEdUSykgcGx1Z2lucy9rZXlib2FyZC1ldmVudHMu aHRtbCBbIEZhaWx1cmUgXQogQnVnKEdUSykgcGx1Z2lucy9uZXRzY2FwZS1wbHVnaW4tc2V0d2lu ZG93LXNpemUtMi5odG1sIFsgRmFpbHVyZSBdCiBCdWcoR1RLKSBwbHVnaW5zL25wcC1zZXQtd2lu ZG93LWNhbGxlZC1kdXJpbmctZGVzdHJ1Y3Rpb24uaHRtbCBbIEZhaWx1cmUgXQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmlu ZGV4IDIwODZjYmEuLmU3YWI1MzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxv ZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNiBAQAorMjAxNS0x MC0wOCAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CisKKyAgICAg ICAgW0dUS10gU3RvcCB1c2luZyBhIG5lc3RlZCBtYWluIGxvb3AgZm9yIHBvcHVwIG1lbnVzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDk5MjAKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWJQYWdlUHJv eHkgdXNlZCB0byBleHBlY3QgdGhlIHBvcHVwIG1lbnVzIHRvIHJ1biBpbiBhIG5lc3RlZAorICAg ICAgICBtYWluIGxvb3AgYW5kIGludmFsaWRhdGVkIHRoZSBtZW51IHJpZ2h0IGFmdGVyIHNob3dp bmcgaXQuIEJ1dAorICAgICAgICB0aGlzIGlzIG5vIGxvbmdlciB0aGUgY2FzZSwgc28gdGhlcmUn cyBubyByZWFzb24gdG8ga2VlcCB1c2luZworICAgICAgICB0aGUgbmVzdGVkIG1haW4gbG9vcC4K KworICAgICAgICAqIFVJUHJvY2Vzcy9ndGsvV2ViUG9wdXBNZW51UHJveHlHdGsuY3BwOgorICAg ICAgICAoV2ViS2l0OjpXZWJQb3B1cE1lbnVQcm94eUd0azo6fldlYlBvcHVwTWVudVByb3h5R3Rr KToKKyAgICAgICAgKFdlYktpdDo6V2ViUG9wdXBNZW51UHJveHlHdGs6OmNhbmNlbFRyYWNraW5n KToKKyAgICAgICAgKFdlYktpdDo6V2ViUG9wdXBNZW51UHJveHlHdGs6Om1lbnVJdGVtQWN0aXZh dGVkKToKKyAgICAgICAgKFdlYktpdDo6V2ViUG9wdXBNZW51UHJveHlHdGs6OldlYlBvcHVwTWVu dVByb3h5R3RrKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYktpdDo6V2ViUG9wdXBNZW51UHJveHlH dGs6OnNob3dQb3B1cE1lbnUpOiBEZWxldGVkLgorICAgICAgICAoV2ViS2l0OjpXZWJQb3B1cE1l bnVQcm94eUd0azo6c2h1dGRvd25SdW5Mb29wKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYktpdDo6 V2ViUG9wdXBNZW51UHJveHlHdGs6Om1lbnVVbm1hcHBlZCk6IERlbGV0ZWQuCisgICAgICAgICog VUlQcm9jZXNzL2d0ay9XZWJQb3B1cE1lbnVQcm94eUd0ay5oOgorICAgICAgICAoV2ViS2l0OjpX ZWJQb3B1cE1lbnVQcm94eUd0azo6c2V0QWN0aXZlSXRlbSk6IERlbGV0ZWQuCisKIDIwMTUtMTAt MDcgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQg QVBJIGZvciBnZXR0aW5nIGEgZ3JvdXAgaWRlbnRpZmllciBmcm9tIGEgYnVuZGxlIHBhZ2UKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9ndGsvV2ViUG9wdXBNZW51UHJveHlH dGsuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2d0ay9XZWJQb3B1cE1lbnVQcm94eUd0 ay5jcHAKaW5kZXggMmI0MzdkNC4uZWUwZjA2MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL2d0ay9XZWJQb3B1cE1lbnVQcm94eUd0ay5jcHAKKysrIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL2d0ay9XZWJQb3B1cE1lbnVQcm94eUd0ay5jcHAKQEAgLTQyLDcgKzQyLDYg QEAgV2ViUG9wdXBNZW51UHJveHlHdGs6OldlYlBvcHVwTWVudVByb3h5R3RrKEd0a1dpZGdldCog d2ViVmlldywgV2ViUG9wdXBNZW51UHJveHkKICAgICA6IFdlYlBvcHVwTWVudVByb3h5KGNsaWVu dCkKICAgICAsIG1fd2ViVmlldyh3ZWJWaWV3KQogICAgICwgbV9wb3B1cChndGtfbWVudV9uZXco KSkKLSAgICAsIG1fYWN0aXZlSXRlbSgtMSkKICAgICAsIG1fcHJldmlvdXNLZXlFdmVudENoYXJh Y3RlcigwKQogICAgICwgbV9wcmV2aW91c0tleUV2ZW50VGltZXN0YW1wKDApCiAgICAgLCBtX2N1 cnJlbnRseVNlbGVjdGVkTWVudUl0ZW0obnVsbHB0cikKQEAgLTUyLDExICs1MSw3IEBAIFdlYlBv cHVwTWVudVByb3h5R3RrOjpXZWJQb3B1cE1lbnVQcm94eUd0ayhHdGtXaWRnZXQqIHdlYlZpZXcs IFdlYlBvcHVwTWVudVByb3h5CiAKIFdlYlBvcHVwTWVudVByb3h5R3RrOjp+V2ViUG9wdXBNZW51 UHJveHlHdGsoKQogewotICAgIGlmIChtX3BvcHVwKSB7Ci0gICAgICAgIGdfc2lnbmFsX2hhbmRs ZXJzX2Rpc2Nvbm5lY3RfbWF0Y2hlZChtX3BvcHVwLCBHX1NJR05BTF9NQVRDSF9EQVRBLCAwLCAw LCAwLCAwLCB0aGlzKTsKLSAgICAgICAgaGlkZVBvcHVwTWVudSgpOwotICAgICAgICBndGtfd2lk Z2V0X2Rlc3Ryb3kobV9wb3B1cCk7Ci0gICAgfQorICAgIGNhbmNlbFRyYWNraW5nKCk7CiB9CiAK IEd0a0FjdGlvbiogV2ViUG9wdXBNZW51UHJveHlHdGs6OmNyZWF0ZUd0a0FjdGlvbkZvck1lbnVJ dGVtKGNvbnN0IFdlYlBvcHVwSXRlbSYgaXRlbSwgaW50IGl0ZW1JbmRleCkKQEAgLTEyNyw4ICsx MjIsNiBAQCB2b2lkIFdlYlBvcHVwTWVudVByb3h5R3RrOjpzaG93UG9wdXBNZW51KGNvbnN0IElu dFJlY3QmIHJlY3QsIFRleHREaXJlY3Rpb24sIGRvdQogICAgICAgICBtZW51UG9zaXRpb24uc2V0 WShtZW51UG9zaXRpb24ueSgpIC0gcmVjdC5oZWlnaHQoKSAvIDIpOwogICAgIH0KIAotICAgIGd1 bG9uZyB1bm1hcEhhbmRsZXIgPSBnX3NpZ25hbF9jb25uZWN0KG1fcG9wdXAsICJ1bm1hcCIsIEdf Q0FMTEJBQ0sobWVudVVubWFwcGVkKSwgdGhpcyk7Ci0KICAgICBjb25zdCBHZGtFdmVudCogZXZl bnQgPSBtX2NsaWVudC0+Y3VycmVudGx5UHJvY2Vzc2VkTW91c2VEb3duRXZlbnQoKSA/IG1fY2xp ZW50LT5jdXJyZW50bHlQcm9jZXNzZWRNb3VzZURvd25FdmVudCgpLT5uYXRpdmVFdmVudCgpIDog bnVsbHB0cjsKICAgICBndGtfbWVudV9wb3B1cF9mb3JfZGV2aWNlKEdUS19NRU5VKG1fcG9wdXAp LCBldmVudCA/IGdka19ldmVudF9nZXRfZGV2aWNlKGV2ZW50KSA6IG51bGxwdHIsIG51bGxwdHIs IG51bGxwdHIsCiAgICAgICAgIFtdKEd0a01lbnUqLCBnaW50KiB4LCBnaW50KiB5LCBnYm9vbGVh biogcHVzaEluLCBncG9pbnRlciB1c2VyRGF0YSkgewpAQCAtMTQ5LDI3ICsxNDIsNiBAQCB2b2lk IFdlYlBvcHVwTWVudVByb3h5R3RrOjpzaG93UG9wdXBNZW51KGNvbnN0IEludFJlY3QmIHJlY3Qs IFRleHREaXJlY3Rpb24sIGRvdQogICAgICAgIG1fY2xpZW50LT5mYWlsZWRUb1Nob3dQb3B1cE1l bnUoKTsKICAgICAgICByZXR1cm47CiAgICAgfQotCi0gICAgLy8gV2ViUGFnZVByb3h5IGV4cGVj dHMgdGhlIG1lbnUgdG8gcnVuIGluIGEgbmVzdGVkIHJ1biBsb29wLCBzaW5jZSBpdCBpbnZhbGlk YXRlcyB0aGUKLSAgICAvLyBtZW51IHJpZ2h0IGFmdGVyIGNhbGxpbmcgV2ViUG9wdXBNZW51UHJv eHk6OnNob3dQb3B1cE1lbnUoKS4KLSAgICBtX3J1bkxvb3AgPSBhZG9wdEdSZWYoZ19tYWluX2xv b3BfbmV3KG51bGxwdHIsIEZBTFNFKSk7Ci0KLS8vIFRoaXMgaXMgdG8gc3VwcHJlc3Mgd2Fybmlu Z3MgYWJvdXQgZ2RrX3RocmVhZHNfbGVhdmUgYW5kIGdka190aHJlYWRzX2VudGVyLgotI3ByYWdt YSBHQ0MgZGlhZ25vc3RpYyBwdXNoCi0jcHJhZ21hIEdDQyBkaWFnbm9zdGljIGlnbm9yZWQgIi1X ZGVwcmVjYXRlZC1kZWNsYXJhdGlvbnMiCi0gICAgZ2RrX3RocmVhZHNfbGVhdmUoKTsKLSAgICBn X21haW5fbG9vcF9ydW4obV9ydW5Mb29wLmdldCgpKTsKLSAgICBnZGtfdGhyZWFkc19lbnRlcigp OwotI3ByYWdtYSBHQ0MgZGlhZ25vc3RpYyBwb3AKLQotICAgIG1fcnVuTG9vcC5jbGVhcigpOwot Ci0gICAgZ19zaWduYWxfaGFuZGxlcl9kaXNjb25uZWN0KG1fcG9wdXAsIHVubWFwSGFuZGxlcik7 Ci0KLSAgICBpZiAoIW1fY2xpZW50KQotICAgICAgICByZXR1cm47Ci0KLSAgICBtX2NsaWVudC0+ dmFsdWVDaGFuZ2VkRm9yUG9wdXBNZW51KHRoaXMsIG1fYWN0aXZlSXRlbSk7CiB9CiAKIHZvaWQg V2ViUG9wdXBNZW51UHJveHlHdGs6OmhpZGVQb3B1cE1lbnUoKQpAQCAtMTc4LDYgKzE1MCwxNyBA QCB2b2lkIFdlYlBvcHVwTWVudVByb3h5R3RrOjpoaWRlUG9wdXBNZW51KCkKICAgICByZXNldFR5 cGVBaGVhZEZpbmRTdGF0ZSgpOwogfQogCit2b2lkIFdlYlBvcHVwTWVudVByb3h5R3RrOjpjYW5j ZWxUcmFja2luZygpCit7CisgICAgaWYgKCFtX3BvcHVwKQorICAgICAgICByZXR1cm47CisKKyAg ICBnX3NpZ25hbF9oYW5kbGVyc19kaXNjb25uZWN0X21hdGNoZWQobV9wb3B1cCwgR19TSUdOQUxf TUFUQ0hfREFUQSwgMCwgMCwgbnVsbHB0ciwgbnVsbHB0ciwgdGhpcyk7CisgICAgaGlkZVBvcHVw TWVudSgpOworICAgIGd0a193aWRnZXRfZGVzdHJveShtX3BvcHVwKTsKKyAgICBtX3BvcHVwID0g bnVsbHB0cjsKK30KKwogYm9vbCBXZWJQb3B1cE1lbnVQcm94eUd0azo6dHlwZUFoZWFkRmluZChH ZGtFdmVudEtleSogZXZlbnQpCiB7CiAgICAgLy8gSWYgd2Ugd2VyZSBnaXZlbiBhIG5vbi1wcmlu dGFibGUgY2hhcmFjdGVyIGp1c3Qgc2tpcCBpdC4KQEAgLTI1NiwyMSArMjM5LDEwIEBAIHZvaWQg V2ViUG9wdXBNZW51UHJveHlHdGs6OnJlc2V0VHlwZUFoZWFkRmluZFN0YXRlKCkKICAgICBtX2N1 cnJlbnRTZWFyY2hTdHJpbmcgPSBlbXB0eVN0cmluZygpOwogfQogCi12b2lkIFdlYlBvcHVwTWVu dVByb3h5R3RrOjpzaHV0ZG93blJ1bkxvb3AoKQotewotICAgIGlmIChnX21haW5fbG9vcF9pc19y dW5uaW5nKG1fcnVuTG9vcC5nZXQoKSkpCi0gICAgICAgIGdfbWFpbl9sb29wX3F1aXQobV9ydW5M b29wLmdldCgpKTsKLX0KLQogdm9pZCBXZWJQb3B1cE1lbnVQcm94eUd0azo6bWVudUl0ZW1BY3Rp dmF0ZWQoR3RrQWN0aW9uKiBhY3Rpb24sIFdlYlBvcHVwTWVudVByb3h5R3RrKiBwb3B1cE1lbnUp CiB7Ci0gICAgcG9wdXBNZW51LT5zZXRBY3RpdmVJdGVtKEdQT0lOVEVSX1RPX0lOVChnX29iamVj dF9nZXRfZGF0YShHX09CSkVDVChhY3Rpb24pLCAicG9wdXAtbWVudS1hY3Rpb24taW5kZXgiKSkp OwotICAgIHBvcHVwTWVudS0+c2h1dGRvd25SdW5Mb29wKCk7Ci19Ci0KLXZvaWQgV2ViUG9wdXBN ZW51UHJveHlHdGs6Om1lbnVVbm1hcHBlZChHdGtXaWRnZXQqLCBXZWJQb3B1cE1lbnVQcm94eUd0 ayogcG9wdXBNZW51KQotewotICAgIHBvcHVwTWVudS0+c2h1dGRvd25SdW5Mb29wKCk7CisgICAg aWYgKHBvcHVwTWVudS0+bV9jbGllbnQpCisgICAgICAgIHBvcHVwTWVudS0+bV9jbGllbnQtPnZh bHVlQ2hhbmdlZEZvclBvcHVwTWVudShwb3B1cE1lbnUsIEdQT0lOVEVSX1RPX0lOVChnX29iamVj dF9nZXRfZGF0YShHX09CSkVDVChhY3Rpb24pLCAicG9wdXAtbWVudS1hY3Rpb24taW5kZXgiKSkp OwogfQogCiB2b2lkIFdlYlBvcHVwTWVudVByb3h5R3RrOjpzZWxlY3RJdGVtQ2FsbGJhY2soR3Rr V2lkZ2V0KiBpdGVtLCBXZWJQb3B1cE1lbnVQcm94eUd0ayogcG9wdXBNZW51KQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2d0ay9XZWJQb3B1cE1lbnVQcm94eUd0ay5oIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2d0ay9XZWJQb3B1cE1lbnVQcm94eUd0ay5oCmluZGV4 IDVmODBjZGYuLjFhYWYzYWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9n dGsvV2ViUG9wdXBNZW51UHJveHlHdGsuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv Z3RrL1dlYlBvcHVwTWVudVByb3h5R3RrLmgKQEAgLTQzLDEzICs0MywxMyBAQCBwdWJsaWM6CiAg ICAgfQogICAgIH5XZWJQb3B1cE1lbnVQcm94eUd0aygpOwogCi0gICAgdmlydHVhbCB2b2lkIHNo b3dQb3B1cE1lbnUoY29uc3QgV2ViQ29yZTo6SW50UmVjdCYsIFdlYkNvcmU6OlRleHREaXJlY3Rp b24sIGRvdWJsZSBwYWdlU2NhbGVGYWN0b3IsIGNvbnN0IFZlY3RvcjxXZWJQb3B1cEl0ZW0+Jiwg Y29uc3QgUGxhdGZvcm1Qb3B1cE1lbnVEYXRhJiwgaW50MzJfdCBzZWxlY3RlZEluZGV4KTsKLSAg ICB2aXJ0dWFsIHZvaWQgaGlkZVBvcHVwTWVudSgpOworICAgIHZpcnR1YWwgdm9pZCBzaG93UG9w dXBNZW51KGNvbnN0IFdlYkNvcmU6OkludFJlY3QmLCBXZWJDb3JlOjpUZXh0RGlyZWN0aW9uLCBk b3VibGUgcGFnZVNjYWxlRmFjdG9yLCBjb25zdCBWZWN0b3I8V2ViUG9wdXBJdGVtPiYsIGNvbnN0 IFBsYXRmb3JtUG9wdXBNZW51RGF0YSYsIGludDMyX3Qgc2VsZWN0ZWRJbmRleCkgb3ZlcnJpZGU7 CisgICAgdmlydHVhbCB2b2lkIGhpZGVQb3B1cE1lbnUoKSBvdmVycmlkZTsKKyAgICB2aXJ0dWFs IHZvaWQgY2FuY2VsVHJhY2tpbmcoKSBvdmVycmlkZTsKIAogcHJpdmF0ZToKICAgICBXZWJQb3B1 cE1lbnVQcm94eUd0ayhHdGtXaWRnZXQqLCBXZWJQb3B1cE1lbnVQcm94eTo6Q2xpZW50Kik7Ci0g ICAgdm9pZCBzaHV0ZG93blJ1bkxvb3AoKTsKLSAgICB2b2lkIHNldEFjdGl2ZUl0ZW0oaW50IGFj dGl2ZUl0ZW0pIHsgbV9hY3RpdmVJdGVtID0gYWN0aXZlSXRlbTsgfQorCiAgICAgdm9pZCBzZXRD dXJyZW50bHlTZWxlY3RlZE1lbnVJdGVtKEd0a1dpZGdldCogaXRlbSkgeyBtX2N1cnJlbnRseVNl bGVjdGVkTWVudUl0ZW0gPSBpdGVtOyB9CiAgICAgR3RrQWN0aW9uKiBjcmVhdGVHdGtBY3Rpb25G b3JNZW51SXRlbShjb25zdCBXZWJQb3B1cEl0ZW0mLCBpbnQgaXRlbUluZGV4KTsKICAgICB2b2lk IHBvcHVsYXRlUG9wdXBNZW51KGNvbnN0IFZlY3RvcjxXZWJQb3B1cEl0ZW0+Jik7CkBAIC01OCwx NCArNTgsMTEgQEAgcHJpdmF0ZToKICAgICB2b2lkIHJlc2V0VHlwZUFoZWFkRmluZFN0YXRlKCk7 CiAKICAgICBzdGF0aWMgdm9pZCBtZW51SXRlbUFjdGl2YXRlZChHdGtBY3Rpb24qLCBXZWJQb3B1 cE1lbnVQcm94eUd0ayopOwotICAgIHN0YXRpYyB2b2lkIG1lbnVVbm1hcHBlZChHdGtXaWRnZXQq LCBXZWJQb3B1cE1lbnVQcm94eUd0ayopOwogICAgIHN0YXRpYyB2b2lkIHNlbGVjdEl0ZW1DYWxs YmFjayhHdGtXaWRnZXQqLCBXZWJQb3B1cE1lbnVQcm94eUd0ayopOwogICAgIHN0YXRpYyBnYm9v bGVhbiBrZXlQcmVzc0V2ZW50Q2FsbGJhY2soR3RrV2lkZ2V0KiwgR2RrRXZlbnRLZXkqLCBXZWJQ b3B1cE1lbnVQcm94eUd0ayopOwogCiAgICAgR3RrV2lkZ2V0KiBtX3dlYlZpZXc7CiAgICAgR3Rr V2lkZ2V0KiBtX3BvcHVwOwotICAgIGludCBtX2FjdGl2ZUl0ZW07Ci0gICAgR1JlZlB0cjxHTWFp bkxvb3A+IG1fcnVuTG9vcDsKIAogICAgIC8vIFR5cGVhaGVhZCBmaW5kLgogICAgIHVuc2lnbmVk IG1fcHJldmlvdXNLZXlFdmVudENoYXJhY3RlcjsK