29138 2009-09-10 12:02:44 -0700 Simplify popup menu handling 2009-09-18 13:21:25 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 1 andersca andersca aroben eric oldest_to_newest 146277 0 andersca 2009-09-10 12:02:44 -0700 Currently, PopupMenu calls PopupMenuClient::hidePopup, when a popup menu needs to go away. The client method then hides the popup. The attached patch simplifies this so that calling PopupMenu::hide now hides the popup menu and then calls PopupMenuClient::popupDidHide. 146280 1 39364 andersca 2009-09-10 12:05:58 -0700 Created attachment 39364 Patch 146318 2 39364 aroben 2009-09-10 13:35:56 -0700 Comment on attachment 39364 Patch r=me 148346 3 eric 2009-09-18 13:21:25 -0700 Landed on Sept 14th as r48370. 39364 2009-09-10 12:05:58 -0700 2009-09-10 13:35:56 -0700 Patch textmate stdin xblvgT.txt text/plain 12070 andersca SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0ODI2MSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsNTAgQEAKKzIwMDktMDktMTAgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFw cGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjkxMzgKKyAgICAgICAg U2ltcGxpZnkgcG9wdXAgbWVudSBoYW5kbGluZy4KKworICAgICAgICAqIHBsYXRmb3JtL1BvcHVw TWVudUNsaWVudC5oOgorICAgICAgICBSZW5hbWUgaGlkZVBvcHVwIHRvIHBvcHVwRGlkSGlkZS4K KyAgICAgICAgCisgICAgICAgICogcGxhdGZvcm0vY2hyb21pdW0vUG9wdXBNZW51Q2hyb21pdW0u Y3BwOgorICAgICAgICAoV2ViQ29yZTo6UG9wdXBMaXN0Qm94OjpoYW5kbGVLZXlFdmVudCk6ICAg ICAgICAKKyAgICAgICAgKFdlYkNvcmU6OlBvcHVwTGlzdEJveDo6YWJhbmRvbik6CisgICAgICAg IChXZWJDb3JlOjpQb3B1cExpc3RCb3g6OmFjY2VwdEluZGV4KToKKyAgICAgICAgQ2FsbCBwb3B1 cERpZEhpZGUgaW5zdGVhZCBvZiBoaWRlUG9wdXAuCisgICAgICAgIAorICAgICAgICAqIHBsYXRm b3JtL2d0ay9Qb3B1cE1lbnVHdGsuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UG9wdXBNZW51Ojpt ZW51VW5tYXBwZWQpOgorICAgICAgICBEaXR0by4KKyAgICAgICAgCisgICAgICAgICogcGxhdGZv cm0vbWFjL1BvcHVwTWVudU1hYy5tbToKKyAgICAgICAgKFdlYkNvcmU6OlBvcHVwTWVudTo6c2hv dyk6CisgICAgICAgIERpdHRvLgorICAgICAgICAKKyAgICAgICAgKiBwbGF0Zm9ybS93aW4vUG9w dXBNZW51V2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBvcHVwTWVudTo6aGlkZSk6CisgICAg ICAgIENhbGwgcG9wdXBEaWRIaWRlLgorICAgICAgICAKKyAgICAgICAgKFdlYkNvcmU6OlBvcHVw V25kUHJvYyk6CisgICAgICAgIENhbGwgUG9wdXBNZW51OjpoaWRlLgorICAgICAgICAKKyAgICAg ICAgKiBwbGF0Zm9ybS93eC9Qb3B1cE1lbnVXeC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQb3B1 cE1lbnU6Ok9uTWVudUl0ZW1TZWxlY3RlZCk6CisgICAgICAgIENhbGwgcG9wdXBEaWRIaWRlLgor ICAgICAgICAKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTWVudUxpc3QuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyTWVudUxpc3Q6OmhpZGVQb3B1cCk6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJNZW51TGlzdDo6cG9wdXBEaWRIaWRlKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVu ZGVyTWVudUxpc3QuaDoKKyAgICAgICAgU2V0IHRoZSAicG9wdXAgaXMgdmlzaWJsZSIgZmxhZyBp biBwb3B1cERpZEhpZGUuCisgICAgICAgIAorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUZXh0 Q29udHJvbFNpbmdsZUxpbmUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGV4dENvbnRy b2xTaW5nbGVMaW5lOjpoaWRlUG9wdXApOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGV4dENv bnRyb2xTaW5nbGVMaW5lOjpwb3B1cERpZEhpZGUpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5k ZXJUZXh0Q29udHJvbFNpbmdsZUxpbmUuaDoKKyAgICAgICAgRGl0dG8uCisKIDIwMDktMDktMTAg IEd1c3Rhdm8gTm9yb25oYSBTaWx2YSAgPGd1c3Rhdm8ubm9yb25oYUBjb2xsYWJvcmEuY28udWs+ CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgWGFuIExvcGV6IGFuZCBEYW4gV2luc2hpcC4KSW5kZXg6 IFdlYkNvcmUvcGxhdGZvcm0vUG9wdXBNZW51Q2xpZW50LmgKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29y ZS9wbGF0Zm9ybS9Qb3B1cE1lbnVDbGllbnQuaAkocmV2aXNpb24gNDgyNjEpCisrKyBXZWJDb3Jl L3BsYXRmb3JtL1BvcHVwTWVudUNsaWVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC00OSw3ICs0OSw3 IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIGludCBjbGllbnRQYWRkaW5nUmlnaHQoKSBjb25zdCA9 IDA7CiAgICAgdmlydHVhbCBpbnQgbGlzdFNpemUoKSBjb25zdCA9IDA7CiAgICAgdmlydHVhbCBp bnQgc2VsZWN0ZWRJbmRleCgpIGNvbnN0ID0gMDsKLSAgICB2aXJ0dWFsIHZvaWQgaGlkZVBvcHVw KCkgPSAwOworICAgIHZpcnR1YWwgdm9pZCBwb3B1cERpZEhpZGUoKSA9IDA7CiAgICAgdmlydHVh bCBib29sIGl0ZW1Jc1NlcGFyYXRvcih1bnNpZ25lZCBsaXN0SW5kZXgpIGNvbnN0ID0gMDsKICAg ICB2aXJ0dWFsIGJvb2wgaXRlbUlzTGFiZWwodW5zaWduZWQgbGlzdEluZGV4KSBjb25zdCA9IDA7 CiAgICAgdmlydHVhbCBib29sIGl0ZW1Jc1NlbGVjdGVkKHVuc2lnbmVkIGxpc3RJbmRleCkgY29u c3QgPSAwOwpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9Qb3B1cE1lbnVDaHJvbWl1 bS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9Qb3B1cE1lbnVD aHJvbWl1bS5jcHAJKHJldmlzaW9uIDQ4MjYxKQorKysgV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1 bS9Qb3B1cE1lbnVDaHJvbWl1bS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTYzNSw3ICs2MzUsNyBA QCBib29sIFBvcHVwTGlzdEJveDo6aGFuZGxlS2V5RXZlbnQoY29uc3QgCiAgICAgICAgIHJldHVy biB0cnVlOwogICAgIGNhc2UgVktFWV9SRVRVUk46CiAgICAgICAgIGlmIChtX3NlbGVjdGVkSW5k ZXggPT0gLTEpICB7Ci0gICAgICAgICAgICBtX3BvcHVwQ2xpZW50LT5oaWRlUG9wdXAoKTsKKyAg ICAgICAgICAgIG1fcG9wdXBDbGllbnQtPnBvcHVwRGlkSGlkZSgpOwogICAgICAgICAgICAgLy8g RG9uJ3QgZWF0IHRoZSBlbnRlciBpZiBub3RoaW5nIGlzIHNlbGVjdGVkLgogICAgICAgICAgICAg cmV0dXJuIGZhbHNlOwogICAgICAgICB9CkBAIC04NzEsNyArODcxLDcgQEAgdm9pZCBQb3B1cExp c3RCb3g6OmFiYW5kb24oKQogCiAgICAgbV9zZWxlY3RlZEluZGV4ID0gbV9vcmlnaW5hbEluZGV4 OwogCi0gICAgbV9wb3B1cENsaWVudC0+aGlkZVBvcHVwKCk7CisgICAgbV9wb3B1cENsaWVudC0+ cG9wdXBEaWRIaWRlKCk7CiAKICAgICBpZiAobV9hY2NlcHRlZEluZGV4T25BYmFuZG9uID49IDAp IHsKICAgICAgICAgbV9wb3B1cENsaWVudC0+dmFsdWVDaGFuZ2VkKG1fYWNjZXB0ZWRJbmRleE9u QWJhbmRvbik7CkBAIC05MDQsNyArOTA0LDcgQEAgdm9pZCBQb3B1cExpc3RCb3g6OmFjY2VwdElu ZGV4KGludCBpbmRleAogICAgIGlmIChpbmRleCA8IDApIHsKICAgICAgICAgaWYgKG1fcG9wdXBD bGllbnQpIHsKICAgICAgICAgICAgIC8vIEVudGVyIHByZXNzZWQgd2l0aCBubyBzZWxlY3Rpb24s IGp1c3QgY2xvc2UgdGhlIHBvcHVwLgotICAgICAgICAgICAgbV9wb3B1cENsaWVudC0+aGlkZVBv cHVwKCk7CisgICAgICAgICAgICBtX3BvcHVwQ2xpZW50LT5wb3B1cERpZEhpZGUoKTsKICAgICAg ICAgfQogICAgICAgICByZXR1cm47CiAgICAgfQpAQCAtOTEzLDcgKzkxMyw3IEBAIHZvaWQgUG9w dXBMaXN0Qm94OjphY2NlcHRJbmRleChpbnQgaW5kZXgKICAgICAgICAgUmVmUHRyPFBvcHVwTGlz dEJveD4ga2VlcEFsaXZlKHRoaXMpOwogCiAgICAgICAgIC8vIEhpZGUgb3Vyc2VsdmVzIGZpcnN0 IHNpbmNlIHZhbHVlQ2hhbmdlZCBtYXkgaGF2ZSBudW1lcm91cyBzaWRlLWVmZmVjdHMuCi0gICAg ICAgIG1fcG9wdXBDbGllbnQtPmhpZGVQb3B1cCgpOworICAgICAgICBtX3BvcHVwQ2xpZW50LT5w b3B1cERpZEhpZGUoKTsKIAogICAgICAgICAvLyBUZWxsIHRoZSA8c2VsZWN0PiBQb3B1cE1lbnVD bGllbnQgd2hhdCBpbmRleCB3YXMgc2VsZWN0ZWQuCiAgICAgICAgIG1fcG9wdXBDbGllbnQtPnZh bHVlQ2hhbmdlZChpbmRleCk7CkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2d0ay9Qb3B1cE1lbnVH dGsuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3RrL1BvcHVwTWVudUd0ay5j cHAJKHJldmlzaW9uIDQ4MjYxKQorKysgV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUG9wdXBNZW51R3Rr LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTM3LDcgKzEzNyw3IEBAIHZvaWQgUG9wdXBNZW51Ojpt ZW51SXRlbUFjdGl2YXRlZChHdGtNZW4KIHZvaWQgUG9wdXBNZW51OjptZW51VW5tYXBwZWQoR3Rr V2lkZ2V0KiwgUG9wdXBNZW51KiB0aGF0KQogewogICAgIEFTU0VSVCh0aGF0LT5jbGllbnQoKSk7 Ci0gICAgdGhhdC0+Y2xpZW50KCktPmhpZGVQb3B1cCgpOworICAgIHRoYXQtPmNsaWVudCgpLT5w b3B1cERpZEhpZGUoKTsKIH0KIAogdm9pZCBQb3B1cE1lbnU6Om1lbnVQb3NpdGlvbkZ1bmN0aW9u KEd0a01lbnUqLCBnaW50KiB4LCBnaW50KiB5LCBnYm9vbGVhbiogcHVzaEluLCBQb3B1cE1lbnUq IHRoYXQpCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL21hYy9Qb3B1cE1lbnVNYWMubW0KPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9tYWMvUG9wdXBNZW51TWFjLm1tCShyZXZpc2lvbiA0 ODI2MSkKKysrIFdlYkNvcmUvcGxhdGZvcm0vbWFjL1BvcHVwTWVudU1hYy5tbQkod29ya2luZyBj b3B5KQpAQCAtMTA1LDcgKzEwNSw3IEBAIHZvaWQgUG9wdXBNZW51OjpzaG93KGNvbnN0IEludFJl Y3QmIHIsIEYKICAgICBpbnQgbnVtSXRlbXMgPSBbbV9wb3B1cC5nZXQoKSBudW1iZXJPZkl0ZW1z XTsKICAgICBpZiAobnVtSXRlbXMgPD0gMCkgewogICAgICAgICBpZiAoY2xpZW50KCkpCi0gICAg ICAgICAgICBjbGllbnQoKS0+aGlkZVBvcHVwKCk7CisgICAgICAgICAgICBjbGllbnQoKS0+cG9w dXBEaWRIaWRlKCk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAgICAgQVNTRVJUKG51bUl0ZW1z ID4gaW5kZXgpOwpAQCAtMTYyLDcgKzE2Miw3IEBAIHZvaWQgUG9wdXBNZW51OjpzaG93KGNvbnN0 IEludFJlY3QmIHIsIEYKIAogICAgIGlmIChjbGllbnQoKSkgewogICAgICAgICBpbnQgbmV3SW5k ZXggPSBbbV9wb3B1cC5nZXQoKSBpbmRleE9mU2VsZWN0ZWRJdGVtXTsKLSAgICAgICAgY2xpZW50 KCktPmhpZGVQb3B1cCgpOworICAgICAgICBjbGllbnQoKS0+cG9wdXBEaWRIaWRlKCk7CiAKICAg ICAgICAgLy8gQWRqdXN0IG5ld0luZGV4IGZvciBoaWRkZW4gZmlyc3QgaXRlbS4KICAgICAgICAg aWYgKCFjbGllbnQoKS0+c2hvdWxkUG9wT3ZlcigpKQpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS93 aW4vUG9wdXBNZW51V2luLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL3dpbi9Q b3B1cE1lbnVXaW4uY3BwCShyZXZpc2lvbiA0ODI2MSkKKysrIFdlYkNvcmUvcGxhdGZvcm0vd2lu L1BvcHVwTWVudVdpbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE2Nyw2ICsxNjcsOSBAQCB2b2lk IFBvcHVwTWVudTo6c2hvdyhjb25zdCBJbnRSZWN0JiByLCBGCiB2b2lkIFBvcHVwTWVudTo6aGlk ZSgpCiB7CiAgICAgOjpTaG93V2luZG93KG1fcG9wdXAsIFNXX0hJREUpOworCisgICAgaWYgKGNs aWVudCgpKQorICAgICAgICBjbGllbnQoKS0+cG9wdXBEaWRIaWRlKCk7CiB9CiAKIGNvbnN0IGlu dCBlbmRPZkxpbmVQYWRkaW5nID0gMjsKQEAgLTY1NSwxMyArNjU4LDEzIEBAIHN0YXRpYyBMUkVT VUxUIENBTExCQUNLIFBvcHVwV25kUHJvYyhIV04KICAgICAgICAgICAgIH0KICAgICAgICAgICAg IGJyZWFrOwogICAgICAgICBjYXNlIFdNX0FDVElWQVRFOgotICAgICAgICAgICAgaWYgKHBvcHVw ICYmIHBvcHVwLT5jbGllbnQoKSAmJiB3UGFyYW0gPT0gV0FfSU5BQ1RJVkUpCi0gICAgICAgICAg ICAgICAgcG9wdXAtPmNsaWVudCgpLT5oaWRlUG9wdXAoKTsKKyAgICAgICAgICAgIGlmIChwb3B1 cCAmJiB3UGFyYW0gPT0gV0FfSU5BQ1RJVkUpCisgICAgICAgICAgICAgICAgcG9wdXAtPmhpZGUo KTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNlIFdNX0tJTExGT0NVUzoKLSAgICAg ICAgICAgIGlmIChwb3B1cCAmJiBwb3B1cC0+Y2xpZW50KCkgJiYgKEhXTkQpd1BhcmFtICE9IHBv cHVwLT5wb3B1cEhhbmRsZSgpKQorICAgICAgICAgICAgaWYgKHBvcHVwICYmIChIV05EKXdQYXJh bSAhPSBwb3B1cC0+cG9wdXBIYW5kbGUoKSkKICAgICAgICAgICAgICAgICAvLyBGb2N1cyBpcyBn b2luZyBlbHNld2hlcmUsIHNvIGhpZGUKLSAgICAgICAgICAgICAgICBwb3B1cC0+Y2xpZW50KCkt PmhpZGVQb3B1cCgpOworICAgICAgICAgICAgICAgIHBvcHVwLT5oaWRlKCk7CiAgICAgICAgICAg ICBicmVhazsKICAgICAgICAgY2FzZSBXTV9LRVlET1dOOgogICAgICAgICAgICAgaWYgKHBvcHVw ICYmIHBvcHVwLT5jbGllbnQoKSkgewpAQCAtNzAzLDEwICs3MDYsMTAgQEAgc3RhdGljIExSRVNV TFQgQ0FMTEJBQ0sgUG9wdXBXbmRQcm9jKEhXTgogICAgICAgICAgICAgICAgICAgICAgICAgYnJl YWs7CiAgICAgICAgICAgICAgICAgICAgIGNhc2UgVktfVEFCOgogICAgICAgICAgICAgICAgICAg ICAgICAgOjpTZW5kTWVzc2FnZShwb3B1cC0+Y2xpZW50KCktPmhvc3RXaW5kb3coKS0+cGxhdGZv cm1XaW5kb3coKSwgbWVzc2FnZSwgd1BhcmFtLCBsUGFyYW0pOwotICAgICAgICAgICAgICAgICAg ICAgICAgcG9wdXAtPmNsaWVudCgpLT5oaWRlUG9wdXAoKTsKKyAgICAgICAgICAgICAgICAgICAg ICAgIHBvcHVwLT5oaWRlKCk7CiAgICAgICAgICAgICAgICAgICAgICAgICBicmVhazsKICAgICAg ICAgICAgICAgICAgICAgY2FzZSBWS19FU0NBUEU6Ci0gICAgICAgICAgICAgICAgICAgICAgICBw b3B1cC0+Y2xpZW50KCktPmhpZGVQb3B1cCgpOworICAgICAgICAgICAgICAgICAgICAgICAgcG9w dXAtPmhpZGUoKTsKICAgICAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAg ICAgICAgICBkZWZhdWx0OgogICAgICAgICAgICAgICAgICAgICAgICAgaWYgKGlzQVNDSUlQcmlu dGFibGUod1BhcmFtKSkKQEAgLTcyNCwxMyArNzI3LDEzIEBAIHN0YXRpYyBMUkVTVUxUIENBTExC QUNLIFBvcHVwV25kUHJvYyhIV04KICAgICAgICAgICAgICAgICBpbnQgaW5kZXg7CiAgICAgICAg ICAgICAgICAgc3dpdGNoICh3UGFyYW0pIHsKICAgICAgICAgICAgICAgICAgICAgY2FzZSAweDBE OiAgIC8vIEVudGVyL1JldHVybgotICAgICAgICAgICAgICAgICAgICAgICAgcG9wdXAtPmNsaWVu dCgpLT5oaWRlUG9wdXAoKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIHBvcHVwLT5oaWRlKCk7 CiAgICAgICAgICAgICAgICAgICAgICAgICBpbmRleCA9IHBvcHVwLT5mb2N1c2VkSW5kZXgoKTsK ICAgICAgICAgICAgICAgICAgICAgICAgIEFTU0VSVChpbmRleCA+PSAwKTsKICAgICAgICAgICAg ICAgICAgICAgICAgIHBvcHVwLT5jbGllbnQoKS0+dmFsdWVDaGFuZ2VkKGluZGV4KTsKICAgICAg ICAgICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgICAgICAgICBjYXNlIDB4MUI6 ICAgLy8gRXNjYXBlCi0gICAgICAgICAgICAgICAgICAgICAgICBwb3B1cC0+Y2xpZW50KCktPmhp ZGVQb3B1cCgpOworICAgICAgICAgICAgICAgICAgICAgICAgcG9wdXAtPmhpZGUoKTsKICAgICAg ICAgICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgICAgICAgICBjYXNlIDB4MDk6 ICAgLy8gVEFCCiAgICAgICAgICAgICAgICAgICAgIGNhc2UgMHgwODogICAvLyBCYWNrc3BhY2UK QEAgLTgxNSw3ICs4MTgsNyBAQCBzdGF0aWMgTFJFU1VMVCBDQUxMQkFDSyBQb3B1cFduZFByb2Mo SFdOCiAgICAgICAgICAgICAgICAgR2V0Q2xpZW50UmVjdChwb3B1cC0+cG9wdXBIYW5kbGUoKSwg JmJvdW5kcyk7CiAgICAgICAgICAgICAgICAgaWYgKHBvcHVwLT5jbGllbnQoKSAmJiA6OlB0SW5S ZWN0KCZib3VuZHMsIG1vdXNlUG9pbnQpKSB7CiAgICAgICAgICAgICAgICAgICAgIDo6UmVsZWFz ZUNhcHR1cmUoKTsKLSAgICAgICAgICAgICAgICAgICAgcG9wdXAtPmNsaWVudCgpLT5oaWRlUG9w dXAoKTsKKyAgICAgICAgICAgICAgICAgICAgcG9wdXAtPmhpZGUoKTsKICAgICAgICAgICAgICAg ICAgICAgaW50IGluZGV4ID0gcG9wdXAtPmZvY3VzZWRJbmRleCgpOwogICAgICAgICAgICAgICAg ICAgICBpZiAoaW5kZXggPj0gMCkKICAgICAgICAgICAgICAgICAgICAgICAgIHBvcHVwLT5jbGll bnQoKS0+dmFsdWVDaGFuZ2VkKGluZGV4KTsKSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vd3gvUG9w dXBNZW51V3guY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vd3gvUG9wdXBNZW51 V3guY3BwCShyZXZpc2lvbiA0ODI2MSkKKysrIFdlYkNvcmUvcGxhdGZvcm0vd3gvUG9wdXBNZW51 V3guY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04OCw3ICs4OCw3IEBAIHZvaWQgUG9wdXBNZW51OjpP bk1lbnVJdGVtU2VsZWN0ZWQod3hDb20KIHsKICAgICBpZiAoY2xpZW50KCkpIHsKICAgICAgICAg Y2xpZW50KCktPnZhbHVlQ2hhbmdlZChldmVudC5HZXRJZCgpIC0gc19tZW51U3RhcnRJZCk7Ci0g ICAgICAgIGNsaWVudCgpLT5oaWRlUG9wdXAoKTsKKyAgICAgICAgY2xpZW50KCktPnBvcHVwRGlk SGlkZSgpOwogICAgIH0KICAgICAvLyBUT0RPOiBEbyB3ZSBuZWVkIHRvIGNhbGwgRGlzY29ubmVj dCBoZXJlPyBEbyB3ZSBoYXZlIGEgcmVmIHRvIHRoZSBuYXRpdmUgd2luZG93IHN0aWxsPwogfQpJ bmRleDogV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTWVudUxpc3QuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck1lbnVMaXN0LmNwcAkocmV2aXNpb24gNDgyNjEpCisr KyBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNZW51TGlzdC5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTI5Miw3ICsyOTIsNiBAQCB2b2lkIFJlbmRlck1lbnVMaXN0OjpoaWRlUG9wdXAoKQogewogICAg IGlmIChtX3BvcHVwKQogICAgICAgICBtX3BvcHVwLT5oaWRlKCk7Ci0gICAgbV9wb3B1cElzVmlz aWJsZSA9IGZhbHNlOwogfQogCiB2b2lkIFJlbmRlck1lbnVMaXN0Ojp2YWx1ZUNoYW5nZWQodW5z aWduZWQgbGlzdEluZGV4LCBib29sIGZpcmVPbkNoYW5nZSkKQEAgLTQyOCw2ICs0MjcsMTEgQEAg aW50IFJlbmRlck1lbnVMaXN0OjpzZWxlY3RlZEluZGV4KCkgY29ucwogICAgIHJldHVybiBzZWxl Y3QtPm9wdGlvblRvTGlzdEluZGV4KHNlbGVjdC0+c2VsZWN0ZWRJbmRleCgpKTsKIH0KIAordm9p ZCBSZW5kZXJNZW51TGlzdDo6cG9wdXBEaWRIaWRlKCkKK3sKKyAgICBtX3BvcHVwSXNWaXNpYmxl ID0gZmFsc2U7Cit9CisKIGJvb2wgUmVuZGVyTWVudUxpc3Q6Oml0ZW1Jc1NlcGFyYXRvcih1bnNp Z25lZCBsaXN0SW5kZXgpIGNvbnN0CiB7CiAgICAgU2VsZWN0RWxlbWVudCogc2VsZWN0ID0gdG9T ZWxlY3RFbGVtZW50KHN0YXRpY19jYXN0PEVsZW1lbnQqPihub2RlKCkpKTsKSW5kZXg6IFdlYkNv cmUvcmVuZGVyaW5nL1JlbmRlck1lbnVMaXN0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyTWVudUxpc3QuaAkocmV2aXNpb24gNDgyNjEpCisrKyBXZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJNZW51TGlzdC5oCSh3b3JraW5nIGNvcHkpCkBAIC04Miw2ICs4Miw3IEBAIHBy aXZhdGU6CiAgICAgdmlydHVhbCBpbnQgY2xpZW50UGFkZGluZ1JpZ2h0KCkgY29uc3Q7CiAgICAg dmlydHVhbCBpbnQgbGlzdFNpemUoKSBjb25zdDsKICAgICB2aXJ0dWFsIGludCBzZWxlY3RlZElu ZGV4KCkgY29uc3Q7CisgICAgdmlydHVhbCB2b2lkIHBvcHVwRGlkSGlkZSgpOwogICAgIHZpcnR1 YWwgYm9vbCBpdGVtSXNTZXBhcmF0b3IodW5zaWduZWQgbGlzdEluZGV4KSBjb25zdDsKICAgICB2 aXJ0dWFsIGJvb2wgaXRlbUlzTGFiZWwodW5zaWduZWQgbGlzdEluZGV4KSBjb25zdDsKICAgICB2 aXJ0dWFsIGJvb2wgaXRlbUlzU2VsZWN0ZWQodW5zaWduZWQgbGlzdEluZGV4KSBjb25zdDsKSW5k ZXg6IFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHRDb250cm9sU2luZ2xlTGluZS5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dENvbnRyb2xTaW5nbGVMaW5l LmNwcAkocmV2aXNpb24gNDgyNjEpCisrKyBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0Q29u dHJvbFNpbmdsZUxpbmUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNDcsOCArMTQ3LDYgQEAgdm9p ZCBSZW5kZXJUZXh0Q29udHJvbFNpbmdsZUxpbmU6OmhpZGVQbwogICAgIEFTU0VSVChub2RlKCkt PmlzSFRNTEVsZW1lbnQoKSk7CiAgICAgaWYgKG1fc2VhcmNoUG9wdXApCiAgICAgICAgIG1fc2Vh cmNoUG9wdXAtPmhpZGUoKTsKLQotICAgIG1fc2VhcmNoUG9wdXBJc1Zpc2libGUgPSBmYWxzZTsK IH0KIAogdm9pZCBSZW5kZXJUZXh0Q29udHJvbFNpbmdsZUxpbmU6OnN1YnRyZWVIYXNDaGFuZ2Vk KCkKQEAgLTcyMyw2ICs3MjEsMTEgQEAgaW50IFJlbmRlclRleHRDb250cm9sU2luZ2xlTGluZTo6 c2VsZWN0ZQogICAgIHJldHVybiAtMTsKIH0KIAordm9pZCBSZW5kZXJUZXh0Q29udHJvbFNpbmds ZUxpbmU6OnBvcHVwRGlkSGlkZSgpCit7CisgICAgbV9zZWFyY2hQb3B1cElzVmlzaWJsZSA9IGZh bHNlOworfQorCiBib29sIFJlbmRlclRleHRDb250cm9sU2luZ2xlTGluZTo6aXRlbUlzU2VwYXJh dG9yKHVuc2lnbmVkIGxpc3RJbmRleCkgY29uc3QKIHsKICAgICAvLyBUaGUgc2VwYXJhdG9yIHdp bGwgYmUgdGhlIHNlY29uZCB0byBsYXN0IGl0ZW0gaW4gb3VyIGxpc3QuCkluZGV4OiBXZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJUZXh0Q29udHJvbFNpbmdsZUxpbmUuaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0Q29udHJvbFNpbmdsZUxpbmUuaAkocmV2aXNpb24g NDgyNjEpCisrKyBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0Q29udHJvbFNpbmdsZUxpbmUu aAkod29ya2luZyBjb3B5KQpAQCAtNDcsNyArNDcsNyBAQCBwdWJsaWM6CiAKICAgICBib29sIHBv cHVwSXNWaXNpYmxlKCkgY29uc3QgeyByZXR1cm4gbV9zZWFyY2hQb3B1cElzVmlzaWJsZTsgfQog ICAgIHZvaWQgc2hvd1BvcHVwKCk7Ci0gICAgdmlydHVhbCB2b2lkIGhpZGVQb3B1cCgpOyAvLyBQ b3B1cE1lbnVDbGllbnQgbWV0aG9kCisgICAgdm9pZCBoaWRlUG9wdXAoKTsKIAogICAgIHZvaWQg Zm9yd2FyZEV2ZW50KEV2ZW50Kik7CiAKQEAgLTEwOSw2ICsxMDksNyBAQCBwcml2YXRlOgogICAg IHZpcnR1YWwgaW50IGNsaWVudFBhZGRpbmdSaWdodCgpIGNvbnN0OwogICAgIHZpcnR1YWwgaW50 IGxpc3RTaXplKCkgY29uc3Q7CiAgICAgdmlydHVhbCBpbnQgc2VsZWN0ZWRJbmRleCgpIGNvbnN0 OworICAgIHZpcnR1YWwgdm9pZCBwb3B1cERpZEhpZGUoKTsKICAgICB2aXJ0dWFsIGJvb2wgaXRl bUlzU2VwYXJhdG9yKHVuc2lnbmVkIGxpc3RJbmRleCkgY29uc3Q7CiAgICAgdmlydHVhbCBib29s IGl0ZW1Jc0xhYmVsKHVuc2lnbmVkIGxpc3RJbmRleCkgY29uc3Q7CiAgICAgdmlydHVhbCBib29s IGl0ZW1Jc1NlbGVjdGVkKHVuc2lnbmVkIGxpc3RJbmRleCkgY29uc3Q7Cg==