95675 2012-09-03 01:40:56 -0700 [WK2] Provide asynchronous javascript popup api. 2012-09-21 02:15:16 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified UNCONFIRMED P2 Normal --- 96616 0 bw80.lee bw80.lee lucas.de.marchi oldest_to_newest 710486 0 bw80.lee 2012-09-03 01:40:56 -0700 Efl doesn't support modal popup or nested main loop by the platform side. But with the current webkit implementation, an application that uses webkit should use those, because the apis for creating alert(), confirm(), prompt() popups work as synchronously. So application need to implements some complex way to support modal popup without platform support. Fortunately, WK2 has a sync ipc message with delayed reply. With applying this to the ipc messages for js popup, those apis can work as asynchronouse way on UIProcess side. (WebProcess main run loop will be suspended until the reply for the ipc message is received.) Async api is more flexible than sync api. It has an advantage for the platforms like efl, and it can be used as sync way on some other platforms which can use modal popup or nested main loop. 725283 1 165083 bw80.lee 2012-09-21 02:09:01 -0700 Created attachment 165083 Patch 725284 2 bw80.lee 2012-09-21 02:09:42 -0700 This is a partial patch for providing async api for javascript popup. For the first step, I changed the below sync apis with delayed reply. Messages::WebPageProxy::RunJavaScriptAlert Messages::WebPageProxy::RunJavaScriptConfirm Messages::WebPageProxy::RunJavaScriptPrompt 725288 3 165083 buildbot 2012-09-21 02:15:16 -0700 Comment on attachment 165083 Patch Attachment 165083 did not pass mac-ews (mac): Output: http://queues.webkit.org/results/13958507 165083 2012-09-21 02:09:01 -0700 2012-09-21 02:15:16 -0700 Patch bug-95675-20120921180820.patch text/plain 15317 bw80.lee U3VidmVyc2lvbiBSZXZpc2lvbjogMTI5MTk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYzhjODVlNjJhNWIyNDQz NmViYjFjNWVlZTc3YjU2YTFhZjVmYTU4Zi4uNjY3NTllODY5ZTNiODgxNDQ4ZjI2MjVmZGJiMmRm MjY5ZjZkNGJmOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDUyIEBACisyMDEyLTA5LTIxICBCeXVu Z3dvbyBMZWUgIDxidzgwLmxlZUBzYW1zdW5nLmNvbT4KKworICAgICAgICBbV0syXSBQcm92aWRl IGFzeW5jaHJvbm91cyBqYXZhc2NyaXB0IHBvcHVwIGFwaS4KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk1Njc1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ3VycmVudCBzeW5jaHJvbm91cyBqYXZhc2NyaXB0 IHBvcHVwIG5lZWRzIG1vZGFsIHBvcHVwIHN1cHBvcnQgb3IKKyAgICAgICAgbmVzdGVkIG1haW4g bG9vcCBzdXBwb3J0IGZyb20gcGxhdGZvcm0gc2lkZS4gQnV0IGN1cnJlbnQgZWZsIHBsYXRmb3Jt CisgICAgICAgIGRvZXNuJ3Qgc3VwcG9ydCBuZXN0ZWQgbWFpbiBsb29wIGFuZCByZWNvbW1lbmRz IG5vdCB0byB1c2UgbWFpbiBsb29wCisgICAgICAgIGl0ZXJhdGlvbiBmdW5jdGlvbiBtYW51YWxs eS4KKworICAgICAgICBGb3IgaW1wbGVtZW50aW5nIGphdmFzY3JpcHQgcG9wdXAsIGFwcGxpY2F0 aW9uIHNob3VsZCBmaW5kIGEgd2F5IHRvCisgICAgICAgIG1ha2UgbW9kYWwgcG9wdXAgYW5kIHRo aXMgaXMgcXVpdGUgZGlmZmljdWx0IG9uIGVmbC4KKworICAgICAgICBQcm92aWRpbmcgYXN5bmNo cm9ub3VzIGphdmFzY3JpcHQgcG9wdXAgYXBpIGNhbiByZWR1Y2UgdGhvc2Ugb3ZlcmhlYWQKKyAg ICAgICAgb2YgYW4gYXBwbGljYXRpb24gc2lkZSBvbiB0aGUgcGxhdGZvcm1zIHRoYXQgZG9lc24n dCBoYXZlIGEgbmljZSB3YXkKKyAgICAgICAgZm9yIG1vZGFsIHBvcHVwLgorICAgICAgICBBbmQg YXN5bmNocm9ub3VzIGFwaSB3aWxsIGJlIG1vcmUgZmxleGlibGUgYmVjYXVzZSBpdCBjYW4gYmUg dXNlZCBhcworICAgICAgICBzeW5jaHJvbm91c2x5LgorCisgICAgICAgIFRoaXMgaXMgdGhlIGZp cnN0IHN0ZXAgZm9yIHRoZSBhc3luY2hyb25vdXMgamF2YXNjcmlwdCBwb3B1cCBhcGkuCisgICAg ICAgIEkgQ2hhbmdlZCB0aGUgamF2YXNjcmlwdCBwb3B1cCBpcGMgbWVzc2FnZSBhcyBzeW5jaHJv bm91cyBpcGMgd2l0aAorICAgICAgICBkZWxheWVkIHJlcGx5LiBXaXRoIGRlbGF5ZWQgcmVwbHks IFVJUHJvY2VzcyBjYW5ub3QgYmUgc3VzcGVkZWQgZHVyaW5nCisgICAgICAgIHRoZSBqYXZhc2Ny aXB0IHBvcHVwIGlzIGRpc3BsYXllZC4KKworICAgICAgICAqIFBsYXRmb3JtL0NvcmVJUEMvSGFu ZGxlTWVzc2FnZS5oOgorICAgICAgICAoQ29yZUlQQyk6CisgICAgICAgIChDb3JlSVBDOjpjYWxs TWVtYmVyRnVuY3Rpb24pOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0Mi9tZXNzYWdlcy5weToK KyAgICAgICAgKGdlbmVyYXRlX21lc3NhZ2VfaGFuZGxlcik6CisgICAgICAgICogVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6cnVuSmF2 YVNjcmlwdEFsZXJ0KToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpyZXBseUphdmFT Y3JpcHRBbGVydCk6CisgICAgICAgIChXZWJLaXQpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdl UHJveHk6OnJ1bkphdmFTY3JpcHRDb25maXJtKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVBy b3h5OjpyZXBseUphdmFTY3JpcHRDb25maXJtKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVBy b3h5OjpydW5KYXZhU2NyaXB0UHJvbXB0KToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5 OjpyZXBseUphdmFTY3JpcHRQcm9tcHQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJv eHkuaDoKKyAgICAgICAgKFdlYlBhZ2VQcm94eSk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBh Z2VQcm94eS5tZXNzYWdlcy5pbjoKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViVUlDbGllbnQuY3Bw OgorICAgICAgICAoV2ViS2l0OjpXZWJVSUNsaWVudDo6cnVuSmF2YVNjcmlwdEFsZXJ0KToKKyAg ICAgICAgKFdlYktpdDo6V2ViVUlDbGllbnQ6OnJ1bkphdmFTY3JpcHRDb25maXJtKToKKyAgICAg ICAgKFdlYktpdDo6V2ViVUlDbGllbnQ6OnJ1bkphdmFTY3JpcHRQcm9tcHQpOgorICAgICAgICAq IFVJUHJvY2Vzcy9XZWJVSUNsaWVudC5oOgorICAgICAgICAoV2ViVUlDbGllbnQpOgorCiAyMDEy LTA5LTIwICBFdW5taSBMZWUgIDxldW5taTE1LmxlZUBzYW1zdW5nLmNvbT4KIAogICAgICAgICBb RUZMXVtXSzJdIEFkZCBBUEkgdG8gZmVlZCB0b3VjaCBldmVudC4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1BsYXRmb3JtL0NvcmVJUEMvSGFuZGxlTWVzc2FnZS5oIGIvU291cmNlL1dlYktp dDIvUGxhdGZvcm0vQ29yZUlQQy9IYW5kbGVNZXNzYWdlLmgKaW5kZXggYjg1YzliNzBkMTAzZTkx ODdhNDRmYWZlMjZkNzJjM2IxMWQyMWIwYy4uYjM3MTBiMzMwYzQxNDUzYjY4MWUzNjBmZTNiYmY2 MGJmMTg2NTc0NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vQ29yZUlQQy9I YW5kbGVNZXNzYWdlLmgKKysrIGIvU291cmNlL1dlYktpdDIvUGxhdGZvcm0vQ29yZUlQQy9IYW5k bGVNZXNzYWdlLmgKQEAgLTIwMiw2ICsyMDIsMTggQEAgdm9pZCBjYWxsTWVtYmVyRnVuY3Rpb24o Y29uc3QgQXJndW1lbnRzMTxQMT4mIGFyZ3MsIFBhc3NSZWZQdHI8Uj4gZGVsYXllZFJlcGx5LAog ICAgIChvYmplY3QtPipmdW5jdGlvbikoYXJncy5hcmd1bWVudDEsIGRlbGF5ZWRSZXBseSk7CiB9 CiAKK3RlbXBsYXRlPHR5cGVuYW1lIEMsIHR5cGVuYW1lIE1GLCB0eXBlbmFtZSBQMSwgdHlwZW5h bWUgUDIsIHR5cGVuYW1lIFI+Cit2b2lkIGNhbGxNZW1iZXJGdW5jdGlvbihjb25zdCBBcmd1bWVu dHMyPFAxLCBQMj4mIGFyZ3MsIFBhc3NSZWZQdHI8Uj4gZGVsYXllZFJlcGx5LCBDKiBvYmplY3Qs IE1GIGZ1bmN0aW9uKQoreworICAgIChvYmplY3QtPipmdW5jdGlvbikoYXJncy5hcmd1bWVudDEs IGFyZ3MuYXJndW1lbnQyLCBkZWxheWVkUmVwbHkpOworfQorCit0ZW1wbGF0ZTx0eXBlbmFtZSBD LCB0eXBlbmFtZSBNRiwgdHlwZW5hbWUgUDEsIHR5cGVuYW1lIFAyLCB0eXBlbmFtZSBQMywgdHlw ZW5hbWUgUj4KK3ZvaWQgY2FsbE1lbWJlckZ1bmN0aW9uKGNvbnN0IEFyZ3VtZW50czM8UDEsIFAy LCBQMz4mIGFyZ3MsIFBhc3NSZWZQdHI8Uj4gZGVsYXllZFJlcGx5LCBDKiBvYmplY3QsIE1GIGZ1 bmN0aW9uKQoreworICAgIChvYmplY3QtPipmdW5jdGlvbikoYXJncy5hcmd1bWVudDEsIGFyZ3Mu YXJndW1lbnQyLCBhcmdzLmFyZ3VtZW50MywgZGVsYXllZFJlcGx5KTsKK30KKwogLy8gRGlzcGF0 Y2ggZnVuY3Rpb25zIHdpdGggY29ubmVjdGlvbiBwYXJhbWV0ZXIuCiB0ZW1wbGF0ZTx0eXBlbmFt ZSBDLCB0eXBlbmFtZSBNRiwgdHlwZW5hbWUgUDE+CiB2b2lkIGNhbGxNZW1iZXJGdW5jdGlvbihD b25uZWN0aW9uKiBjb25uZWN0aW9uLCBjb25zdCBBcmd1bWVudHMxPFAxPiYgYXJncywgQyogb2Jq ZWN0LCBNRiBmdW5jdGlvbikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NjcmlwdHMvd2Vi a2l0Mi9tZXNzYWdlcy5weSBiL1NvdXJjZS9XZWJLaXQyL1NjcmlwdHMvd2Via2l0Mi9tZXNzYWdl cy5weQppbmRleCBiZDlkYzlhMjg1YmViNmMxN2U4MzJlM2E3ZDlmMGVjYzNmOWNkMGNkLi5iYzli ZDUwMjU5YTBmYWQ4ZTgyMTRlNjY0YzMzZThkODM0MjY0Yzg5IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9TY3JpcHRzL3dlYmtpdDIvbWVzc2FnZXMucHkKKysrIGIvU291cmNlL1dlYktpdDIv U2NyaXB0cy93ZWJraXQyL21lc3NhZ2VzLnB5CkBAIC01MDgsOSArNTA4LDkgQEAgZGVmIGdlbmVy YXRlX21lc3NhZ2VfaGFuZGxlcihmaWxlKToKICAgICAgICAgICAgIHJlc3VsdC5hcHBlbmQoJ3tc bicpCiAgICAgICAgICAgICByZXN1bHQuYXBwZW5kKCcgICAgQVNTRVJUKG1fYXJndW1lbnRzKTtc bicpCiAgICAgICAgICAgICByZXN1bHQgKz0gWycgICAgbV9hcmd1bWVudHMtPmVuY29kZSglcyk7 XG4nICUgeC5uYW1lIGZvciB4IGluIG1lc3NhZ2UucmVwbHlfcGFyYW1ldGVyc10KLSAgICAgICAg ICAgIHJlc3VsdC5hcHBlbmQoJyAgICBib29sIHJlc3VsdCA9IG1fY29ubmVjdGlvbi0+c2VuZFN5 bmNSZXBseShtX2FyZ3VtZW50cy5yZWxlYXNlKCkpO1xuJykKKyAgICAgICAgICAgIHJlc3VsdC5h cHBlbmQoJyAgICBib29sIHNlbmRTeW5jUmVwbHlSZXN1bHQgPSBtX2Nvbm5lY3Rpb24tPnNlbmRT eW5jUmVwbHkobV9hcmd1bWVudHMucmVsZWFzZSgpKTtcbicpCiAgICAgICAgICAgICByZXN1bHQu YXBwZW5kKCcgICAgbV9jb25uZWN0aW9uID0gbnVsbHB0cjtcbicpCi0gICAgICAgICAgICByZXN1 bHQuYXBwZW5kKCcgICAgcmV0dXJuIHJlc3VsdDtcbicpCisgICAgICAgICAgICByZXN1bHQuYXBw ZW5kKCcgICAgcmV0dXJuIHNlbmRTeW5jUmVwbHlSZXN1bHQ7XG4nKQogICAgICAgICAgICAgcmVz dWx0LmFwcGVuZCgnfVxuJykKICAgICAgICAgICAgIHJlc3VsdC5hcHBlbmQoJ1xuJykKIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAppbmRleCA5YmJhYmUxMmI2YzAz YmNmYzQ1YzQ4ODg3ZjkzODE1NGM1OWIwODk0Li5hY2M4YjVmYWJiZjJkY2Y3NThmZTk3NjQ4YjAy MDIyMDYzNWQ3MzU5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFn ZVByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNw cApAQCAtMjQ0NCw3ICsyNDQ0LDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmNsb3NlUGFnZShib29s IHN0b3BSZXNwb25zaXZlbmVzc1RpbWVyKQogICAgIG1fdWlDbGllbnQuY2xvc2UodGhpcyk7CiB9 CiAKLXZvaWQgV2ViUGFnZVByb3h5OjpydW5KYXZhU2NyaXB0QWxlcnQodWludDY0X3QgZnJhbWVJ RCwgY29uc3QgU3RyaW5nJiBtZXNzYWdlKQordm9pZCBXZWJQYWdlUHJveHk6OnJ1bkphdmFTY3Jp cHRBbGVydCh1aW50NjRfdCBmcmFtZUlELCBjb25zdCBTdHJpbmcmIG1lc3NhZ2UsIFBhc3NSZWZQ dHI8TWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6UnVuSmF2YVNjcmlwdEFsZXJ0OjpEZWxheWVkUmVw bHk+IHJlcGx5KQogewogICAgIFdlYkZyYW1lUHJveHkqIGZyYW1lID0gbV9wcm9jZXNzLT53ZWJG cmFtZShmcmFtZUlEKTsKICAgICBNRVNTQUdFX0NIRUNLKGZyYW1lKTsKQEAgLTI0NTIsMTAgKzI0 NTIsMjEgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnJ1bkphdmFTY3JpcHRBbGVydCh1aW50NjRfdCBm cmFtZUlELCBjb25zdCBTdHJpbmcmIG1lc3NhZ2UpCiAgICAgLy8gU2luY2UgcnVuSmF2YVNjcmlw dEFsZXJ0KCkgY2FuIHNwaW4gYSBuZXN0ZWQgcnVuIGxvb3Agd2UgbmVlZCB0byB0dXJuIG9mZiB0 aGUgcmVzcG9uc2l2ZW5lc3MgdGltZXIuCiAgICAgbV9wcm9jZXNzLT5yZXNwb25zaXZlbmVzc1Rp bWVyKCktPnN0b3AoKTsKIAotICAgIG1fdWlDbGllbnQucnVuSmF2YVNjcmlwdEFsZXJ0KHRoaXMs IG1lc3NhZ2UsIGZyYW1lKTsKKyAgICBtX2FsZXJ0UmVwbHkgPSByZXBseTsKKyAgICBpZiAoIW1f dWlDbGllbnQucnVuSmF2YVNjcmlwdEFsZXJ0KHRoaXMsIG1lc3NhZ2UsIGZyYW1lKSkKKyAgICAg ICAgcmVwbHlKYXZhU2NyaXB0QWxlcnQoKTsKIH0KIAotdm9pZCBXZWJQYWdlUHJveHk6OnJ1bkph dmFTY3JpcHRDb25maXJtKHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IFN0cmluZyYgbWVzc2FnZSwg Ym9vbCYgcmVzdWx0KQordm9pZCBXZWJQYWdlUHJveHk6OnJlcGx5SmF2YVNjcmlwdEFsZXJ0KCkK K3sKKyAgICBpZiAoIW1fYWxlcnRSZXBseSkKKyAgICAgICAgcmV0dXJuOworCisgICAgbV9hbGVy dFJlcGx5LT5zZW5kKCk7CisgICAgbV9hbGVydFJlcGx5LmNsZWFyKCk7Cit9CisKK3ZvaWQgV2Vi UGFnZVByb3h5OjpydW5KYXZhU2NyaXB0Q29uZmlybSh1aW50NjRfdCBmcmFtZUlELCBjb25zdCBT dHJpbmcmIG1lc3NhZ2UsIFBhc3NSZWZQdHI8TWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6UnVuSmF2 YVNjcmlwdENvbmZpcm06OkRlbGF5ZWRSZXBseT4gcmVwbHkpCiB7CiAgICAgV2ViRnJhbWVQcm94 eSogZnJhbWUgPSBtX3Byb2Nlc3MtPndlYkZyYW1lKGZyYW1lSUQpOwogICAgIE1FU1NBR0VfQ0hF Q0soZnJhbWUpOwpAQCAtMjQ2MywxMCArMjQ3NCwyMSBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6cnVu SmF2YVNjcmlwdENvbmZpcm0odWludDY0X3QgZnJhbWVJRCwgY29uc3QgU3RyaW5nJiBtZXNzYWdl LAogICAgIC8vIFNpbmNlIHJ1bkphdmFTY3JpcHRDb25maXJtKCkgY2FuIHNwaW4gYSBuZXN0ZWQg cnVuIGxvb3Agd2UgbmVlZCB0byB0dXJuIG9mZiB0aGUgcmVzcG9uc2l2ZW5lc3MgdGltZXIuCiAg ICAgbV9wcm9jZXNzLT5yZXNwb25zaXZlbmVzc1RpbWVyKCktPnN0b3AoKTsKIAotICAgIHJlc3Vs dCA9IG1fdWlDbGllbnQucnVuSmF2YVNjcmlwdENvbmZpcm0odGhpcywgbWVzc2FnZSwgZnJhbWUp OworICAgIG1fY29uZmlybVJlcGx5ID0gcmVwbHk7CisgICAgaWYgKCFtX3VpQ2xpZW50LnJ1bkph dmFTY3JpcHRDb25maXJtKHRoaXMsIG1lc3NhZ2UsIGZyYW1lKSkKKyAgICAgICAgcmVwbHlKYXZh U2NyaXB0Q29uZmlybShmYWxzZSk7CiB9CiAKLXZvaWQgV2ViUGFnZVByb3h5OjpydW5KYXZhU2Ny aXB0UHJvbXB0KHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IFN0cmluZyYgbWVzc2FnZSwgY29uc3Qg U3RyaW5nJiBkZWZhdWx0VmFsdWUsIFN0cmluZyYgcmVzdWx0KQordm9pZCBXZWJQYWdlUHJveHk6 OnJlcGx5SmF2YVNjcmlwdENvbmZpcm0oYm9vbCByZXN1bHQpCit7CisgICAgaWYgKCFtX2NvbmZp cm1SZXBseSkKKyAgICAgICAgcmV0dXJuOworCisgICAgbV9jb25maXJtUmVwbHktPnNlbmQocmVz dWx0KTsKKyAgICBtX2NvbmZpcm1SZXBseS5jbGVhcigpOworfQorCit2b2lkIFdlYlBhZ2VQcm94 eTo6cnVuSmF2YVNjcmlwdFByb21wdCh1aW50NjRfdCBmcmFtZUlELCBjb25zdCBTdHJpbmcmIG1l c3NhZ2UsIGNvbnN0IFN0cmluZyYgZGVmYXVsdFZhbHVlLCBQYXNzUmVmUHRyPE1lc3NhZ2VzOjpX ZWJQYWdlUHJveHk6OlJ1bkphdmFTY3JpcHRQcm9tcHQ6OkRlbGF5ZWRSZXBseT4gcmVwbHkpCiB7 CiAgICAgV2ViRnJhbWVQcm94eSogZnJhbWUgPSBtX3Byb2Nlc3MtPndlYkZyYW1lKGZyYW1lSUQp OwogICAgIE1FU1NBR0VfQ0hFQ0soZnJhbWUpOwpAQCAtMjQ3NCw3ICsyNDk2LDE4IEBAIHZvaWQg V2ViUGFnZVByb3h5OjpydW5KYXZhU2NyaXB0UHJvbXB0KHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0 IFN0cmluZyYgbWVzc2FnZSwKICAgICAvLyBTaW5jZSBydW5KYXZhU2NyaXB0UHJvbXB0KCkgY2Fu IHNwaW4gYSBuZXN0ZWQgcnVuIGxvb3Agd2UgbmVlZCB0byB0dXJuIG9mZiB0aGUgcmVzcG9uc2l2 ZW5lc3MgdGltZXIuCiAgICAgbV9wcm9jZXNzLT5yZXNwb25zaXZlbmVzc1RpbWVyKCktPnN0b3Ao KTsKIAotICAgIHJlc3VsdCA9IG1fdWlDbGllbnQucnVuSmF2YVNjcmlwdFByb21wdCh0aGlzLCBt ZXNzYWdlLCBkZWZhdWx0VmFsdWUsIGZyYW1lKTsKKyAgICBtX3Byb21wdFJlcGx5ID0gcmVwbHk7 CisgICAgaWYgKCFtX3VpQ2xpZW50LnJ1bkphdmFTY3JpcHRQcm9tcHQodGhpcywgbWVzc2FnZSwg ZGVmYXVsdFZhbHVlLCBmcmFtZSkpCisgICAgICAgIHJlcGx5SmF2YVNjcmlwdFByb21wdChTdHJp bmcoKSk7Cit9CisKK3ZvaWQgV2ViUGFnZVByb3h5OjpyZXBseUphdmFTY3JpcHRQcm9tcHQoY29u c3QgU3RyaW5nJiByZXN1bHQpCit7CisgICAgaWYgKCFtX3Byb21wdFJlcGx5KQorICAgICAgICBy ZXR1cm47CisKKyAgICBtX3Byb21wdFJlcGx5LT5zZW5kKHJlc3VsdCk7CisgICAgbV9wcm9tcHRS ZXBseS5jbGVhcigpOwogfQogCiB2b2lkIFdlYlBhZ2VQcm94eTo6c2hvdWxkSW50ZXJydXB0SmF2 YVNjcmlwdChib29sJiByZXN1bHQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2ViUGFnZVByb3h5LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5 LmgKaW5kZXggMjhjNWRhOTBhZTEwOTQyNmZmN2M5ZTZlYTM0M2RmMGI2MjlkNzI1Yi4uNmFmNjU2 NWQyMTc2OThkNWI3YWEyNzY0N2NmOTRmZTg4MWJiNjQxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9XZWJQYWdlUHJveHkuaApAQCAtNTUsNiArNTUsNyBAQAogI2luY2x1ZGUgIldlYkhpdFRl c3RSZXN1bHQuaCIKICNpbmNsdWRlICJXZWJMb2FkZXJDbGllbnQuaCIKICNpbmNsdWRlICJXZWJQ YWdlQ29udGV4dE1lbnVDbGllbnQuaCIKKyNpbmNsdWRlICJXZWJQYWdlUHJveHlNZXNzYWdlcy5o IgogI2luY2x1ZGUgIldlYlBvbGljeUNsaWVudC5oIgogI2luY2x1ZGUgIldlYlBvcHVwTWVudVBy b3h5LmgiCiAjaW5jbHVkZSAiV2ViUmVzb3VyY2VMb2FkQ2xpZW50LmgiCkBAIC03MjgsNiArNzI5 LDEwIEBAIHB1YmxpYzoKICAgICB2b2lkIGVuZENvbG9yQ2hvb3NlcigpOwogI2VuZGlmCiAKKyAg ICB2b2lkIHJlcGx5SmF2YVNjcmlwdEFsZXJ0KCk7CisgICAgdm9pZCByZXBseUphdmFTY3JpcHRD b25maXJtKGJvb2wpOworICAgIHZvaWQgcmVwbHlKYXZhU2NyaXB0UHJvbXB0KGNvbnN0IFN0cmlu ZyYpOworCiBwcml2YXRlOgogICAgIFdlYlBhZ2VQcm94eShQYWdlQ2xpZW50KiwgUGFzc1JlZlB0 cjxXZWJQcm9jZXNzUHJveHk+LCBXZWJQYWdlR3JvdXAqLCB1aW50NjRfdCBwYWdlSUQpOwogCkBA IC04MDAsOSArODA1LDkgQEAgcHJpdmF0ZToKICAgICB2b2lkIGNyZWF0ZU5ld1BhZ2UoY29uc3Qg V2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiwgY29uc3QgV2ViQ29yZTo6V2luZG93RmVhdHVyZXMm LCB1aW50MzJfdCBtb2RpZmllcnMsIGludDMyX3QgbW91c2VCdXR0b24sIHVpbnQ2NF90JiBuZXdQ YWdlSUQsIFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMmKTsKICAgICB2b2lkIHNob3dQYWdlKCk7 CiAgICAgdm9pZCBjbG9zZVBhZ2UoYm9vbCBzdG9wUmVzcG9uc2l2ZW5lc3NUaW1lcik7Ci0gICAg dm9pZCBydW5KYXZhU2NyaXB0QWxlcnQodWludDY0X3QgZnJhbWVJRCwgY29uc3QgU3RyaW5nJik7 Ci0gICAgdm9pZCBydW5KYXZhU2NyaXB0Q29uZmlybSh1aW50NjRfdCBmcmFtZUlELCBjb25zdCBT dHJpbmcmLCBib29sJiByZXN1bHQpOwotICAgIHZvaWQgcnVuSmF2YVNjcmlwdFByb21wdCh1aW50 NjRfdCBmcmFtZUlELCBjb25zdCBTdHJpbmcmLCBjb25zdCBTdHJpbmcmLCBTdHJpbmcmIHJlc3Vs dCk7CisgICAgdm9pZCBydW5KYXZhU2NyaXB0QWxlcnQodWludDY0X3QgZnJhbWVJRCwgY29uc3Qg U3RyaW5nJiwgUGFzc1JlZlB0cjxNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpSdW5KYXZhU2NyaXB0 QWxlcnQ6OkRlbGF5ZWRSZXBseT4pOworICAgIHZvaWQgcnVuSmF2YVNjcmlwdENvbmZpcm0odWlu dDY0X3QgZnJhbWVJRCwgY29uc3QgU3RyaW5nJiwgUGFzc1JlZlB0cjxNZXNzYWdlczo6V2ViUGFn ZVByb3h5OjpSdW5KYXZhU2NyaXB0Q29uZmlybTo6RGVsYXllZFJlcGx5Pik7CisgICAgdm9pZCBy dW5KYXZhU2NyaXB0UHJvbXB0KHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IFN0cmluZyYsIGNvbnN0 IFN0cmluZyYsIFBhc3NSZWZQdHI8TWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6UnVuSmF2YVNjcmlw dFByb21wdDo6RGVsYXllZFJlcGx5Pik7CiAgICAgdm9pZCBzaG91bGRJbnRlcnJ1cHRKYXZhU2Ny aXB0KGJvb2wmIHJlc3VsdCk7CiAgICAgdm9pZCBzZXRTdGF0dXNUZXh0KGNvbnN0IFN0cmluZyYp OwogICAgIHZvaWQgbW91c2VEaWRNb3ZlT3ZlckVsZW1lbnQoY29uc3QgV2ViSGl0VGVzdFJlc3Vs dDo6RGF0YSYgaGl0VGVzdFJlc3VsdERhdGEsIHVpbnQzMl90IG1vZGlmaWVycywgQ29yZUlQQzo6 QXJndW1lbnREZWNvZGVyKik7CkBAIC0xMjA3LDYgKzEyMTIsMTAgQEAgcHJpdmF0ZToKICNpZiBF TkFCTEUoUEFHRV9WSVNJQklMSVRZX0FQSSkKICAgICBXZWJDb3JlOjpQYWdlVmlzaWJpbGl0eVN0 YXRlIG1fdmlzaWJpbGl0eVN0YXRlOwogI2VuZGlmCisKKyAgICBSZWZQdHI8TWVzc2FnZXM6Oldl YlBhZ2VQcm94eTo6UnVuSmF2YVNjcmlwdEFsZXJ0OjpEZWxheWVkUmVwbHk+IG1fYWxlcnRSZXBs eTsKKyAgICBSZWZQdHI8TWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6UnVuSmF2YVNjcmlwdENvbmZp cm06OkRlbGF5ZWRSZXBseT4gbV9jb25maXJtUmVwbHk7CisgICAgUmVmUHRyPE1lc3NhZ2VzOjpX ZWJQYWdlUHJveHk6OlJ1bkphdmFTY3JpcHRQcm9tcHQ6OkRlbGF5ZWRSZXBseT4gbV9wcm9tcHRS ZXBseTsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbiBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkubWVzc2FnZXMuaW4KaW5kZXggYTRhM2M1N2JmMmM5OTIy YTFmZTRlOWY5YjNmNDEzZDNlNzU2NzQzZC4uZjFlYTQ4YzlmMzA5NTRmNjY5MGUwMzMzNTYxYWRi YTIzMWFiNGFhYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQ cm94eS5tZXNzYWdlcy5pbgorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVBy b3h5Lm1lc3NhZ2VzLmluCkBAIC0yNSw5ICsyNSw5IEBAIG1lc3NhZ2VzIC0+IFdlYlBhZ2VQcm94 eSB7CiAgICAgQ3JlYXRlTmV3UGFnZShXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QgcmVxdWVzdCwg V2ViQ29yZTo6V2luZG93RmVhdHVyZXMgd2luZG93RmVhdHVyZXMsIHVpbnQzMl90IG1vZGlmaWVy cywgaW50MzJfdCBtb3VzZUJ1dHRvbikgLT4gKHVpbnQ2NF90IG5ld1BhZ2VJRCwgV2ViS2l0OjpX ZWJQYWdlQ3JlYXRpb25QYXJhbWV0ZXJzIG5ld1BhZ2VQYXJhbWV0ZXJzKQogICAgIFNob3dQYWdl KCkKICAgICBDbG9zZVBhZ2UoYm9vbCBzdG9wUmVzcG9uc2l2ZW5lc3NUaW1lcikKLSAgICBSdW5K YXZhU2NyaXB0QWxlcnQodWludDY0X3QgZnJhbWVJRCwgV1RGOjpTdHJpbmcgbWVzc2FnZSkgLT4g KCkKLSAgICBSdW5KYXZhU2NyaXB0Q29uZmlybSh1aW50NjRfdCBmcmFtZUlELCBXVEY6OlN0cmlu ZyBtZXNzYWdlKSAtPiAoYm9vbCByZXN1bHQpCi0gICAgUnVuSmF2YVNjcmlwdFByb21wdCh1aW50 NjRfdCBmcmFtZUlELCBXVEY6OlN0cmluZyBtZXNzYWdlLCBXVEY6OlN0cmluZyBkZWZhdWx0VmFs dWUpIC0+IChXVEY6OlN0cmluZyByZXN1bHQpCisgICAgUnVuSmF2YVNjcmlwdEFsZXJ0KHVpbnQ2 NF90IGZyYW1lSUQsIFdURjo6U3RyaW5nIG1lc3NhZ2UpIC0+ICgpIERlbGF5ZWQKKyAgICBSdW5K YXZhU2NyaXB0Q29uZmlybSh1aW50NjRfdCBmcmFtZUlELCBXVEY6OlN0cmluZyBtZXNzYWdlKSAt PiAoYm9vbCByZXN1bHQpIERlbGF5ZWQKKyAgICBSdW5KYXZhU2NyaXB0UHJvbXB0KHVpbnQ2NF90 IGZyYW1lSUQsIFdURjo6U3RyaW5nIG1lc3NhZ2UsIFdURjo6U3RyaW5nIGRlZmF1bHRWYWx1ZSkg LT4gKFdURjo6U3RyaW5nIHJlc3VsdCkgRGVsYXllZAogICAgIFNob3VsZEludGVycnVwdEphdmFT Y3JpcHQoKSAtPiAoYm9vbCBzaG91bGRJbnRlcnVwdCkKICAgICBNb3VzZURpZE1vdmVPdmVyRWxl bWVudChXZWJLaXQ6OldlYkhpdFRlc3RSZXN1bHQ6OkRhdGEgaGl0VGVzdFJlc3VsdERhdGEsIHVp bnQzMl90IG1vZGlmaWVycywgV2ViS2l0OjpJbmplY3RlZEJ1bmRsZVVzZXJNZXNzYWdlRW5jb2Rl ciB1c2VyRGF0YSk7CiAgICAgVW5hdmFpbGFibGVQbHVnaW5CdXR0b25DbGlja2VkKHVpbnQzMl90 IHBsdWdpblVuYXZhaWxhYmlsaXR5UmVhc29uLCBXVEY6OlN0cmluZyBtaW1lVHlwZSwgV1RGOjpT dHJpbmcgdXJsLCBXVEY6OlN0cmluZyBwbHVnaW5zUGFnZVVSTCkKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJVSUNsaWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvV2ViVUlDbGllbnQuY3BwCmluZGV4IGY4OGMwMGEyNDI1MWFkNmRkZmE0ZmJlZjhjOWVm YjVkMGM4MjNjYTYuLjNjN2QxYzMyYjQ4NDZkYzViZTAxZjViNWI4ZGY3ODk0OThkOWQ1YTYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJVSUNsaWVudC5jcHAKKysrIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlVJQ2xpZW50LmNwcApAQCAtMTE5LDEyICsxMTks MTQgQEAgdm9pZCBXZWJVSUNsaWVudDo6dW5mb2N1cyhXZWJQYWdlUHJveHkqIHBhZ2UpCiAgICAg bV9jbGllbnQudW5mb2N1cyh0b0FQSShwYWdlKSwgbV9jbGllbnQuY2xpZW50SW5mbyk7CiB9CiAK LXZvaWQgV2ViVUlDbGllbnQ6OnJ1bkphdmFTY3JpcHRBbGVydChXZWJQYWdlUHJveHkqIHBhZ2Us IGNvbnN0IFN0cmluZyYgbWVzc2FnZSwgV2ViRnJhbWVQcm94eSogZnJhbWUpCitib29sIFdlYlVJ Q2xpZW50OjpydW5KYXZhU2NyaXB0QWxlcnQoV2ViUGFnZVByb3h5KiBwYWdlLCBjb25zdCBTdHJp bmcmIG1lc3NhZ2UsIFdlYkZyYW1lUHJveHkqIGZyYW1lKQogewogICAgIGlmICghbV9jbGllbnQu cnVuSmF2YVNjcmlwdEFsZXJ0KQotICAgICAgICByZXR1cm47CisgICAgICAgIHJldHVybiBmYWxz ZTsKICAgICAKICAgICBtX2NsaWVudC5ydW5KYXZhU2NyaXB0QWxlcnQodG9BUEkocGFnZSksIHRv QVBJKG1lc3NhZ2UuaW1wbCgpKSwgdG9BUEkoZnJhbWUpLCBtX2NsaWVudC5jbGllbnRJbmZvKTsK KyAgICBwYWdlLT5yZXBseUphdmFTY3JpcHRBbGVydCgpOworICAgIHJldHVybiB0cnVlOwogfQog CiBib29sIFdlYlVJQ2xpZW50OjpydW5KYXZhU2NyaXB0Q29uZmlybShXZWJQYWdlUHJveHkqIHBh Z2UsIGNvbnN0IFN0cmluZyYgbWVzc2FnZSwgV2ViRnJhbWVQcm94eSogZnJhbWUpCkBAIC0xMzIs MjIgKzEzNCwyNCBAQCBib29sIFdlYlVJQ2xpZW50OjpydW5KYXZhU2NyaXB0Q29uZmlybShXZWJQ YWdlUHJveHkqIHBhZ2UsIGNvbnN0IFN0cmluZyYgbWVzc2FnZQogICAgIGlmICghbV9jbGllbnQu cnVuSmF2YVNjcmlwdENvbmZpcm0pCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIHJldHVy biBtX2NsaWVudC5ydW5KYXZhU2NyaXB0Q29uZmlybSh0b0FQSShwYWdlKSwgdG9BUEkobWVzc2Fn ZS5pbXBsKCkpLCB0b0FQSShmcmFtZSksIG1fY2xpZW50LmNsaWVudEluZm8pOworICAgIHBhZ2Ut PnJlcGx5SmF2YVNjcmlwdENvbmZpcm0obV9jbGllbnQucnVuSmF2YVNjcmlwdENvbmZpcm0odG9B UEkocGFnZSksIHRvQVBJKG1lc3NhZ2UuaW1wbCgpKSwgdG9BUEkoZnJhbWUpLCBtX2NsaWVudC5j bGllbnRJbmZvKSk7CisgICAgcmV0dXJuIHRydWU7CiB9CiAKLVN0cmluZyBXZWJVSUNsaWVudDo6 cnVuSmF2YVNjcmlwdFByb21wdChXZWJQYWdlUHJveHkqIHBhZ2UsIGNvbnN0IFN0cmluZyYgbWVz c2FnZSwgY29uc3QgU3RyaW5nJiBkZWZhdWx0VmFsdWUsIFdlYkZyYW1lUHJveHkqIGZyYW1lKQor Ym9vbCBXZWJVSUNsaWVudDo6cnVuSmF2YVNjcmlwdFByb21wdChXZWJQYWdlUHJveHkqIHBhZ2Us IGNvbnN0IFN0cmluZyYgbWVzc2FnZSwgY29uc3QgU3RyaW5nJiBkZWZhdWx0VmFsdWUsIFdlYkZy YW1lUHJveHkqIGZyYW1lKQogewogICAgIGlmICghbV9jbGllbnQucnVuSmF2YVNjcmlwdFByb21w dCkKLSAgICAgICAgcmV0dXJuIFN0cmluZygpOworICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAg ICBXZWJTdHJpbmcqIHN0cmluZyA9IHRvSW1wbChtX2NsaWVudC5ydW5KYXZhU2NyaXB0UHJvbXB0 KHRvQVBJKHBhZ2UpLCB0b0FQSShtZXNzYWdlLmltcGwoKSksIHRvQVBJKGRlZmF1bHRWYWx1ZS5p bXBsKCkpLCB0b0FQSShmcmFtZSksIG1fY2xpZW50LmNsaWVudEluZm8pKTsKICAgICBpZiAoIXN0 cmluZykKLSAgICAgICAgcmV0dXJuIFN0cmluZygpOworICAgICAgICByZXR1cm4gZmFsc2U7CiAK ICAgICBTdHJpbmcgcmVzdWx0ID0gc3RyaW5nLT5zdHJpbmcoKTsKICAgICBzdHJpbmctPmRlcmVm KCk7CiAKLSAgICByZXR1cm4gcmVzdWx0OworICAgIHBhZ2UtPnJlcGx5SmF2YVNjcmlwdFByb21w dChyZXN1bHQpOworICAgIHJldHVybiB0cnVlOwogfQogCiB2b2lkIFdlYlVJQ2xpZW50OjpzZXRT dGF0dXNUZXh0KFdlYlBhZ2VQcm94eSogcGFnZSwgY29uc3QgU3RyaW5nJiB0ZXh0KQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlVJQ2xpZW50LmggYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvV2ViVUlDbGllbnQuaAppbmRleCA5YjUyYmZkMGVmMTQ2NTJkNDBhZDZl NjFlYjlmNDVmOTNiMjNkNjM2Li43YzhmYmJmNmY0YjQ2NTA3Nzg1NWNiMjZjYjNmOGViYjAxMDQ0 Zjk4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViVUlDbGllbnQuaAor KysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViVUlDbGllbnQuaApAQCAtNjUsOSArNjUs OSBAQCBwdWJsaWM6CiAgICAgdm9pZCBmb2N1cyhXZWJQYWdlUHJveHkqKTsKICAgICB2b2lkIHVu Zm9jdXMoV2ViUGFnZVByb3h5Kik7CiAKLSAgICB2b2lkIHJ1bkphdmFTY3JpcHRBbGVydChXZWJQ YWdlUHJveHkqLCBjb25zdCBTdHJpbmcmLCBXZWJGcmFtZVByb3h5Kik7CisgICAgYm9vbCBydW5K YXZhU2NyaXB0QWxlcnQoV2ViUGFnZVByb3h5KiwgY29uc3QgU3RyaW5nJiwgV2ViRnJhbWVQcm94 eSopOwogICAgIGJvb2wgcnVuSmF2YVNjcmlwdENvbmZpcm0oV2ViUGFnZVByb3h5KiwgY29uc3Qg U3RyaW5nJiwgV2ViRnJhbWVQcm94eSopOwotICAgIFN0cmluZyBydW5KYXZhU2NyaXB0UHJvbXB0 KFdlYlBhZ2VQcm94eSosIGNvbnN0IFN0cmluZyYsIGNvbnN0IFN0cmluZyYsIFdlYkZyYW1lUHJv eHkqKTsKKyAgICBib29sIHJ1bkphdmFTY3JpcHRQcm9tcHQoV2ViUGFnZVByb3h5KiwgY29uc3Qg U3RyaW5nJiwgY29uc3QgU3RyaW5nJiwgV2ViRnJhbWVQcm94eSopOwogCiAgICAgdm9pZCBzZXRT dGF0dXNUZXh0KFdlYlBhZ2VQcm94eSosIGNvbnN0IFN0cmluZyYpOwogICAgIHZvaWQgbW91c2VE aWRNb3ZlT3ZlckVsZW1lbnQoV2ViUGFnZVByb3h5KiwgY29uc3QgV2ViSGl0VGVzdFJlc3VsdDo6 RGF0YSYsIFdlYkV2ZW50OjpNb2RpZmllcnMsIEFQSU9iamVjdCopOwo=