160431 2016-08-01 15:45:38 -0700 <attachment> action label doesn't wrap, but needs to for some localizations 2016-08-01 18:40:57 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 thorton thorton andersca bdakin commit-queue enrica esprehn+autocc glenn kondapallykalyan sam simon.fraser oldest_to_newest 1216294 0 thorton 2016-08-01 15:45:38 -0700 <attachment> action label doesn't wrap, but needs to for some localizations 1216295 1 285048 thorton 2016-08-01 15:46:21 -0700 Created attachment 285048 Patch 1216297 2 thorton 2016-08-01 15:53:42 -0700 Probably will need to skip the test on Mac, where action isn't a thing, so these won't mismatch. 1216299 3 285050 thorton 2016-08-01 16:02:45 -0700 Created attachment 285050 Patch 1216300 4 thorton 2016-08-01 16:04:06 -0700 <rdar://problem/27526464> 1216347 5 thorton 2016-08-01 18:40:57 -0700 https://trac.webkit.org/changeset/204005 285048 2016-08-01 15:46:21 -0700 2016-08-01 16:02:41 -0700 Patch bug-160431-20160801154501.patch text/plain 10213 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjAzOTkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWExOWM5NzY3NzQ1MGI0 ZDAyODQzMTM5ZTJhMzZkN2E4YjlkMmRhMi4uZDU1MWViNjU5ZWI5MjU0M2JmNDZiN2ExMDdkYWRj ZmJhNGI2ZjI1ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE2LTA4LTAxICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIDxhdHRhY2htZW50 PiBhY3Rpb24gbGFiZWwgZG9lc24ndCB3cmFwLCBidXQgbmVlZHMgdG8gZm9yIHNvbWUgbG9jYWxp emF0aW9ucworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTYwNDMxCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yNzUyNjQ2ND4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0OiBmYXN0L2F0dGFjaG1lbnQv YXR0YWNobWVudC13cmFwcGluZy1hY3Rpb24uaHRtbAorCisgICAgICAgICogcmVuZGVyaW5nL1Jl bmRlclRoZW1lSU9TLm1tOgorICAgICAgICAoV2ViQ29yZTo6QXR0YWNobWVudEluZm86OmJ1aWxk V3JhcHBlZExpbmVzKToKKyAgICAgICAgKFdlYkNvcmU6OkF0dGFjaG1lbnRJbmZvOjpBdHRhY2ht ZW50SW5mbyk6CisgICAgICAgIChXZWJDb3JlOjpBdHRhY2htZW50SW5mbzo6YnVpbGRUaXRsZUxp bmVzKTogRGVsZXRlZC4KKyAgICAgICAgUmV3b3JrIGJ1aWxkVGl0bGVMaW5lcyBpbnRvIGJ1aWxk V3JhcHBlZExpbmVzIHNvIHRoYXQgd2UgaGF2ZSBhCisgICAgICAgIGdlbmVyaWMgd2F5IHRvIGFk ZCBsaW5lcyB0aGF0IHdyYXAgdXAgdG8gTiBsaW5lcyBhbmQgdGhlbiBjZW50ZXItdHJ1bmNhdGUu CisKKyAgICAgICAgTWFrZSB1c2Ugb2YgaXQgZm9yIHRoZSBhY3Rpb24gdGV4dCwgYW5kIGZvbGxv dyB0aGUgc2FtZSBydWxlcy93aWR0aCBhcworICAgICAgICB0aGUgdGl0bGUgdGV4dCBhbHJlYWR5 IGRvZXMuCisKIDIwMTYtMDgtMDEgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNv bT4KIAogICAgICAgICBGaXggYnVpbGQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyVGhlbWVJT1MubW0gYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy VGhlbWVJT1MubW0KaW5kZXggZGQyM2JhNzQ2MDQ1YmNiMGRlODk4M2EyY2NlZTEyZWE0OTJmNTVk My4uMWQwZjkxNzNkMDU2M2MxOTYzMDNmMjYxMTQ2OTkzOWZjYTJhMGQ0ZCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lSU9TLm1tCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUlPUy5tbQpAQCAtMTM4MCw4ICsxMzgwLDggQEAg Y29uc3QgQ0dGbG9hdCBhdHRhY2htZW50SWNvblNpemUgPSA0ODsKIAogY29uc3QgQ0dGbG9hdCBh dHRhY2htZW50SXRlbU1hcmdpbiA9IDg7CiAKLWNvbnN0IENHRmxvYXQgYXR0YWNobWVudFRpdGxl TWF4aW11bVdpZHRoID0gMTQwOwotY29uc3QgQ0ZJbmRleCBhdHRhY2htZW50VGl0bGVNYXhpbXVt TGluZUNvdW50ID0gMjsKK2NvbnN0IENHRmxvYXQgYXR0YWNobWVudFdyYXBwaW5nVGV4dE1heGlt dW1XaWR0aCA9IDE0MDsKK2NvbnN0IENGSW5kZXggYXR0YWNobWVudFdyYXBwaW5nVGV4dE1heGlt dW1MaW5lQ291bnQgPSAyOwogCiBzdGF0aWMgUmV0YWluUHRyPENURm9udFJlZj4gYXR0YWNobWVu dEFjdGlvbkZvbnQoKQogewpAQCAtMTQzMiw3ICsxNDMyLDcgQEAgc3RydWN0IEF0dGFjaG1lbnRJ bmZvIHsKICAgICBDR0Zsb2F0IGNvbnRlbnRZT3JpZ2luIHsgMCB9OwogCiBwcml2YXRlOgotICAg IHZvaWQgYnVpbGRUaXRsZUxpbmVzKGNvbnN0IFJlbmRlckF0dGFjaG1lbnQmLCB1bnNpZ25lZCBt YXhpbXVtTGluZUNvdW50KTsKKyAgICB2b2lkIGJ1aWxkV3JhcHBlZExpbmVzKGNvbnN0IFN0cmlu ZyYsIENURm9udFJlZiwgVUlDb2xvciAqLCB1bnNpZ25lZCBtYXhpbXVtTGluZUNvdW50KTsKICAg ICB2b2lkIGJ1aWxkU2luZ2xlTGluZShjb25zdCBTdHJpbmcmLCBDVEZvbnRSZWYsIFVJQ29sb3Ig Kik7CiAKICAgICB2b2lkIGFkZExpbmUoQ1RMaW5lUmVmKTsKQEAgLTE0NTMsMjggKzE0NTMsMjUg QEAgdm9pZCBBdHRhY2htZW50SW5mbzo6YWRkTGluZShDVExpbmVSZWYgbGluZSkKICAgICBsaW5l cy5hcHBlbmQobGFiZWxMaW5lKTsKIH0KIAotdm9pZCBBdHRhY2htZW50SW5mbzo6YnVpbGRUaXRs ZUxpbmVzKGNvbnN0IFJlbmRlckF0dGFjaG1lbnQmIGF0dGFjaG1lbnQsIHVuc2lnbmVkIG1heGlt dW1MaW5lQ291bnQpCit2b2lkIEF0dGFjaG1lbnRJbmZvOjpidWlsZFdyYXBwZWRMaW5lcyhjb25z dCBTdHJpbmcmIHRleHQsIENURm9udFJlZiBmb250LCBVSUNvbG9yICpjb2xvciwgdW5zaWduZWQg bWF4aW11bUxpbmVDb3VudCkKIHsKLSAgICBSZXRhaW5QdHI8Q1RGb250UmVmPiBmb250ID0gYXR0 YWNobWVudFRpdGxlRm9udCgpOwotCi0gICAgU3RyaW5nIHRpdGxlID0gYXR0YWNobWVudC5hdHRh Y2htZW50RWxlbWVudCgpLmF0dGFjaG1lbnRUaXRsZSgpOwotICAgIGlmICh0aXRsZS5pc0VtcHR5 KCkpCisgICAgaWYgKHRleHQuaXNFbXB0eSgpKQogICAgICAgICByZXR1cm47CiAKICAgICBOU0Rp Y3Rpb25hcnkgKnRleHRBdHRyaWJ1dGVzID0gQHsKLSAgICAgICAgKGlkKWtDVEZvbnRBdHRyaWJ1 dGVOYW1lOiAoaWQpZm9udC5nZXQoKSwKLSAgICAgICAgKGlkKWtDVEZvcmVncm91bmRDb2xvckF0 dHJpYnV0ZU5hbWU6IGF0dGFjaG1lbnRUaXRsZUNvbG9yKCkKKyAgICAgICAgKGlkKWtDVEZvbnRB dHRyaWJ1dGVOYW1lOiAoaWQpZm9udCwKKyAgICAgICAgKGlkKWtDVEZvcmVncm91bmRDb2xvckF0 dHJpYnV0ZU5hbWU6IGNvbG9yCiAgICAgfTsKLSAgICBSZXRhaW5QdHI8TlNBdHRyaWJ1dGVkU3Ry aW5nPiBhdHRyaWJ1dGVkVGl0bGUgPSBhZG9wdE5TKFtbTlNBdHRyaWJ1dGVkU3RyaW5nIGFsbG9j XSBpbml0V2l0aFN0cmluZzp0aXRsZSBhdHRyaWJ1dGVzOnRleHRBdHRyaWJ1dGVzXSk7Ci0gICAg UmV0YWluUHRyPENURnJhbWVzZXR0ZXJSZWY+IHRpdGxlRnJhbWVzZXR0ZXIgPSBhZG9wdENGKENU RnJhbWVzZXR0ZXJDcmVhdGVXaXRoQXR0cmlidXRlZFN0cmluZygoQ0ZBdHRyaWJ1dGVkU3RyaW5n UmVmKWF0dHJpYnV0ZWRUaXRsZS5nZXQoKSkpOworICAgIFJldGFpblB0cjxOU0F0dHJpYnV0ZWRT dHJpbmc+IGF0dHJpYnV0ZWRUZXh0ID0gYWRvcHROUyhbW05TQXR0cmlidXRlZFN0cmluZyBhbGxv Y10gaW5pdFdpdGhTdHJpbmc6dGV4dCBhdHRyaWJ1dGVzOnRleHRBdHRyaWJ1dGVzXSk7CisgICAg UmV0YWluUHRyPENURnJhbWVzZXR0ZXJSZWY+IGZyYW1lc2V0dGVyID0gYWRvcHRDRihDVEZyYW1l c2V0dGVyQ3JlYXRlV2l0aEF0dHJpYnV0ZWRTdHJpbmcoKENGQXR0cmlidXRlZFN0cmluZ1JlZilh dHRyaWJ1dGVkVGV4dC5nZXQoKSkpOwogCiAgICAgQ0ZSYW5nZSBmaXRSYW5nZTsKLSAgICBDR1Np emUgdGl0bGVUZXh0U2l6ZSA9IENURnJhbWVzZXR0ZXJTdWdnZXN0RnJhbWVTaXplV2l0aENvbnN0 cmFpbnRzKHRpdGxlRnJhbWVzZXR0ZXIuZ2V0KCksIENGUmFuZ2VNYWtlKDAsIDApLCBudWxscHRy LCBDR1NpemVNYWtlKGF0dGFjaG1lbnRUaXRsZU1heGltdW1XaWR0aCwgQ0dGTE9BVF9NQVgpLCAm Zml0UmFuZ2UpOworICAgIENHU2l6ZSB0ZXh0U2l6ZSA9IENURnJhbWVzZXR0ZXJTdWdnZXN0RnJh bWVTaXplV2l0aENvbnN0cmFpbnRzKGZyYW1lc2V0dGVyLmdldCgpLCBDRlJhbmdlTWFrZSgwLCAw KSwgbnVsbHB0ciwgQ0dTaXplTWFrZShhdHRhY2htZW50V3JhcHBpbmdUZXh0TWF4aW11bVdpZHRo LCBDR0ZMT0FUX01BWCksICZmaXRSYW5nZSk7CiAKLSAgICBSZXRhaW5QdHI8Q0dQYXRoUmVmPiB0 aXRsZVBhdGggPSBhZG9wdENGKENHUGF0aENyZWF0ZVdpdGhSZWN0KENHUmVjdE1ha2UoMCwgMCwg dGl0bGVUZXh0U2l6ZS53aWR0aCwgdGl0bGVUZXh0U2l6ZS5oZWlnaHQpLCBudWxscHRyKSk7Ci0g ICAgUmV0YWluUHRyPENURnJhbWVSZWY+IHRpdGxlRnJhbWUgPSBhZG9wdENGKENURnJhbWVzZXR0 ZXJDcmVhdGVGcmFtZSh0aXRsZUZyYW1lc2V0dGVyLmdldCgpLCBmaXRSYW5nZSwgdGl0bGVQYXRo LmdldCgpLCBudWxscHRyKSk7CisgICAgUmV0YWluUHRyPENHUGF0aFJlZj4gdGV4dFBhdGggPSBh ZG9wdENGKENHUGF0aENyZWF0ZVdpdGhSZWN0KENHUmVjdE1ha2UoMCwgMCwgdGV4dFNpemUud2lk dGgsIHRleHRTaXplLmhlaWdodCksIG51bGxwdHIpKTsKKyAgICBSZXRhaW5QdHI8Q1RGcmFtZVJl Zj4gdGV4dEZyYW1lID0gYWRvcHRDRihDVEZyYW1lc2V0dGVyQ3JlYXRlRnJhbWUoZnJhbWVzZXR0 ZXIuZ2V0KCksIGZpdFJhbmdlLCB0ZXh0UGF0aC5nZXQoKSwgbnVsbHB0cikpOwogCi0gICAgQ0ZB cnJheVJlZiBjdExpbmVzID0gQ1RGcmFtZUdldExpbmVzKHRpdGxlRnJhbWUuZ2V0KCkpOworICAg IENGQXJyYXlSZWYgY3RMaW5lcyA9IENURnJhbWVHZXRMaW5lcyh0ZXh0RnJhbWUuZ2V0KCkpOwog ICAgIENGSW5kZXggbGluZUNvdW50ID0gQ0ZBcnJheUdldENvdW50KGN0TGluZXMpOwogICAgIGlm ICghbGluZUNvdW50KQogICAgICAgICByZXR1cm47CkBAIC0xNDkyLDEyICsxNDg5LDEyIEBAIHZv aWQgQXR0YWNobWVudEluZm86OmJ1aWxkVGl0bGVMaW5lcyhjb25zdCBSZW5kZXJBdHRhY2htZW50 JiBhdHRhY2htZW50LCB1bnNpZ25lCiAgICAgLy8gQ29tYmluZSBpdCBpbnRvIG9uZSBsYXN0IGxp bmUsIGFuZCBjZW50ZXItdHJ1bmNhdGUgaXQuCiAgICAgQ1RMaW5lUmVmIGZpcnN0UmVtYWluaW5n TGluZSA9IChDVExpbmVSZWYpQ0ZBcnJheUdldFZhbHVlQXRJbmRleChjdExpbmVzLCBsaW5lSW5k ZXgpOwogICAgIENGSW5kZXggcmVtYWluaW5nUmFuZ2VTdGFydCA9IENUTGluZUdldFN0cmluZ1Jh bmdlKGZpcnN0UmVtYWluaW5nTGluZSkubG9jYXRpb247Ci0gICAgTlNSYW5nZSByZW1haW5pbmdS YW5nZSA9IE5TTWFrZVJhbmdlKHJlbWFpbmluZ1JhbmdlU3RhcnQsIFthdHRyaWJ1dGVkVGl0bGUg bGVuZ3RoXSAtIHJlbWFpbmluZ1JhbmdlU3RhcnQpOwotICAgIE5TQXR0cmlidXRlZFN0cmluZyAq cmVtYWluaW5nU3RyaW5nID0gW2F0dHJpYnV0ZWRUaXRsZSBhdHRyaWJ1dGVkU3Vic3RyaW5nRnJv bVJhbmdlOnJlbWFpbmluZ1JhbmdlXTsKKyAgICBOU1JhbmdlIHJlbWFpbmluZ1JhbmdlID0gTlNN YWtlUmFuZ2UocmVtYWluaW5nUmFuZ2VTdGFydCwgW2F0dHJpYnV0ZWRUZXh0IGxlbmd0aF0gLSBy ZW1haW5pbmdSYW5nZVN0YXJ0KTsKKyAgICBOU0F0dHJpYnV0ZWRTdHJpbmcgKnJlbWFpbmluZ1N0 cmluZyA9IFthdHRyaWJ1dGVkVGV4dCBhdHRyaWJ1dGVkU3Vic3RyaW5nRnJvbVJhbmdlOnJlbWFp bmluZ1JhbmdlXTsKICAgICBSZXRhaW5QdHI8Q1RMaW5lUmVmPiByZW1haW5pbmdMaW5lID0gYWRv cHRDRihDVExpbmVDcmVhdGVXaXRoQXR0cmlidXRlZFN0cmluZygoQ0ZBdHRyaWJ1dGVkU3RyaW5n UmVmKXJlbWFpbmluZ1N0cmluZykpOwogICAgIFJldGFpblB0cjxOU0F0dHJpYnV0ZWRTdHJpbmc+ IGVsbGlwc2lzU3RyaW5nID0gYWRvcHROUyhbW05TQXR0cmlidXRlZFN0cmluZyBhbGxvY10gaW5p dFdpdGhTdHJpbmc6QCJcdTIwMjYiIGF0dHJpYnV0ZXM6dGV4dEF0dHJpYnV0ZXNdKTsKICAgICBS ZXRhaW5QdHI8Q1RMaW5lUmVmPiBlbGxpcHNpc0xpbmUgPSBhZG9wdENGKENUTGluZUNyZWF0ZVdp dGhBdHRyaWJ1dGVkU3RyaW5nKChDRkF0dHJpYnV0ZWRTdHJpbmdSZWYpZWxsaXBzaXNTdHJpbmcu Z2V0KCkpKTsKLSAgICBSZXRhaW5QdHI8Q1RMaW5lUmVmPiB0cnVuY2F0ZWRMaW5lID0gYWRvcHRD RihDVExpbmVDcmVhdGVUcnVuY2F0ZWRMaW5lKHJlbWFpbmluZ0xpbmUuZ2V0KCksIGF0dGFjaG1l bnRUaXRsZU1heGltdW1XaWR0aCwga0NUTGluZVRydW5jYXRpb25NaWRkbGUsIGVsbGlwc2lzTGlu ZS5nZXQoKSkpOworICAgIFJldGFpblB0cjxDVExpbmVSZWY+IHRydW5jYXRlZExpbmUgPSBhZG9w dENGKENUTGluZUNyZWF0ZVRydW5jYXRlZExpbmUocmVtYWluaW5nTGluZS5nZXQoKSwgYXR0YWNo bWVudFdyYXBwaW5nVGV4dE1heGltdW1XaWR0aCwga0NUTGluZVRydW5jYXRpb25NaWRkbGUsIGVs bGlwc2lzTGluZS5nZXQoKSkpOwogCiAgICAgaWYgKCF0cnVuY2F0ZWRMaW5lKQogICAgICAgICB0 cnVuY2F0ZWRMaW5lID0gcmVtYWluaW5nTGluZTsKQEAgLTE1ODcsNiArMTU4NCw3IEBAIEF0dGFj aG1lbnRJbmZvOjpBdHRhY2htZW50SW5mbyhjb25zdCBSZW5kZXJBdHRhY2htZW50JiBhdHRhY2ht ZW50KQogCiAgICAgaGFzUHJvZ3Jlc3MgPSBnZXRBdHRhY2htZW50UHJvZ3Jlc3MoYXR0YWNobWVu dCwgcHJvZ3Jlc3MpOwogCisgICAgU3RyaW5nIHRpdGxlID0gYXR0YWNobWVudC5hdHRhY2htZW50 RWxlbWVudCgpLmF0dGFjaG1lbnRUaXRsZSgpOwogICAgIFN0cmluZyBhY3Rpb24gPSBhdHRhY2ht ZW50LmF0dGFjaG1lbnRFbGVtZW50KCkuYXR0cmlidXRlV2l0aG91dFN5bmNocm9uaXphdGlvbihh Y3Rpb25BdHRyKTsKICAgICBTdHJpbmcgc3VidGl0bGUgPSBhdHRhY2htZW50LmF0dGFjaG1lbnRF bGVtZW50KCkuYXR0cmlidXRlV2l0aG91dFN5bmNocm9uaXphdGlvbihzdWJ0aXRsZUF0dHIpOwog CkBAIC0xNjA1LDEwICsxNjAzLDEwIEBAIEF0dGFjaG1lbnRJbmZvOjpBdHRhY2htZW50SW5mbyhj b25zdCBSZW5kZXJBdHRhY2htZW50JiBhdHRhY2htZW50KQogICAgICAgICAgICAgeU9mZnNldCAr PSBpY29uUmVjdC5oZWlnaHQoKSArIGF0dGFjaG1lbnRJdGVtTWFyZ2luOwogICAgICAgICB9CiAg ICAgfSBlbHNlCi0gICAgICAgIGJ1aWxkU2luZ2xlTGluZShhY3Rpb24sIGF0dGFjaG1lbnRBY3Rp b25Gb250KCkuZ2V0KCksIGF0dGFjaG1lbnRBY3Rpb25Db2xvcihhdHRhY2htZW50KSk7CisgICAg ICAgIGJ1aWxkV3JhcHBlZExpbmVzKGFjdGlvbiwgYXR0YWNobWVudEFjdGlvbkZvbnQoKS5nZXQo KSwgYXR0YWNobWVudEFjdGlvbkNvbG9yKGF0dGFjaG1lbnQpLCBhdHRhY2htZW50V3JhcHBpbmdU ZXh0TWF4aW11bUxpbmVDb3VudCk7CiAKICAgICBib29sIGZvcmNlU2luZ2xlTGluZVRpdGxlID0g IWFjdGlvbi5pc0VtcHR5KCkgfHwgIXN1YnRpdGxlLmlzRW1wdHkoKSB8fCBoYXNQcm9ncmVzczsK LSAgICBidWlsZFRpdGxlTGluZXMoYXR0YWNobWVudCwgZm9yY2VTaW5nbGVMaW5lVGl0bGUgPyAx IDogYXR0YWNobWVudFRpdGxlTWF4aW11bUxpbmVDb3VudCk7CisgICAgYnVpbGRXcmFwcGVkTGlu ZXModGl0bGUsIGF0dGFjaG1lbnRUaXRsZUZvbnQoKS5nZXQoKSwgYXR0YWNobWVudFRpdGxlQ29s b3IoKSwgZm9yY2VTaW5nbGVMaW5lVGl0bGUgPyAxIDogYXR0YWNobWVudFdyYXBwaW5nVGV4dE1h eGltdW1MaW5lQ291bnQpOwogICAgIGJ1aWxkU2luZ2xlTGluZShzdWJ0aXRsZSwgYXR0YWNobWVu dFN1YnRpdGxlRm9udCgpLmdldCgpLCBhdHRhY2htZW50U3VidGl0bGVDb2xvcigpKTsKIAogICAg IGlmICghbGluZXMuaXNFbXB0eSgpKSB7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggODUwY2YwYTkxODZkZTQwMDM5ZTBlYmI1 NDlhMmVmOGE5OGI4Njc4YS4uMTQ4ZTlhZjBmNmIyOGJkNTJmZjdmMzY5ZGU2NjI5YWI4NTdmMDVl OSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0No YW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE2LTA4LTAxICBUaW0gSG9ydG9uICA8dGltb3Ro eV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIDxhdHRhY2htZW50PiBhY3Rpb24gbGFiZWwg ZG9lc24ndCB3cmFwLCBidXQgbmVlZHMgdG8gZm9yIHNvbWUgbG9jYWxpemF0aW9ucworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTYwNDMxCisgICAgICAg IDxyZGFyOi8vcHJvYmxlbS8yNzUyNjQ2ND4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIGZhc3QvYXR0YWNobWVudC9hdHRhY2htZW50LXdyYXBwaW5n LWFjdGlvbi1leHBlY3RlZC1taXNtYXRjaC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2F0 dGFjaG1lbnQvYXR0YWNobWVudC13cmFwcGluZy1hY3Rpb24uaHRtbDogQWRkZWQuCisgICAgICAg IEFkZCBhIHRlc3QgdGhhdCBlbnN1cmVzIHRoYXQgdGhlIGFjdGlvbiBsYWJlbCB3cmFwcyBieSBm aWxsaW5nIG9uZSB3aXRoCisgICAgICAgIG5vbi1icmVha2luZyBhbmQgYnJlYWtpbmcgc3BhY2Vz LCB3aGljaCB3aWxsIHdyYXAgb250byB0d28gbGluZXMsIGFuZCBvbmUKKyAgICAgICAgd2l0aCBq dXN0IGEgc2luZ2xlIHNwYWNlLCB3aGljaCB3aWxsIGFsd2F5cyBmaXQgaW4gb25lIGxpbmUsIGFu ZCBlbnN1cmluZworICAgICAgICB0aGF0IHRoZXkgZG8gbm90IG1hdGNoLgorCiAyMDE2LTA4LTAx ICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9O KHIxOTg5NDMpOiBkcm9wLWRvd24gbWVudSBuYXZpZ2F0aW9uIG9uIGZpZGRsZXZpZGVvLmNvbSBk b2Vzbid0IGFwcGVhciBvbiBpT1MsIHdvcmtzIG9uIE9TIFgKZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL2Zhc3QvYXR0YWNobWVudC9hdHRhY2htZW50LXdyYXBwaW5nLWFjdGlvbi1leHBlY3RlZC1t aXNtYXRjaC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9hdHRhY2htZW50L2F0dGFjaG1lbnQtd3Jh cHBpbmctYWN0aW9uLWV4cGVjdGVkLW1pc21hdGNoLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQK aW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMWQ4NmE5YzM2 MTAwYzNlNWMyY2VjYTE4MjUyNmNkNDliZmRlMTBmNgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91 dFRlc3RzL2Zhc3QvYXR0YWNobWVudC9hdHRhY2htZW50LXdyYXBwaW5nLWFjdGlvbi1leHBlY3Rl ZC1taXNtYXRjaC5odG1sCkBAIC0wLDAgKzEsMTAgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+ Cis8c2NyaXB0PgorICAgIGlmICh3aW5kb3cuaW50ZXJuYWxzKQorICAgICAgICB3aW5kb3cuaW50 ZXJuYWxzLnNldHRpbmdzLnNldEF0dGFjaG1lbnRFbGVtZW50RW5hYmxlZCh0cnVlKQorPC9zY3Jp cHQ+Cis8Ym9keT4KKzxhdHRhY2htZW50IGFjdGlvbj0iICIgdGl0bGU9InRpdGxlIj48L2F0dGFj aG1lbnQ+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2F0 dGFjaG1lbnQvYXR0YWNobWVudC13cmFwcGluZy1hY3Rpb24uaHRtbCBiL0xheW91dFRlc3RzL2Zh c3QvYXR0YWNobWVudC9hdHRhY2htZW50LXdyYXBwaW5nLWFjdGlvbi5odG1sCm5ldyBmaWxlIG1v ZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAu LmQ2M2RiZTM5NmNiYzcxMzE1ZTZjZWI0OTFiMmIyNWFkNDJkZTk3YjQKLS0tIC9kZXYvbnVsbAor KysgYi9MYXlvdXRUZXN0cy9mYXN0L2F0dGFjaG1lbnQvYXR0YWNobWVudC13cmFwcGluZy1hY3Rp b24uaHRtbApAQCAtMCwwICsxLDEwIEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPHNjcmlw dD4KKyAgICBpZiAod2luZG93LmludGVybmFscykKKyAgICAgICAgd2luZG93LmludGVybmFscy5z ZXR0aW5ncy5zZXRBdHRhY2htZW50RWxlbWVudEVuYWJsZWQodHJ1ZSkKKzwvc2NyaXB0PgorPGJv ZHk+Cis8YXR0YWNobWVudCBhY3Rpb249IiZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJz cDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNw OyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7 ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsg Jm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAm bmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZu YnNwOyAmbmJzcDsgJm5ic3A7ICIgdGl0bGU9InRpdGxlIj48L2F0dGFjaG1lbnQ+Cis8L2JvZHk+ Cis8L2h0bWw+Cg== 285050 2016-08-01 16:02:45 -0700 2016-08-01 17:26:30 -0700 Patch bug-160431-20160801160124.patch text/plain 11536 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjAzOTkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWExOWM5NzY3NzQ1MGI0 ZDAyODQzMTM5ZTJhMzZkN2E4YjlkMmRhMi4uZDU1MWViNjU5ZWI5MjU0M2JmNDZiN2ExMDdkYWRj ZmJhNGI2ZjI1ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE2LTA4LTAxICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIDxhdHRhY2htZW50 PiBhY3Rpb24gbGFiZWwgZG9lc24ndCB3cmFwLCBidXQgbmVlZHMgdG8gZm9yIHNvbWUgbG9jYWxp emF0aW9ucworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTYwNDMxCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yNzUyNjQ2ND4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0OiBmYXN0L2F0dGFjaG1lbnQv YXR0YWNobWVudC13cmFwcGluZy1hY3Rpb24uaHRtbAorCisgICAgICAgICogcmVuZGVyaW5nL1Jl bmRlclRoZW1lSU9TLm1tOgorICAgICAgICAoV2ViQ29yZTo6QXR0YWNobWVudEluZm86OmJ1aWxk V3JhcHBlZExpbmVzKToKKyAgICAgICAgKFdlYkNvcmU6OkF0dGFjaG1lbnRJbmZvOjpBdHRhY2ht ZW50SW5mbyk6CisgICAgICAgIChXZWJDb3JlOjpBdHRhY2htZW50SW5mbzo6YnVpbGRUaXRsZUxp bmVzKTogRGVsZXRlZC4KKyAgICAgICAgUmV3b3JrIGJ1aWxkVGl0bGVMaW5lcyBpbnRvIGJ1aWxk V3JhcHBlZExpbmVzIHNvIHRoYXQgd2UgaGF2ZSBhCisgICAgICAgIGdlbmVyaWMgd2F5IHRvIGFk ZCBsaW5lcyB0aGF0IHdyYXAgdXAgdG8gTiBsaW5lcyBhbmQgdGhlbiBjZW50ZXItdHJ1bmNhdGUu CisKKyAgICAgICAgTWFrZSB1c2Ugb2YgaXQgZm9yIHRoZSBhY3Rpb24gdGV4dCwgYW5kIGZvbGxv dyB0aGUgc2FtZSBydWxlcy93aWR0aCBhcworICAgICAgICB0aGUgdGl0bGUgdGV4dCBhbHJlYWR5 IGRvZXMuCisKIDIwMTYtMDgtMDEgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNv bT4KIAogICAgICAgICBGaXggYnVpbGQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyVGhlbWVJT1MubW0gYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy VGhlbWVJT1MubW0KaW5kZXggZGQyM2JhNzQ2MDQ1YmNiMGRlODk4M2EyY2NlZTEyZWE0OTJmNTVk My4uMWQwZjkxNzNkMDU2M2MxOTYzMDNmMjYxMTQ2OTkzOWZjYTJhMGQ0ZCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lSU9TLm1tCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUlPUy5tbQpAQCAtMTM4MCw4ICsxMzgwLDggQEAg Y29uc3QgQ0dGbG9hdCBhdHRhY2htZW50SWNvblNpemUgPSA0ODsKIAogY29uc3QgQ0dGbG9hdCBh dHRhY2htZW50SXRlbU1hcmdpbiA9IDg7CiAKLWNvbnN0IENHRmxvYXQgYXR0YWNobWVudFRpdGxl TWF4aW11bVdpZHRoID0gMTQwOwotY29uc3QgQ0ZJbmRleCBhdHRhY2htZW50VGl0bGVNYXhpbXVt TGluZUNvdW50ID0gMjsKK2NvbnN0IENHRmxvYXQgYXR0YWNobWVudFdyYXBwaW5nVGV4dE1heGlt dW1XaWR0aCA9IDE0MDsKK2NvbnN0IENGSW5kZXggYXR0YWNobWVudFdyYXBwaW5nVGV4dE1heGlt dW1MaW5lQ291bnQgPSAyOwogCiBzdGF0aWMgUmV0YWluUHRyPENURm9udFJlZj4gYXR0YWNobWVu dEFjdGlvbkZvbnQoKQogewpAQCAtMTQzMiw3ICsxNDMyLDcgQEAgc3RydWN0IEF0dGFjaG1lbnRJ bmZvIHsKICAgICBDR0Zsb2F0IGNvbnRlbnRZT3JpZ2luIHsgMCB9OwogCiBwcml2YXRlOgotICAg IHZvaWQgYnVpbGRUaXRsZUxpbmVzKGNvbnN0IFJlbmRlckF0dGFjaG1lbnQmLCB1bnNpZ25lZCBt YXhpbXVtTGluZUNvdW50KTsKKyAgICB2b2lkIGJ1aWxkV3JhcHBlZExpbmVzKGNvbnN0IFN0cmlu ZyYsIENURm9udFJlZiwgVUlDb2xvciAqLCB1bnNpZ25lZCBtYXhpbXVtTGluZUNvdW50KTsKICAg ICB2b2lkIGJ1aWxkU2luZ2xlTGluZShjb25zdCBTdHJpbmcmLCBDVEZvbnRSZWYsIFVJQ29sb3Ig Kik7CiAKICAgICB2b2lkIGFkZExpbmUoQ1RMaW5lUmVmKTsKQEAgLTE0NTMsMjggKzE0NTMsMjUg QEAgdm9pZCBBdHRhY2htZW50SW5mbzo6YWRkTGluZShDVExpbmVSZWYgbGluZSkKICAgICBsaW5l cy5hcHBlbmQobGFiZWxMaW5lKTsKIH0KIAotdm9pZCBBdHRhY2htZW50SW5mbzo6YnVpbGRUaXRs ZUxpbmVzKGNvbnN0IFJlbmRlckF0dGFjaG1lbnQmIGF0dGFjaG1lbnQsIHVuc2lnbmVkIG1heGlt dW1MaW5lQ291bnQpCit2b2lkIEF0dGFjaG1lbnRJbmZvOjpidWlsZFdyYXBwZWRMaW5lcyhjb25z dCBTdHJpbmcmIHRleHQsIENURm9udFJlZiBmb250LCBVSUNvbG9yICpjb2xvciwgdW5zaWduZWQg bWF4aW11bUxpbmVDb3VudCkKIHsKLSAgICBSZXRhaW5QdHI8Q1RGb250UmVmPiBmb250ID0gYXR0 YWNobWVudFRpdGxlRm9udCgpOwotCi0gICAgU3RyaW5nIHRpdGxlID0gYXR0YWNobWVudC5hdHRh Y2htZW50RWxlbWVudCgpLmF0dGFjaG1lbnRUaXRsZSgpOwotICAgIGlmICh0aXRsZS5pc0VtcHR5 KCkpCisgICAgaWYgKHRleHQuaXNFbXB0eSgpKQogICAgICAgICByZXR1cm47CiAKICAgICBOU0Rp Y3Rpb25hcnkgKnRleHRBdHRyaWJ1dGVzID0gQHsKLSAgICAgICAgKGlkKWtDVEZvbnRBdHRyaWJ1 dGVOYW1lOiAoaWQpZm9udC5nZXQoKSwKLSAgICAgICAgKGlkKWtDVEZvcmVncm91bmRDb2xvckF0 dHJpYnV0ZU5hbWU6IGF0dGFjaG1lbnRUaXRsZUNvbG9yKCkKKyAgICAgICAgKGlkKWtDVEZvbnRB dHRyaWJ1dGVOYW1lOiAoaWQpZm9udCwKKyAgICAgICAgKGlkKWtDVEZvcmVncm91bmRDb2xvckF0 dHJpYnV0ZU5hbWU6IGNvbG9yCiAgICAgfTsKLSAgICBSZXRhaW5QdHI8TlNBdHRyaWJ1dGVkU3Ry aW5nPiBhdHRyaWJ1dGVkVGl0bGUgPSBhZG9wdE5TKFtbTlNBdHRyaWJ1dGVkU3RyaW5nIGFsbG9j XSBpbml0V2l0aFN0cmluZzp0aXRsZSBhdHRyaWJ1dGVzOnRleHRBdHRyaWJ1dGVzXSk7Ci0gICAg UmV0YWluUHRyPENURnJhbWVzZXR0ZXJSZWY+IHRpdGxlRnJhbWVzZXR0ZXIgPSBhZG9wdENGKENU RnJhbWVzZXR0ZXJDcmVhdGVXaXRoQXR0cmlidXRlZFN0cmluZygoQ0ZBdHRyaWJ1dGVkU3RyaW5n UmVmKWF0dHJpYnV0ZWRUaXRsZS5nZXQoKSkpOworICAgIFJldGFpblB0cjxOU0F0dHJpYnV0ZWRT dHJpbmc+IGF0dHJpYnV0ZWRUZXh0ID0gYWRvcHROUyhbW05TQXR0cmlidXRlZFN0cmluZyBhbGxv Y10gaW5pdFdpdGhTdHJpbmc6dGV4dCBhdHRyaWJ1dGVzOnRleHRBdHRyaWJ1dGVzXSk7CisgICAg UmV0YWluUHRyPENURnJhbWVzZXR0ZXJSZWY+IGZyYW1lc2V0dGVyID0gYWRvcHRDRihDVEZyYW1l c2V0dGVyQ3JlYXRlV2l0aEF0dHJpYnV0ZWRTdHJpbmcoKENGQXR0cmlidXRlZFN0cmluZ1JlZilh dHRyaWJ1dGVkVGV4dC5nZXQoKSkpOwogCiAgICAgQ0ZSYW5nZSBmaXRSYW5nZTsKLSAgICBDR1Np emUgdGl0bGVUZXh0U2l6ZSA9IENURnJhbWVzZXR0ZXJTdWdnZXN0RnJhbWVTaXplV2l0aENvbnN0 cmFpbnRzKHRpdGxlRnJhbWVzZXR0ZXIuZ2V0KCksIENGUmFuZ2VNYWtlKDAsIDApLCBudWxscHRy LCBDR1NpemVNYWtlKGF0dGFjaG1lbnRUaXRsZU1heGltdW1XaWR0aCwgQ0dGTE9BVF9NQVgpLCAm Zml0UmFuZ2UpOworICAgIENHU2l6ZSB0ZXh0U2l6ZSA9IENURnJhbWVzZXR0ZXJTdWdnZXN0RnJh bWVTaXplV2l0aENvbnN0cmFpbnRzKGZyYW1lc2V0dGVyLmdldCgpLCBDRlJhbmdlTWFrZSgwLCAw KSwgbnVsbHB0ciwgQ0dTaXplTWFrZShhdHRhY2htZW50V3JhcHBpbmdUZXh0TWF4aW11bVdpZHRo LCBDR0ZMT0FUX01BWCksICZmaXRSYW5nZSk7CiAKLSAgICBSZXRhaW5QdHI8Q0dQYXRoUmVmPiB0 aXRsZVBhdGggPSBhZG9wdENGKENHUGF0aENyZWF0ZVdpdGhSZWN0KENHUmVjdE1ha2UoMCwgMCwg dGl0bGVUZXh0U2l6ZS53aWR0aCwgdGl0bGVUZXh0U2l6ZS5oZWlnaHQpLCBudWxscHRyKSk7Ci0g ICAgUmV0YWluUHRyPENURnJhbWVSZWY+IHRpdGxlRnJhbWUgPSBhZG9wdENGKENURnJhbWVzZXR0 ZXJDcmVhdGVGcmFtZSh0aXRsZUZyYW1lc2V0dGVyLmdldCgpLCBmaXRSYW5nZSwgdGl0bGVQYXRo LmdldCgpLCBudWxscHRyKSk7CisgICAgUmV0YWluUHRyPENHUGF0aFJlZj4gdGV4dFBhdGggPSBh ZG9wdENGKENHUGF0aENyZWF0ZVdpdGhSZWN0KENHUmVjdE1ha2UoMCwgMCwgdGV4dFNpemUud2lk dGgsIHRleHRTaXplLmhlaWdodCksIG51bGxwdHIpKTsKKyAgICBSZXRhaW5QdHI8Q1RGcmFtZVJl Zj4gdGV4dEZyYW1lID0gYWRvcHRDRihDVEZyYW1lc2V0dGVyQ3JlYXRlRnJhbWUoZnJhbWVzZXR0 ZXIuZ2V0KCksIGZpdFJhbmdlLCB0ZXh0UGF0aC5nZXQoKSwgbnVsbHB0cikpOwogCi0gICAgQ0ZB cnJheVJlZiBjdExpbmVzID0gQ1RGcmFtZUdldExpbmVzKHRpdGxlRnJhbWUuZ2V0KCkpOworICAg IENGQXJyYXlSZWYgY3RMaW5lcyA9IENURnJhbWVHZXRMaW5lcyh0ZXh0RnJhbWUuZ2V0KCkpOwog ICAgIENGSW5kZXggbGluZUNvdW50ID0gQ0ZBcnJheUdldENvdW50KGN0TGluZXMpOwogICAgIGlm ICghbGluZUNvdW50KQogICAgICAgICByZXR1cm47CkBAIC0xNDkyLDEyICsxNDg5LDEyIEBAIHZv aWQgQXR0YWNobWVudEluZm86OmJ1aWxkVGl0bGVMaW5lcyhjb25zdCBSZW5kZXJBdHRhY2htZW50 JiBhdHRhY2htZW50LCB1bnNpZ25lCiAgICAgLy8gQ29tYmluZSBpdCBpbnRvIG9uZSBsYXN0IGxp bmUsIGFuZCBjZW50ZXItdHJ1bmNhdGUgaXQuCiAgICAgQ1RMaW5lUmVmIGZpcnN0UmVtYWluaW5n TGluZSA9IChDVExpbmVSZWYpQ0ZBcnJheUdldFZhbHVlQXRJbmRleChjdExpbmVzLCBsaW5lSW5k ZXgpOwogICAgIENGSW5kZXggcmVtYWluaW5nUmFuZ2VTdGFydCA9IENUTGluZUdldFN0cmluZ1Jh bmdlKGZpcnN0UmVtYWluaW5nTGluZSkubG9jYXRpb247Ci0gICAgTlNSYW5nZSByZW1haW5pbmdS YW5nZSA9IE5TTWFrZVJhbmdlKHJlbWFpbmluZ1JhbmdlU3RhcnQsIFthdHRyaWJ1dGVkVGl0bGUg bGVuZ3RoXSAtIHJlbWFpbmluZ1JhbmdlU3RhcnQpOwotICAgIE5TQXR0cmlidXRlZFN0cmluZyAq cmVtYWluaW5nU3RyaW5nID0gW2F0dHJpYnV0ZWRUaXRsZSBhdHRyaWJ1dGVkU3Vic3RyaW5nRnJv bVJhbmdlOnJlbWFpbmluZ1JhbmdlXTsKKyAgICBOU1JhbmdlIHJlbWFpbmluZ1JhbmdlID0gTlNN YWtlUmFuZ2UocmVtYWluaW5nUmFuZ2VTdGFydCwgW2F0dHJpYnV0ZWRUZXh0IGxlbmd0aF0gLSBy ZW1haW5pbmdSYW5nZVN0YXJ0KTsKKyAgICBOU0F0dHJpYnV0ZWRTdHJpbmcgKnJlbWFpbmluZ1N0 cmluZyA9IFthdHRyaWJ1dGVkVGV4dCBhdHRyaWJ1dGVkU3Vic3RyaW5nRnJvbVJhbmdlOnJlbWFp bmluZ1JhbmdlXTsKICAgICBSZXRhaW5QdHI8Q1RMaW5lUmVmPiByZW1haW5pbmdMaW5lID0gYWRv cHRDRihDVExpbmVDcmVhdGVXaXRoQXR0cmlidXRlZFN0cmluZygoQ0ZBdHRyaWJ1dGVkU3RyaW5n UmVmKXJlbWFpbmluZ1N0cmluZykpOwogICAgIFJldGFpblB0cjxOU0F0dHJpYnV0ZWRTdHJpbmc+ IGVsbGlwc2lzU3RyaW5nID0gYWRvcHROUyhbW05TQXR0cmlidXRlZFN0cmluZyBhbGxvY10gaW5p dFdpdGhTdHJpbmc6QCJcdTIwMjYiIGF0dHJpYnV0ZXM6dGV4dEF0dHJpYnV0ZXNdKTsKICAgICBS ZXRhaW5QdHI8Q1RMaW5lUmVmPiBlbGxpcHNpc0xpbmUgPSBhZG9wdENGKENUTGluZUNyZWF0ZVdp dGhBdHRyaWJ1dGVkU3RyaW5nKChDRkF0dHJpYnV0ZWRTdHJpbmdSZWYpZWxsaXBzaXNTdHJpbmcu Z2V0KCkpKTsKLSAgICBSZXRhaW5QdHI8Q1RMaW5lUmVmPiB0cnVuY2F0ZWRMaW5lID0gYWRvcHRD RihDVExpbmVDcmVhdGVUcnVuY2F0ZWRMaW5lKHJlbWFpbmluZ0xpbmUuZ2V0KCksIGF0dGFjaG1l bnRUaXRsZU1heGltdW1XaWR0aCwga0NUTGluZVRydW5jYXRpb25NaWRkbGUsIGVsbGlwc2lzTGlu ZS5nZXQoKSkpOworICAgIFJldGFpblB0cjxDVExpbmVSZWY+IHRydW5jYXRlZExpbmUgPSBhZG9w dENGKENUTGluZUNyZWF0ZVRydW5jYXRlZExpbmUocmVtYWluaW5nTGluZS5nZXQoKSwgYXR0YWNo bWVudFdyYXBwaW5nVGV4dE1heGltdW1XaWR0aCwga0NUTGluZVRydW5jYXRpb25NaWRkbGUsIGVs bGlwc2lzTGluZS5nZXQoKSkpOwogCiAgICAgaWYgKCF0cnVuY2F0ZWRMaW5lKQogICAgICAgICB0 cnVuY2F0ZWRMaW5lID0gcmVtYWluaW5nTGluZTsKQEAgLTE1ODcsNiArMTU4NCw3IEBAIEF0dGFj aG1lbnRJbmZvOjpBdHRhY2htZW50SW5mbyhjb25zdCBSZW5kZXJBdHRhY2htZW50JiBhdHRhY2ht ZW50KQogCiAgICAgaGFzUHJvZ3Jlc3MgPSBnZXRBdHRhY2htZW50UHJvZ3Jlc3MoYXR0YWNobWVu dCwgcHJvZ3Jlc3MpOwogCisgICAgU3RyaW5nIHRpdGxlID0gYXR0YWNobWVudC5hdHRhY2htZW50 RWxlbWVudCgpLmF0dGFjaG1lbnRUaXRsZSgpOwogICAgIFN0cmluZyBhY3Rpb24gPSBhdHRhY2ht ZW50LmF0dGFjaG1lbnRFbGVtZW50KCkuYXR0cmlidXRlV2l0aG91dFN5bmNocm9uaXphdGlvbihh Y3Rpb25BdHRyKTsKICAgICBTdHJpbmcgc3VidGl0bGUgPSBhdHRhY2htZW50LmF0dGFjaG1lbnRF bGVtZW50KCkuYXR0cmlidXRlV2l0aG91dFN5bmNocm9uaXphdGlvbihzdWJ0aXRsZUF0dHIpOwog CkBAIC0xNjA1LDEwICsxNjAzLDEwIEBAIEF0dGFjaG1lbnRJbmZvOjpBdHRhY2htZW50SW5mbyhj b25zdCBSZW5kZXJBdHRhY2htZW50JiBhdHRhY2htZW50KQogICAgICAgICAgICAgeU9mZnNldCAr PSBpY29uUmVjdC5oZWlnaHQoKSArIGF0dGFjaG1lbnRJdGVtTWFyZ2luOwogICAgICAgICB9CiAg ICAgfSBlbHNlCi0gICAgICAgIGJ1aWxkU2luZ2xlTGluZShhY3Rpb24sIGF0dGFjaG1lbnRBY3Rp b25Gb250KCkuZ2V0KCksIGF0dGFjaG1lbnRBY3Rpb25Db2xvcihhdHRhY2htZW50KSk7CisgICAg ICAgIGJ1aWxkV3JhcHBlZExpbmVzKGFjdGlvbiwgYXR0YWNobWVudEFjdGlvbkZvbnQoKS5nZXQo KSwgYXR0YWNobWVudEFjdGlvbkNvbG9yKGF0dGFjaG1lbnQpLCBhdHRhY2htZW50V3JhcHBpbmdU ZXh0TWF4aW11bUxpbmVDb3VudCk7CiAKICAgICBib29sIGZvcmNlU2luZ2xlTGluZVRpdGxlID0g IWFjdGlvbi5pc0VtcHR5KCkgfHwgIXN1YnRpdGxlLmlzRW1wdHkoKSB8fCBoYXNQcm9ncmVzczsK LSAgICBidWlsZFRpdGxlTGluZXMoYXR0YWNobWVudCwgZm9yY2VTaW5nbGVMaW5lVGl0bGUgPyAx IDogYXR0YWNobWVudFRpdGxlTWF4aW11bUxpbmVDb3VudCk7CisgICAgYnVpbGRXcmFwcGVkTGlu ZXModGl0bGUsIGF0dGFjaG1lbnRUaXRsZUZvbnQoKS5nZXQoKSwgYXR0YWNobWVudFRpdGxlQ29s b3IoKSwgZm9yY2VTaW5nbGVMaW5lVGl0bGUgPyAxIDogYXR0YWNobWVudFdyYXBwaW5nVGV4dE1h eGltdW1MaW5lQ291bnQpOwogICAgIGJ1aWxkU2luZ2xlTGluZShzdWJ0aXRsZSwgYXR0YWNobWVu dFN1YnRpdGxlRm9udCgpLmdldCgpLCBhdHRhY2htZW50U3VidGl0bGVDb2xvcigpKTsKIAogICAg IGlmICghbGluZXMuaXNFbXB0eSgpKSB7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggODUwY2YwYTkxODZkZTQwMDM5ZTBlYmI1 NDlhMmVmOGE5OGI4Njc4YS4uMTQ4ZTlhZjBmNmIyOGJkNTJmZjdmMzY5ZGU2NjI5YWI4NTdmMDVl OSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0No YW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE2LTA4LTAxICBUaW0gSG9ydG9uICA8dGltb3Ro eV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIDxhdHRhY2htZW50PiBhY3Rpb24gbGFiZWwg ZG9lc24ndCB3cmFwLCBidXQgbmVlZHMgdG8gZm9yIHNvbWUgbG9jYWxpemF0aW9ucworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTYwNDMxCisgICAgICAg IDxyZGFyOi8vcHJvYmxlbS8yNzUyNjQ2ND4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIGZhc3QvYXR0YWNobWVudC9hdHRhY2htZW50LXdyYXBwaW5n LWFjdGlvbi1leHBlY3RlZC1taXNtYXRjaC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2F0 dGFjaG1lbnQvYXR0YWNobWVudC13cmFwcGluZy1hY3Rpb24uaHRtbDogQWRkZWQuCisgICAgICAg IEFkZCBhIHRlc3QgdGhhdCBlbnN1cmVzIHRoYXQgdGhlIGFjdGlvbiBsYWJlbCB3cmFwcyBieSBm aWxsaW5nIG9uZSB3aXRoCisgICAgICAgIG5vbi1icmVha2luZyBhbmQgYnJlYWtpbmcgc3BhY2Vz LCB3aGljaCB3aWxsIHdyYXAgb250byB0d28gbGluZXMsIGFuZCBvbmUKKyAgICAgICAgd2l0aCBq dXN0IGEgc2luZ2xlIHNwYWNlLCB3aGljaCB3aWxsIGFsd2F5cyBmaXQgaW4gb25lIGxpbmUsIGFu ZCBlbnN1cmluZworICAgICAgICB0aGF0IHRoZXkgZG8gbm90IG1hdGNoLgorCiAyMDE2LTA4LTAx ICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9O KHIxOTg5NDMpOiBkcm9wLWRvd24gbWVudSBuYXZpZ2F0aW9uIG9uIGZpZGRsZXZpZGVvLmNvbSBk b2Vzbid0IGFwcGVhciBvbiBpT1MsIHdvcmtzIG9uIE9TIFgKZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9UZXN0RXhwZWN0YXRpb25zCmluZGV4 IDRmMzRlYWY3ZTY4ZWM2MTM3MDQzMDEyY2I1OTVkOGRkOWVjNzI5NTMuLjc5NzczZWM4NmFjMzg1 N2FiYWI5MWJiMjQ0ZTY4ODE4ZjZiMjZhODkgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL1Rlc3RF eHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucwpAQCAtNTgsNiAr NTgsOSBAQCBmYXN0L2hhcm5lc3MvY29uY3VycmVudC11aS1zaWRlLXNjcmlwdHMuaHRtbCBbIFNr aXAgXQogIyBUaGlzIHRlc3Qgb25seSBtYWtlcyBzZW5zZSBvbiBNYWMKIGZhc3QvYXR0YWNobWVu dC9hdHRhY2htZW50LXN1YnRpdGxlLXJlc2l6ZS5odG1sCiAKKyMgVGhpcyB0ZXN0IG9ubHkgbWFr ZXMgc2Vuc2Ugb24gaU9TCitmYXN0L2F0dGFjaG1lbnQvYXR0YWNobWVudC13cmFwcGluZy1hY3Rp b24uaHRtbAorCiAjLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vCiAjIEVuZCBwbGF0 Zm9ybS1zcGVjaWZpYyB0ZXN0cy4KICMvLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8K ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvYXR0YWNobWVudC9hdHRhY2htZW50LXdyYXBw aW5nLWFjdGlvbi1leHBlY3RlZC1taXNtYXRjaC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9hdHRh Y2htZW50L2F0dGFjaG1lbnQtd3JhcHBpbmctYWN0aW9uLWV4cGVjdGVkLW1pc21hdGNoLmh0bWwK bmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMC4uMWQ4NmE5YzM2MTAwYzNlNWMyY2VjYTE4MjUyNmNkNDliZmRlMTBmNgotLS0g L2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvYXR0YWNobWVudC9hdHRhY2htZW50LXdy YXBwaW5nLWFjdGlvbi1leHBlY3RlZC1taXNtYXRjaC5odG1sCkBAIC0wLDAgKzEsMTAgQEAKKzwh RE9DVFlQRSBodG1sPgorPGh0bWw+Cis8c2NyaXB0PgorICAgIGlmICh3aW5kb3cuaW50ZXJuYWxz KQorICAgICAgICB3aW5kb3cuaW50ZXJuYWxzLnNldHRpbmdzLnNldEF0dGFjaG1lbnRFbGVtZW50 RW5hYmxlZCh0cnVlKQorPC9zY3JpcHQ+Cis8Ym9keT4KKzxhdHRhY2htZW50IGFjdGlvbj0iICIg dGl0bGU9InRpdGxlIj48L2F0dGFjaG1lbnQ+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9mYXN0L2F0dGFjaG1lbnQvYXR0YWNobWVudC13cmFwcGluZy1hY3Rpb24u aHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvYXR0YWNobWVudC9hdHRhY2htZW50LXdyYXBwaW5nLWFj dGlvbi5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAuLmQ2M2RiZTM5NmNiYzcxMzE1ZTZjZWI0OTFiMmIyNWFkNDJk ZTk3YjQKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2F0dGFjaG1lbnQvYXR0 YWNobWVudC13cmFwcGluZy1hY3Rpb24uaHRtbApAQCAtMCwwICsxLDEwIEBACis8IURPQ1RZUEUg aHRtbD4KKzxodG1sPgorPHNjcmlwdD4KKyAgICBpZiAod2luZG93LmludGVybmFscykKKyAgICAg ICAgd2luZG93LmludGVybmFscy5zZXR0aW5ncy5zZXRBdHRhY2htZW50RWxlbWVudEVuYWJsZWQo dHJ1ZSkKKzwvc2NyaXB0PgorPGJvZHk+Cis8YXR0YWNobWVudCBhY3Rpb249IiZuYnNwOyAmbmJz cDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNw OyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7 ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsg Jm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAm bmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICZu YnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsgJm5ic3A7ICIgdGl0bGU9InRpdGxlIj48 L2F0dGFjaG1lbnQ+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9w bGF0Zm9ybS9pb3Mtc2ltdWxhdG9yL1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9wbGF0 Zm9ybS9pb3Mtc2ltdWxhdG9yL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggMGM1NzlkNDBiMDcxZWY0 YjQ4ZThjYzA5ZGU3ODI4MmI4OWQyZTFkNy4uNmNkZTlmZGJjNTY1MDMzOWJiOWU2NDFhNjVmZTM0 MWFkMmFiYWYyYiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vaW9zLXNpbXVsYXRv ci9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy1zaW11bGF0 b3IvVGVzdEV4cGVjdGF0aW9ucwpAQCAtMzE1OCwzICszMTU4LDUgQEAgbWVkaWEvdHJhY2svdmlk ZW8tdHJhY2stYWx0ZXJuYXRlLWdyb3Vwcy5odG1sIFsgRmFpbHVyZSBdCiBtZWRpYS9XM0MvYXVk aW8vY2FuUGxheVR5cGUvY2FuUGxheVR5cGVfc3VwcG9ydGVkX2J1dF9ub19jb2RlY3NfcGFyYW1l dGVyXzEuaHRtbCBbIEZhaWx1cmUgXQogCiBtZWRpYS92aWRlby1zZWVrLXRvLWN1cnJlbnQtdGlt ZS5odG1sIFsgRmFpbHVyZSBdCisKK2Zhc3QvYXR0YWNobWVudC9hdHRhY2htZW50LXdyYXBwaW5n LWFjdGlvbi5odG1sIFsgUGFzcyBdCg==