106581 2013-01-10 10:41:09 -0800 Rename GraphicsContext::addRoundedRectClip 2013-01-10 12:53:09 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P4 Enhancement --- 1 fmalita fmalita eric junov ojan.autocc senorblanco simon.fraser webkit.review.bot oldest_to_newest 804524 0 fmalita 2013-01-10 10:41:09 -0800 After removing addInnerRoundedRectClip, addRoundedRectClip is the only outlier among the other clip* GC methods. 804532 1 182167 fmalita 2013-01-10 10:45:27 -0800 Created attachment 182167 Patch 804536 2 182167 senorblanco 2013-01-10 10:53:00 -0800 Comment on attachment 182167 Patch This sounds good to me, but I'll leave it for a day or two to let other port maintainers chime in. 804626 3 182167 fmalita 2013-01-10 12:11:07 -0800 Comment on attachment 182167 Patch Thanks. 804654 4 182167 webkit.review.bot 2013-01-10 12:53:06 -0800 Comment on attachment 182167 Patch Clearing flags on attachment: 182167 Committed r139353: <http://trac.webkit.org/changeset/139353> 804655 5 webkit.review.bot 2013-01-10 12:53:09 -0800 All reviewed patches have been landed. Closing bug. 182167 2013-01-10 10:45:27 -0800 2013-01-10 12:53:04 -0800 Patch bug-106581-20130110134230.patch text/plain 20425 fmalita U3VidmVyc2lvbiBSZXZpc2lvbjogMTM5MzI2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjRlZWI1ZGNhZTUwMWFl ZTE0Mjc3MGU5N2MyMWRiM2M2ODI0YmM2NC4uYWE3MTQwOGNmNDA5ZjE2Y2Q2ZTEyMWJiMzA2OGEw Mzg4YTQ1M2ZhOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQzIEBACisyMDEzLTAxLTEwICBGbG9y aW4gTWFsaXRhICA8Zm1hbGl0YUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmVuYW1lIEdyYXBo aWNzQ29udGV4dDo6YWRkUm91bmRlZFJlY3RDbGlwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDY1ODEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIHBhdGNoIHJlbmFtZXMgR3JhcGhpY3NDb250ZXh0 OjphZGRSb3VuZGVkUmVjdENsaXAgdG8gY2xpcFJvdW5kZWRSZWN0IGZvciBjb25zaXN0ZW5jeQor ICAgICAgICB3aXRoIHRoZSBvdGhlciBHQyBjbGlwcGluZyBtZXRob2RzLgorCisgICAgICAgIE5v IG5ldyB0ZXN0czogbm8gZnVuY3Rpb25hbCBjaGFuZ2VzLgorCisgICAgICAgICogV2ViQ29yZS5v cmRlcjoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0OjpjbGlwUm91bmRlZFJlY3QpOgorICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5oOgorICAgICAgICAoR3Jh cGhpY3NDb250ZXh0KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9za2lhL0dyYXBoaWNz Q29udGV4dFNraWEuY3BwOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0OjpjbGlw Um91bmRlZFJlY3QpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3guY3BwOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyQm94OjpwYWludEJveERlY29yYXRpb25zKToKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlckJveDo6cHVzaENvbnRlbnRzQ2xpcCk6CisgICAgICAgICogcmVuZGVyaW5n L1JlbmRlckJveE1vZGVsT2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveE1v ZGVsT2JqZWN0OjpjbGlwUm91bmRlZElubmVyUmVjdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJCb3hNb2RlbE9iamVjdDo6cGFpbnRCb3JkZXIpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy Qm94TW9kZWxPYmplY3Q6OmRyYXdCb3hTaWRlRnJvbVBhdGgpOgorICAgICAgICAqIHJlbmRlcmlu Zy9SZW5kZXJMYXllci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6Y2xpcFRv UmVjdCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRoZW1lQ2hyb21pdW1XaW4uY3BwOgor ICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZUNocm9taXVt V2luOjpwYWludFRleHRGaWVsZEludGVybmFsKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVy VGhlbWVNYWNTaGFyZWQubW06CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZU1hY1NoYXJl ZDo6cGFpbnRNZW51TGlzdEJ1dHRvbkdyYWRpZW50cyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJUaGVtZU1hY1NoYXJlZDo6cGFpbnRTbGlkZXJUcmFjayk6CisgICAgICAgICogcmVuZGVyaW5n L1JlbmRlclRoZW1lU2FmYXJpLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lU2Fm YXJpOjpwYWludE1lbnVMaXN0QnV0dG9uR3JhZGllbnRzKToKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlclRoZW1lU2FmYXJpOjpwYWludFNsaWRlclRyYWNrKToKKyAgICAgICAgKiByZW5kZXJpbmcv UmVuZGVyVGhlbWVXaW5DRS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZVdpbkNF OjpwYWludFNlYXJjaEZpZWxkQ2FuY2VsQnV0dG9uKToKKwogMjAxMy0wMS0xMCAgVmljdG9yIENh cmJ1bmUgIDx2aWN0b3JAcm9zZWR1Lm9yZz4KIAogICAgICAgICBtZWRpYS92aWRlby1jb250cm9s cy1jYXB0aW9ucy5odG1sIGZhaWxzIGFmdGVyIGZpeGluZyBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTA1NTM2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9XZWJD b3JlLm9yZGVyIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5vcmRlcgppbmRleCAyY2I2ZDJlZmRm MmUzNzQ5MDJiOWQxMGE4NGUzODA5OWE1NDc2NzA2Li45YTEyMTBmMzQxOTNmMzBiOTYyNmU4ZjJh YWVhZWFjZDVmNDk2NGI0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLm9yZGVy CisrKyBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUub3JkZXIKQEAgLTE0MjkxLDcgKzE0MjkxLDcg QEAgX19aTjdXZWJDb3JlMTVHcmFwaGljc0NvbnRleHQxNWZpbGxSb3VuZGVkUmVjdEVSS05TXzE0 Um91bmRlZFJlY3RFUktOU181Q29sb3JFTlMKIF9fWk43V2ViQ29yZTE1R3JhcGhpY3NDb250ZXh0 MTVmaWxsUm91bmRlZFJlY3RFUktOU183SW50UmVjdEVSS05TXzdJbnRTaXplRVM2X1M2X1M2X1JL TlNfNUNvbG9yRU5TXzEwQ29sb3JTcGFjZUUKIF9fWk43V2ViQ29yZUwzOWJhY2tncm91bmRSZWN0 QWRqdXN0ZWRGb3JCbGVlZEF2b2lkYW5jZUVQTlNfMTVHcmFwaGljc0NvbnRleHRFUktOU183SW50 UmVjdEVOU18yNEJhY2tncm91bmRCbGVlZEF2b2lkYW5jZUUKIF9fWk43V2ViQ29yZTIwUmVuZGVy Qm94TW9kZWxPYmplY3QyNGdldEJhY2tncm91bmRSb3VuZGVkUmVjdEVSS05TXzdJbnRSZWN0RVBO U18xM0lubGluZUZsb3dCb3hFaWliYgotX19aTjdXZWJDb3JlMTVHcmFwaGljc0NvbnRleHQxOGFk ZFJvdW5kZWRSZWN0Q2xpcEVSS05TXzE0Um91bmRlZFJlY3RFCitfX1pON1dlYkNvcmUxNUdyYXBo aWNzQ29udGV4dDE1Y2xpcFJvdW5kZWRSZWN0RVJLTlNfMTRSb3VuZGVkUmVjdEUKIF9fWk4zV1RG OUhhc2hUYWJsZUlON1dlYkNvcmU3SW50U2l6ZUVTdDRwYWlySVMyX05TXzZSZWZQdHJJTlMxXzVJ bWFnZUVFRUVOU18xOFBhaXJGaXJzdEV4dHJhY3RvcklTN19FRU5TXzdJbnRIYXNoSVMyX0VFTlNf MTRQYWlySGFzaFRyYWl0c0lOU18xMEhhc2hUcmFpdHNJUzJfRUVOU0RfSVM2X0VFRUVTRV9FMTZs b29rdXBGb3JXcml0aW5nSVMyX05TXzIySWRlbnRpdHlIYXNoVHJhbnNsYXRvcklTMl9TN19TQl9F RUVFUzNfSVBTN19iRVJLVF8KIF9fWk4zV1RGOUhhc2hUYWJsZUlON1dlYkNvcmU3SW50U2l6ZUVT dDRwYWlySVMyX05TXzZSZWZQdHJJTlMxXzVJbWFnZUVFRUVOU18xOFBhaXJGaXJzdEV4dHJhY3Rv cklTN19FRU5TXzdJbnRIYXNoSVMyX0VFTlNfMTRQYWlySGFzaFRyYWl0c0lOU18xMEhhc2hUcmFp dHNJUzJfRUVOU0RfSVM2X0VFRUVTRV9FM2FkZElTMl9TNl9OU18xN0hhc2hNYXBUcmFuc2xhdG9y SVM3X1NHX1NCX0VFRUVTM19JTlNfMTdIYXNoVGFibGVJdGVyYXRvcklTMl9TN19TOV9TQl9TR19T RV9FRWJFUktUX1JLVDBfCiBfX1pOM1dURjlIYXNoVGFibGVJTjdXZWJDb3JlN0ludFNpemVFU3Q0 cGFpcklTMl9OU182UmVmUHRySU5TMV81SW1hZ2VFRUVFTlNfMThQYWlyRmlyc3RFeHRyYWN0b3JJ UzdfRUVOU183SW50SGFzaElTMl9FRU5TXzE0UGFpckhhc2hUcmFpdHNJTlNfMTBIYXNoVHJhaXRz SVMyX0VFTlNEX0lTNl9FRUVFU0VfRTRmaW5kSVMyX05TXzIySWRlbnRpdHlIYXNoVHJhbnNsYXRv cklTMl9TN19TQl9FRUVFTlNfMTdIYXNoVGFibGVJdGVyYXRvcklTMl9TN19TOV9TQl9TR19TRV9F RVJLVF8KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBo aWNzQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGlj c0NvbnRleHQuY3BwCmluZGV4IDBlN2ExYThjNTM3MDY5ODk3NWQ4MjZhZWQwNzFhYzMzMmIyM2I0 MDkuLmQ0ZDVjNDBhZjZmZjE2MGI0ZGUzMzU1MDM1ZDFmY2VmY2ZhZjM0ODAgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0LmNwcApA QCAtNjA1LDcgKzYwNSw3IEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpjbGlwKGNvbnN0IEludFJl Y3QmIHJlY3QpCiAjZW5kaWYKIAogI2lmICFVU0UoU0tJQSkKLXZvaWQgR3JhcGhpY3NDb250ZXh0 OjphZGRSb3VuZGVkUmVjdENsaXAoY29uc3QgUm91bmRlZFJlY3QmIHJlY3QpCit2b2lkIEdyYXBo aWNzQ29udGV4dDo6Y2xpcFJvdW5kZWRSZWN0KGNvbnN0IFJvdW5kZWRSZWN0JiByZWN0KQogewog ICAgIGlmIChwYWludGluZ0Rpc2FibGVkKCkpCiAgICAgICAgIHJldHVybjsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5oIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0LmgKaW5kZXggNDMy ODc1YWRiNmM2MzFhOGZkYjljMjMyODNkM2MwYTgyZDczZmJkNy4uOGUxMmUwOWQxMzZkMjdlNjdh MDY0OTNjN2Y0ZTljODY3ZjA5OTdiYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0LmgKQEAgLTM0Myw3ICszNDMsNyBAQCBuYW1lc3Bh Y2UgV2ViQ29yZSB7CiAKICAgICAgICAgdm9pZCBjbGlwKGNvbnN0IEludFJlY3QmKTsKICAgICAg ICAgdm9pZCBjbGlwKGNvbnN0IEZsb2F0UmVjdCYpOwotICAgICAgICB2b2lkIGFkZFJvdW5kZWRS ZWN0Q2xpcChjb25zdCBSb3VuZGVkUmVjdCYpOworICAgICAgICB2b2lkIGNsaXBSb3VuZGVkUmVj dChjb25zdCBSb3VuZGVkUmVjdCYpOwogICAgICAgICB2b2lkIGNsaXBPdXQoY29uc3QgSW50UmVj dCYpOwogICAgICAgICB2b2lkIGNsaXBPdXRSb3VuZGVkUmVjdChjb25zdCBSb3VuZGVkUmVjdCYp OwogICAgICAgICB2b2lkIGNsaXBQYXRoKGNvbnN0IFBhdGgmLCBXaW5kUnVsZSk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL0dyYXBoaWNzQ29udGV4 dFNraWEuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9HcmFwaGlj c0NvbnRleHRTa2lhLmNwcAppbmRleCBlMzcwNjkxZjllMzgyNjc1NzMwNjQ4ZDgyMzVlZGE0Zjk1 MzllN2UxLi4xZTAzZDQxMmEwOThlNWY4Y2Y3ODM2MGJkNTE5ZmM1ZjdiYzE2MGFmIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL0dyYXBoaWNzQ29udGV4 dFNraWEuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvR3Jh cGhpY3NDb250ZXh0U2tpYS5jcHAKQEAgLTMyMiw3ICszMjIsNyBAQCB2b2lkIEdyYXBoaWNzQ29u dGV4dDo6Y2xpcChjb25zdCBQYXRoJiBwYXRoKQogICAgIHBsYXRmb3JtQ29udGV4dCgpLT5jbGlw UGF0aCgqcGF0aC5wbGF0Zm9ybVBhdGgoKSwgUGxhdGZvcm1Db250ZXh0U2tpYTo6QW50aUFsaWFz ZWQpOwogfQogCi12b2lkIEdyYXBoaWNzQ29udGV4dDo6YWRkUm91bmRlZFJlY3RDbGlwKGNvbnN0 IFJvdW5kZWRSZWN0JiByZWN0KQordm9pZCBHcmFwaGljc0NvbnRleHQ6OmNsaXBSb3VuZGVkUmVj dChjb25zdCBSb3VuZGVkUmVjdCYgcmVjdCkKIHsKICAgICBpZiAocGFpbnRpbmdEaXNhYmxlZCgp KQogICAgICAgICByZXR1cm47CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCmlu ZGV4IGE3YThjNWI5OGM3MmUwYTUyY2JjMTU4M2U1ZDg0MTM3MGZhMjFiOWEuLjE2NzdhYWUyM2Iw MGZjYTljMzExODMwNmM0YzRjYjYxYjI3Y2E0ZjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJCb3guY3BwCkBAIC0xMDQ0LDcgKzEwNDQsNyBAQCB2b2lkIFJlbmRlckJveDo6cGFpbnRC b3hEZWNvcmF0aW9ucyhQYWludEluZm8mIHBhaW50SW5mbywgY29uc3QgTGF5b3V0UG9pbnQmIHBh aQogICAgICAgICAvLyBiZWdpbm5pbmcgdGhlIGxheWVyKS4KICAgICAgICAgUm91bmRlZFJlY3Qg Ym9yZGVyID0gc3R5bGUoKS0+Z2V0Um91bmRlZEJvcmRlckZvcihwYWludFJlY3QsIHZpZXcoKSk7 CiAgICAgICAgIHN0YXRlU2F2ZXIuc2F2ZSgpOwotICAgICAgICBwYWludEluZm8uY29udGV4dC0+ YWRkUm91bmRlZFJlY3RDbGlwKGJvcmRlcik7CisgICAgICAgIHBhaW50SW5mby5jb250ZXh0LT5j bGlwUm91bmRlZFJlY3QoYm9yZGVyKTsKICAgICAgICAgcGFpbnRJbmZvLmNvbnRleHQtPmJlZ2lu VHJhbnNwYXJlbmN5TGF5ZXIoMSk7CiAgICAgfQogCkBAIC0xMzM3LDcgKzEzMzcsNyBAQCBib29s IFJlbmRlckJveDo6cHVzaENvbnRlbnRzQ2xpcChQYWludEluZm8mIHBhaW50SW5mbywgY29uc3Qg TGF5b3V0UG9pbnQmIGFjY3VtdQogICAgIEludFJlY3QgY2xpcFJlY3QgPSBwaXhlbFNuYXBwZWRJ bnRSZWN0KGlzQ29udHJvbENsaXAgPyBjb250cm9sQ2xpcFJlY3QoYWNjdW11bGF0ZWRPZmZzZXQp IDogb3ZlcmZsb3dDbGlwUmVjdChhY2N1bXVsYXRlZE9mZnNldCwgcGFpbnRJbmZvLnJlbmRlclJl Z2lvbikpOwogICAgIHBhaW50SW5mby5jb250ZXh0LT5zYXZlKCk7CiAgICAgaWYgKHN0eWxlKCkt Pmhhc0JvcmRlclJhZGl1cygpKQotICAgICAgICBwYWludEluZm8uY29udGV4dC0+YWRkUm91bmRl ZFJlY3RDbGlwKHN0eWxlKCktPmdldFJvdW5kZWRJbm5lckJvcmRlckZvcihMYXlvdXRSZWN0KGFj Y3VtdWxhdGVkT2Zmc2V0LCBzaXplKCkpKSk7CisgICAgICAgIHBhaW50SW5mby5jb250ZXh0LT5j bGlwUm91bmRlZFJlY3Qoc3R5bGUoKS0+Z2V0Um91bmRlZElubmVyQm9yZGVyRm9yKExheW91dFJl Y3QoYWNjdW11bGF0ZWRPZmZzZXQsIHNpemUoKSkpKTsKICAgICBwYWludEluZm8uY29udGV4dC0+ Y2xpcChjbGlwUmVjdCk7CiAgICAgcmV0dXJuIHRydWU7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94TW9kZWxPYmplY3QuY3BwIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJveE1vZGVsT2JqZWN0LmNwcAppbmRleCBmMDZlMTI2MzhiOWFj NDFmNjAwOTJhZDQ4NTkyM2RhMjRmNDBmNjNiLi4zNDllN2I0YjVkNjFhOTllMzU3YWRjMWQzMDMx Y2U5MTUzZDM5MmViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy Qm94TW9kZWxPYmplY3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC b3hNb2RlbE9iamVjdC5jcHAKQEAgLTY3MCwzMSArNjcwLDMxIEBAIFJvdW5kZWRSZWN0IFJlbmRl ckJveE1vZGVsT2JqZWN0OjpnZXRCYWNrZ3JvdW5kUm91bmRlZFJlY3QoY29uc3QgTGF5b3V0UmVj dCYgYm9yCiB2b2lkIFJlbmRlckJveE1vZGVsT2JqZWN0OjpjbGlwUm91bmRlZElubmVyUmVjdChH cmFwaGljc0NvbnRleHQgKiBjb250ZXh0LCBjb25zdCBMYXlvdXRSZWN0JiByZWN0LCBjb25zdCBS b3VuZGVkUmVjdCYgY2xpcFJlY3QpCiB7CiAgICAgaWYgKGNsaXBSZWN0LmlzUmVuZGVyYWJsZSgp KQotICAgICAgICBjb250ZXh0LT5hZGRSb3VuZGVkUmVjdENsaXAoY2xpcFJlY3QpOworICAgICAg ICBjb250ZXh0LT5jbGlwUm91bmRlZFJlY3QoY2xpcFJlY3QpOwogICAgIGVsc2UgewogICAgICAg ICAvLyBXZSBjcmVhdGUgYSByb3VuZGVkIHJlY3QgZm9yIGVhY2ggb2YgdGhlIGNvcm5lcnMgYW5k IGNsaXAgaXQsIHdoaWxlIG1ha2luZyBzdXJlIHdlIGNsaXAgb3Bwb3NpbmcgY29ybmVycyB0b2dl dGhlci4KICAgICAgICAgaWYgKCFjbGlwUmVjdC5yYWRpaSgpLnRvcExlZnQoKS5pc0VtcHR5KCkg fHwgIWNsaXBSZWN0LnJhZGlpKCkuYm90dG9tUmlnaHQoKS5pc0VtcHR5KCkpIHsKICAgICAgICAg ICAgIEludFJlY3QgdG9wQ29ybmVyKGNsaXBSZWN0LnJlY3QoKS54KCksIGNsaXBSZWN0LnJlY3Qo KS55KCksIHJlY3QubWF4WCgpIC0gY2xpcFJlY3QucmVjdCgpLngoKSwgcmVjdC5tYXhZKCkgLSBj bGlwUmVjdC5yZWN0KCkueSgpKTsKICAgICAgICAgICAgIFJvdW5kZWRSZWN0OjpSYWRpaSB0b3BD b3JuZXJSYWRpaTsKICAgICAgICAgICAgIHRvcENvcm5lclJhZGlpLnNldFRvcExlZnQoY2xpcFJl Y3QucmFkaWkoKS50b3BMZWZ0KCkpOwotICAgICAgICAgICAgY29udGV4dC0+YWRkUm91bmRlZFJl Y3RDbGlwKFJvdW5kZWRSZWN0KHRvcENvcm5lciwgdG9wQ29ybmVyUmFkaWkpKTsKKyAgICAgICAg ICAgIGNvbnRleHQtPmNsaXBSb3VuZGVkUmVjdChSb3VuZGVkUmVjdCh0b3BDb3JuZXIsIHRvcENv cm5lclJhZGlpKSk7CiAKICAgICAgICAgICAgIEludFJlY3QgYm90dG9tQ29ybmVyKHJlY3QueCgp LCByZWN0LnkoKSwgY2xpcFJlY3QucmVjdCgpLm1heFgoKSAtIHJlY3QueCgpLCBjbGlwUmVjdC5y ZWN0KCkubWF4WSgpIC0gcmVjdC55KCkpOwogICAgICAgICAgICAgUm91bmRlZFJlY3Q6OlJhZGlp IGJvdHRvbUNvcm5lclJhZGlpOwogICAgICAgICAgICAgYm90dG9tQ29ybmVyUmFkaWkuc2V0Qm90 dG9tUmlnaHQoY2xpcFJlY3QucmFkaWkoKS5ib3R0b21SaWdodCgpKTsKLSAgICAgICAgICAgIGNv bnRleHQtPmFkZFJvdW5kZWRSZWN0Q2xpcChSb3VuZGVkUmVjdChib3R0b21Db3JuZXIsIGJvdHRv bUNvcm5lclJhZGlpKSk7CisgICAgICAgICAgICBjb250ZXh0LT5jbGlwUm91bmRlZFJlY3QoUm91 bmRlZFJlY3QoYm90dG9tQ29ybmVyLCBib3R0b21Db3JuZXJSYWRpaSkpOwogICAgICAgICB9IAog CiAgICAgICAgIGlmICghY2xpcFJlY3QucmFkaWkoKS50b3BSaWdodCgpLmlzRW1wdHkoKSB8fCAh Y2xpcFJlY3QucmFkaWkoKS5ib3R0b21MZWZ0KCkuaXNFbXB0eSgpKSB7CiAgICAgICAgICAgICBJ bnRSZWN0IHRvcENvcm5lcihyZWN0LngoKSwgY2xpcFJlY3QucmVjdCgpLnkoKSwgY2xpcFJlY3Qu cmVjdCgpLm1heFgoKSAtIHJlY3QueCgpLCByZWN0Lm1heFkoKSAtIGNsaXBSZWN0LnJlY3QoKS55 KCkpOwogICAgICAgICAgICAgUm91bmRlZFJlY3Q6OlJhZGlpIHRvcENvcm5lclJhZGlpOwogICAg ICAgICAgICAgdG9wQ29ybmVyUmFkaWkuc2V0VG9wUmlnaHQoY2xpcFJlY3QucmFkaWkoKS50b3BS aWdodCgpKTsKLSAgICAgICAgICAgIGNvbnRleHQtPmFkZFJvdW5kZWRSZWN0Q2xpcChSb3VuZGVk UmVjdCh0b3BDb3JuZXIsIHRvcENvcm5lclJhZGlpKSk7CisgICAgICAgICAgICBjb250ZXh0LT5j bGlwUm91bmRlZFJlY3QoUm91bmRlZFJlY3QodG9wQ29ybmVyLCB0b3BDb3JuZXJSYWRpaSkpOwog CiAgICAgICAgICAgICBJbnRSZWN0IGJvdHRvbUNvcm5lcihjbGlwUmVjdC5yZWN0KCkueCgpLCBy ZWN0LnkoKSwgcmVjdC5tYXhYKCkgLSBjbGlwUmVjdC5yZWN0KCkueCgpLCBjbGlwUmVjdC5yZWN0 KCkubWF4WSgpIC0gcmVjdC55KCkpOwogICAgICAgICAgICAgUm91bmRlZFJlY3Q6OlJhZGlpIGJv dHRvbUNvcm5lclJhZGlpOwogICAgICAgICAgICAgYm90dG9tQ29ybmVyUmFkaWkuc2V0Qm90dG9t TGVmdChjbGlwUmVjdC5yYWRpaSgpLmJvdHRvbUxlZnQoKSk7Ci0gICAgICAgICAgICBjb250ZXh0 LT5hZGRSb3VuZGVkUmVjdENsaXAoUm91bmRlZFJlY3QoYm90dG9tQ29ybmVyLCBib3R0b21Db3Ju ZXJSYWRpaSkpOworICAgICAgICAgICAgY29udGV4dC0+Y2xpcFJvdW5kZWRSZWN0KFJvdW5kZWRS ZWN0KGJvdHRvbUNvcm5lciwgYm90dG9tQ29ybmVyUmFkaWkpKTsKICAgICAgICAgfQogICAgIH0K IH0KQEAgLTE5OTIsNyArMTk5Miw3IEBAIHZvaWQgUmVuZGVyQm94TW9kZWxPYmplY3Q6OnBhaW50 Qm9yZGVyKGNvbnN0IFBhaW50SW5mbyYgaW5mbywgY29uc3QgTGF5b3V0UmVjdCYKICAgICBpZiAo Y2xpcFRvT3V0ZXJCb3JkZXIpIHsKICAgICAgICAgLy8gQ2xpcCB0byB0aGUgaW5uZXIgYW5kIG91 dGVyIHJhZGlpIHJlY3RzLgogICAgICAgICBpZiAoYmxlZWRBdm9pZGFuY2UgIT0gQmFja2dyb3Vu ZEJsZWVkVXNlVHJhbnNwYXJlbmN5TGF5ZXIpCi0gICAgICAgICAgICBncmFwaGljc0NvbnRleHQt PmFkZFJvdW5kZWRSZWN0Q2xpcChvdXRlckJvcmRlcik7CisgICAgICAgICAgICBncmFwaGljc0Nv bnRleHQtPmNsaXBSb3VuZGVkUmVjdChvdXRlckJvcmRlcik7CiAgICAgICAgIC8vIGlzUmVuZGVy YWJsZSgpIGNoZWNrIGF2b2lkcyBpc3N1ZSBkZXNjcmliZWQgaW4gaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTM4Nzg3CiAgICAgICAgIC8vIFRoZSBpbnNpZGUgd2lsbCBi ZSBjbGlwcGVkIG91dCBsYXRlciAoaW4gY2xpcEJvcmRlclNpZGVGb3JDb21wbGV4SW5uZXJQYXRo KQogICAgICAgICBpZiAoaW5uZXJCb3JkZXIuaXNSZW5kZXJhYmxlKCkpCkBAIC0yMDg5LDcgKzIw ODksNyBAQCB2b2lkIFJlbmRlckJveE1vZGVsT2JqZWN0OjpkcmF3Qm94U2lkZUZyb21QYXRoKEdy YXBoaWNzQ29udGV4dCogZ3JhcGhpY3NDb250ZXh0LAogICAgICAgICAgICAgICAgIGlubmVyQm9y ZGVyVG9wV2lkdGgsIGlubmVyQm9yZGVyQm90dG9tV2lkdGgsIGlubmVyQm9yZGVyTGVmdFdpZHRo LCBpbm5lckJvcmRlclJpZ2h0V2lkdGgsCiAgICAgICAgICAgICAgICAgaW5jbHVkZUxvZ2ljYWxM ZWZ0RWRnZSwgaW5jbHVkZUxvZ2ljYWxSaWdodEVkZ2UpOwogICAgICAgICAgICAgCi0gICAgICAg ICAgICBncmFwaGljc0NvbnRleHQtPmFkZFJvdW5kZWRSZWN0Q2xpcChpbm5lckNsaXApOworICAg ICAgICAgICAgZ3JhcGhpY3NDb250ZXh0LT5jbGlwUm91bmRlZFJlY3QoaW5uZXJDbGlwKTsKICAg ICAgICAgICAgIGRyYXdCb3hTaWRlRnJvbVBhdGgoZ3JhcGhpY3NDb250ZXh0LCBib3JkZXJSZWN0 LCBib3JkZXJQYXRoLCBlZGdlcywgdGhpY2tuZXNzLCBkcmF3VGhpY2tuZXNzLCBzaWRlLCBzdHls ZSwgY29sb3IsIFNPTElELCBibGVlZEF2b2lkYW5jZSwgaW5jbHVkZUxvZ2ljYWxMZWZ0RWRnZSwg aW5jbHVkZUxvZ2ljYWxSaWdodEVkZ2UpOwogICAgICAgICB9CiAKQEAgLTIxNDAsNyArMjE0MCw3 IEBAIHZvaWQgUmVuZGVyQm94TW9kZWxPYmplY3Q6OmRyYXdCb3hTaWRlRnJvbVBhdGgoR3JhcGhp Y3NDb250ZXh0KiBncmFwaGljc0NvbnRleHQsCiAgICAgICAgICAgICB0b3BXaWR0aCwgYm90dG9t V2lkdGgsIGxlZnRXaWR0aCwgcmlnaHRXaWR0aCwKICAgICAgICAgICAgIGluY2x1ZGVMb2dpY2Fs TGVmdEVkZ2UsIGluY2x1ZGVMb2dpY2FsUmlnaHRFZGdlKTsKIAotICAgICAgICBncmFwaGljc0Nv bnRleHQtPmFkZFJvdW5kZWRSZWN0Q2xpcChjbGlwUmVjdCk7CisgICAgICAgIGdyYXBoaWNzQ29u dGV4dC0+Y2xpcFJvdW5kZWRSZWN0KGNsaXBSZWN0KTsKICAgICAgICAgZHJhd0JveFNpZGVGcm9t UGF0aChncmFwaGljc0NvbnRleHQsIGJvcmRlclJlY3QsIGJvcmRlclBhdGgsIGVkZ2VzLCB0aGlj a25lc3MsIGRyYXdUaGlja25lc3MsIHNpZGUsIHN0eWxlLCBjb2xvciwgczIsIGJsZWVkQXZvaWRh bmNlLCBpbmNsdWRlTG9naWNhbExlZnRFZGdlLCBpbmNsdWRlTG9naWNhbFJpZ2h0RWRnZSk7CiAg ICAgICAgIHJldHVybjsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyTGF5ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVy LmNwcAppbmRleCBkZGY1ZDM3OTVjNjhhYjFhNjBhOTAxZjcxZjQwNThjMjBlZjE4ZjRjLi5kMmZm OGQzMjI4NzcyMWZhYjAwZDY1ZDJiMDk3YmJiZWE1MGRiYmMzIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJMYXllci5jcHAKQEAgLTMzNTUsNyArMzM1NSw3IEBAIHZvaWQgUmVuZGVy TGF5ZXI6OmNsaXBUb1JlY3QoUmVuZGVyTGF5ZXIqIHJvb3RMYXllciwgR3JhcGhpY3NDb250ZXh0 KiBjb250ZXh0LCBjCiAgICAgICAgIGlmIChsYXllci0+cmVuZGVyZXIoKS0+aGFzT3ZlcmZsb3dD bGlwKCkgJiYgbGF5ZXItPnJlbmRlcmVyKCktPnN0eWxlKCktPmhhc0JvcmRlclJhZGl1cygpICYm IGluQ29udGFpbmluZ0Jsb2NrQ2hhaW4odGhpcywgbGF5ZXIpKSB7CiAgICAgICAgICAgICAgICAg TGF5b3V0UG9pbnQgZGVsdGE7CiAgICAgICAgICAgICAgICAgbGF5ZXItPmNvbnZlcnRUb0xheWVy Q29vcmRzKHJvb3RMYXllciwgZGVsdGEpOwotICAgICAgICAgICAgICAgIGNvbnRleHQtPmFkZFJv dW5kZWRSZWN0Q2xpcChsYXllci0+cmVuZGVyZXIoKS0+c3R5bGUoKS0+Z2V0Um91bmRlZElubmVy Qm9yZGVyRm9yKExheW91dFJlY3QoZGVsdGEsIGxheWVyLT5zaXplKCkpKSk7CisgICAgICAgICAg ICAgICAgY29udGV4dC0+Y2xpcFJvdW5kZWRSZWN0KGxheWVyLT5yZW5kZXJlcigpLT5zdHlsZSgp LT5nZXRSb3VuZGVkSW5uZXJCb3JkZXJGb3IoTGF5b3V0UmVjdChkZWx0YSwgbGF5ZXItPnNpemUo KSkpKTsKICAgICAgICAgfQogCiAgICAgICAgIGlmIChsYXllciA9PSByb290TGF5ZXIpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVDaHJvbWl1bVdpbi5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVDaHJvbWl1bVdpbi5jcHAK aW5kZXggM2Q2YjFiNmEyNDZmNzM4MTIzNDc5ZjZlMWRiMGEzYTQ1MTBmYjY3NC4uNThmNGVjMmNm YTIwNGQ5MjJiZDdlZTU3ZmFmN2VhYTZjMzBjMzdkNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lQ2hyb21pdW1XaW4uY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZUNocm9taXVtV2luLmNwcApAQCAtNTY2LDcgKzU2Niw3 IEBAIGJvb2wgUmVuZGVyVGhlbWVDaHJvbWl1bVdpbjo6cGFpbnRUZXh0RmllbGRJbnRlcm5hbChS ZW5kZXJPYmplY3QqIG8sCiAgICAgICAgIC8vIGJhY2tncm91bmQgKHRoZW1lZCBvciBmaWxsZWQp IGFwcHJvcHJpYXRlbHkuCiAgICAgICAgIC8vIEZJWE1FOiBtYWtlIHN1cmUgd2UgZG8gdGhlIHJp Z2h0IHRoaW5nIGlmIGNzcyBiYWNrZ3JvdW5kLWNsaXAgaXMgc2V0LgogICAgICAgICBpLmNvbnRl eHQtPnNhdmUoKTsKLSAgICAgICAgaS5jb250ZXh0LT5hZGRSb3VuZGVkUmVjdENsaXAoby0+c3R5 bGUoKS0+Z2V0Um91bmRlZEJvcmRlckZvcihyKSk7CisgICAgICAgIGkuY29udGV4dC0+Y2xpcFJv dW5kZWRSZWN0KG8tPnN0eWxlKCktPmdldFJvdW5kZWRCb3JkZXJGb3IocikpOwogICAgIH0KICAg ICB7CiAgICAgICAgIGNvbnN0IFRoZW1lRGF0YSYgdGhlbWVEYXRhID0gZ2V0VGhlbWVEYXRhKG8p OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lTWFjU2hh cmVkLm1tIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lTWFjU2hhcmVkLm1t CmluZGV4IGU2MDc0Y2MyNjRkYzQ2NzU3ZDVjMmZmZDRlNTU5ODY4MTFhNGU0NTYuLmFjMTljOTNm YjIyODYxYjQ1YWM5ZDliODA2Y2Y3ZWEzZDFjZjg5YTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZU1hY1NoYXJlZC5tbQorKysgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVNYWNTaGFyZWQubW0KQEAgLTExMTcsNyArMTExNyw3IEBA IHZvaWQgUmVuZGVyVGhlbWVNYWNTaGFyZWQ6OnBhaW50TWVudUxpc3RCdXR0b25HcmFkaWVudHMo UmVuZGVyT2JqZWN0KiBvLCBjb25zdCBQCiAgICAgewogICAgICAgICBHcmFwaGljc0NvbnRleHRT dGF0ZVNhdmVyIHN0YXRlU2F2ZXIoKnBhaW50SW5mby5jb250ZXh0KTsKICAgICAgICAgQ0dDb250 ZXh0Q2xpcFRvUmVjdChjb250ZXh0LCByKTsKLSAgICAgICAgcGFpbnRJbmZvLmNvbnRleHQtPmFk ZFJvdW5kZWRSZWN0Q2xpcChib3JkZXIpOworICAgICAgICBwYWludEluZm8uY29udGV4dC0+Y2xp cFJvdW5kZWRSZWN0KGJvcmRlcik7CiAgICAgICAgIGNvbnRleHQgPSBjZ0NvbnRleHRDb250YWlu ZXIuY29udGV4dCgpOwogICAgICAgICBDR0NvbnRleHREcmF3U2hhZGluZyhjb250ZXh0LCBtYWlu U2hhZGluZy5nZXQoKSk7CiAgICAgfQpAQCAtMTEyNSw3ICsxMTI1LDcgQEAgdm9pZCBSZW5kZXJU aGVtZU1hY1NoYXJlZDo6cGFpbnRNZW51TGlzdEJ1dHRvbkdyYWRpZW50cyhSZW5kZXJPYmplY3Qq IG8sIGNvbnN0IFAKICAgICB7CiAgICAgICAgIEdyYXBoaWNzQ29udGV4dFN0YXRlU2F2ZXIgc3Rh dGVTYXZlcigqcGFpbnRJbmZvLmNvbnRleHQpOwogICAgICAgICBDR0NvbnRleHRDbGlwVG9SZWN0 KGNvbnRleHQsIHRvcEdyYWRpZW50KTsKLSAgICAgICAgcGFpbnRJbmZvLmNvbnRleHQtPmFkZFJv dW5kZWRSZWN0Q2xpcChSb3VuZGVkUmVjdChlbmNsb3NpbmdJbnRSZWN0KHRvcEdyYWRpZW50KSwg Ym9yZGVyLnJhZGlpKCkudG9wTGVmdCgpLCBib3JkZXIucmFkaWkoKS50b3BSaWdodCgpLCBJbnRT aXplKCksIEludFNpemUoKSkpOworICAgICAgICBwYWludEluZm8uY29udGV4dC0+Y2xpcFJvdW5k ZWRSZWN0KFJvdW5kZWRSZWN0KGVuY2xvc2luZ0ludFJlY3QodG9wR3JhZGllbnQpLCBib3JkZXIu cmFkaWkoKS50b3BMZWZ0KCksIGJvcmRlci5yYWRpaSgpLnRvcFJpZ2h0KCksIEludFNpemUoKSwg SW50U2l6ZSgpKSk7CiAgICAgICAgIGNvbnRleHQgPSBjZ0NvbnRleHRDb250YWluZXIuY29udGV4 dCgpOwogICAgICAgICBDR0NvbnRleHREcmF3U2hhZGluZyhjb250ZXh0LCB0b3BTaGFkaW5nLmdl dCgpKTsKICAgICB9CkBAIC0xMTMzLDcgKzExMzMsNyBAQCB2b2lkIFJlbmRlclRoZW1lTWFjU2hh cmVkOjpwYWludE1lbnVMaXN0QnV0dG9uR3JhZGllbnRzKFJlbmRlck9iamVjdCogbywgY29uc3Qg UAogICAgIGlmICghYm90dG9tR3JhZGllbnQuaXNFbXB0eSgpKSB7CiAgICAgICAgIEdyYXBoaWNz Q29udGV4dFN0YXRlU2F2ZXIgc3RhdGVTYXZlcigqcGFpbnRJbmZvLmNvbnRleHQpOwogICAgICAg ICBDR0NvbnRleHRDbGlwVG9SZWN0KGNvbnRleHQsIGJvdHRvbUdyYWRpZW50KTsKLSAgICAgICAg cGFpbnRJbmZvLmNvbnRleHQtPmFkZFJvdW5kZWRSZWN0Q2xpcChSb3VuZGVkUmVjdChlbmNsb3Np bmdJbnRSZWN0KGJvdHRvbUdyYWRpZW50KSwgSW50U2l6ZSgpLCBJbnRTaXplKCksIGJvcmRlci5y YWRpaSgpLmJvdHRvbUxlZnQoKSwgYm9yZGVyLnJhZGlpKCkuYm90dG9tUmlnaHQoKSkpOworICAg ICAgICBwYWludEluZm8uY29udGV4dC0+Y2xpcFJvdW5kZWRSZWN0KFJvdW5kZWRSZWN0KGVuY2xv c2luZ0ludFJlY3QoYm90dG9tR3JhZGllbnQpLCBJbnRTaXplKCksIEludFNpemUoKSwgYm9yZGVy LnJhZGlpKCkuYm90dG9tTGVmdCgpLCBib3JkZXIucmFkaWkoKS5ib3R0b21SaWdodCgpKSk7CiAg ICAgICAgIGNvbnRleHQgPSBjZ0NvbnRleHRDb250YWluZXIuY29udGV4dCgpOwogICAgICAgICBD R0NvbnRleHREcmF3U2hhZGluZyhjb250ZXh0LCBib3R0b21TaGFkaW5nLmdldCgpKTsKICAgICB9 CkBAIC0xMTQxLDcgKzExNDEsNyBAQCB2b2lkIFJlbmRlclRoZW1lTWFjU2hhcmVkOjpwYWludE1l bnVMaXN0QnV0dG9uR3JhZGllbnRzKFJlbmRlck9iamVjdCogbywgY29uc3QgUAogICAgIHsKICAg ICAgICAgR3JhcGhpY3NDb250ZXh0U3RhdGVTYXZlciBzdGF0ZVNhdmVyKCpwYWludEluZm8uY29u dGV4dCk7CiAgICAgICAgIENHQ29udGV4dENsaXBUb1JlY3QoY29udGV4dCwgcik7Ci0gICAgICAg IHBhaW50SW5mby5jb250ZXh0LT5hZGRSb3VuZGVkUmVjdENsaXAoYm9yZGVyKTsKKyAgICAgICAg cGFpbnRJbmZvLmNvbnRleHQtPmNsaXBSb3VuZGVkUmVjdChib3JkZXIpOwogICAgICAgICBjb250 ZXh0ID0gY2dDb250ZXh0Q29udGFpbmVyLmNvbnRleHQoKTsKICAgICAgICAgQ0dDb250ZXh0RHJh d1NoYWRpbmcoY29udGV4dCwgbGVmdFNoYWRpbmcuZ2V0KCkpOwogICAgICAgICBDR0NvbnRleHRE cmF3U2hhZGluZyhjb250ZXh0LCByaWdodFNoYWRpbmcuZ2V0KCkpOwpAQCAtMTM2NSw3ICsxMzY1 LDcgQEAgYm9vbCBSZW5kZXJUaGVtZU1hY1NoYXJlZDo6cGFpbnRTbGlkZXJUcmFjayhSZW5kZXJP YmplY3QqIG8sIGNvbnN0IFBhaW50SW5mbyYgcGEKICAgICAgICAgbWFpblNoYWRpbmcuYWRvcHRD RihDR1NoYWRpbmdDcmVhdGVBeGlhbChjc3BhY2UsIENHUG9pbnRNYWtlKGJvdW5kcy54KCksICBi b3VuZHMueSgpKSwgQ0dQb2ludE1ha2UoYm91bmRzLngoKSwgYm91bmRzLm1heFkoKSksIG1haW5G dW5jdGlvbi5nZXQoKSwgZmFsc2UsIGZhbHNlKSk7CiAKICAgICBJbnRTaXplIHJhZGl1cyh0cmFj a1JhZGl1cywgdHJhY2tSYWRpdXMpOwotICAgIHBhaW50SW5mby5jb250ZXh0LT5hZGRSb3VuZGVk UmVjdENsaXAoUm91bmRlZFJlY3QoYm91bmRzLCByYWRpdXMsIHJhZGl1cywgcmFkaXVzLCByYWRp dXMpKTsKKyAgICBwYWludEluZm8uY29udGV4dC0+Y2xpcFJvdW5kZWRSZWN0KFJvdW5kZWRSZWN0 KGJvdW5kcywgcmFkaXVzLCByYWRpdXMsIHJhZGl1cywgcmFkaXVzKSk7CiAgICAgY29udGV4dCA9 IGxvY2FsQ29udGV4dC5jZ0NvbnRleHQoKTsKICAgICBDR0NvbnRleHREcmF3U2hhZGluZyhjb250 ZXh0LCBtYWluU2hhZGluZy5nZXQoKSk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJUaGVtZVNhZmFyaS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyVGhlbWVTYWZhcmkuY3BwCmluZGV4IDIxZDk3OGM4YjhkMDNiNzdkYzAyNjU2ZjczNDE3 YjI4NDVkNmRiMjEuLjBlMjNmZGVjYTY4NDI3YWQyNGU3Mzc2MDQzMzk5YmY2MGJjMzU1ZDQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZVNhZmFyaS5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lU2FmYXJpLmNwcApAQCAt Nzc3LDI3ICs3NzcsMjcgQEAgdm9pZCBSZW5kZXJUaGVtZVNhZmFyaTo6cGFpbnRNZW51TGlzdEJ1 dHRvbkdyYWRpZW50cyhSZW5kZXJPYmplY3QqIG8sIGNvbnN0IFBhaW4KICAgICBSZXRhaW5QdHI8 Q0dTaGFkaW5nUmVmPiByaWdodFNoYWRpbmcoQWRvcHRDRiwgQ0dTaGFkaW5nQ3JlYXRlQXhpYWwo Y3NwYWNlLCBDR1BvaW50TWFrZShyLm1heFgoKSwgIHIueSgpKSwgQ0dQb2ludE1ha2Uoci5tYXhY KCkgLSByYWRpdXMsIHIueSgpKSwgbWFpbkZ1bmN0aW9uLmdldCgpLCBmYWxzZSwgZmFsc2UpKTsK ICAgICBwYWludEluZm8uY29udGV4dC0+c2F2ZSgpOwogICAgIENHQ29udGV4dENsaXBUb1JlY3Qo Y29udGV4dCwgYm91bmQucmVjdCgpKTsKLSAgICBwYWludEluZm8uY29udGV4dC0+YWRkUm91bmRl ZFJlY3RDbGlwKGJvdW5kKTsKKyAgICBwYWludEluZm8uY29udGV4dC0+Y2xpcFJvdW5kZWRSZWN0 KGJvdW5kKTsKICAgICBDR0NvbnRleHREcmF3U2hhZGluZyhjb250ZXh0LCBtYWluU2hhZGluZy5n ZXQoKSk7CiAgICAgcGFpbnRJbmZvLmNvbnRleHQtPnJlc3RvcmUoKTsKIAogICAgIHBhaW50SW5m by5jb250ZXh0LT5zYXZlKCk7CiAgICAgQ0dDb250ZXh0Q2xpcFRvUmVjdChjb250ZXh0LCB0b3BH cmFkaWVudCk7Ci0gICAgcGFpbnRJbmZvLmNvbnRleHQtPmFkZFJvdW5kZWRSZWN0Q2xpcChSb3Vu ZGVkUmVjdChlbmNsb3NpbmdJbnRSZWN0KHRvcEdyYWRpZW50KSwgYm91bmQucmFkaWkoKS50b3BM ZWZ0KCksIGJvdW5kLnJhZGlpKCkudG9wUmlnaHQoKSwgSW50U2l6ZSgpLCBJbnRTaXplKCkpKTsK KyAgICBwYWludEluZm8uY29udGV4dC0+Y2xpcFJvdW5kZWRSZWN0KFJvdW5kZWRSZWN0KGVuY2xv c2luZ0ludFJlY3QodG9wR3JhZGllbnQpLCBib3VuZC5yYWRpaSgpLnRvcExlZnQoKSwgYm91bmQu cmFkaWkoKS50b3BSaWdodCgpLCBJbnRTaXplKCksIEludFNpemUoKSkpOwogICAgIENHQ29udGV4 dERyYXdTaGFkaW5nKGNvbnRleHQsIHRvcFNoYWRpbmcuZ2V0KCkpOwogICAgIHBhaW50SW5mby5j b250ZXh0LT5yZXN0b3JlKCk7CiAKICAgICBpZiAoIWJvdHRvbUdyYWRpZW50LmlzRW1wdHkoKSkg ewogICAgICAgICBwYWludEluZm8uY29udGV4dC0+c2F2ZSgpOwogICAgICAgICBDR0NvbnRleHRD bGlwVG9SZWN0KGNvbnRleHQsIGJvdHRvbUdyYWRpZW50KTsKLSAgICAgICAgcGFpbnRJbmZvLmNv bnRleHQtPmFkZFJvdW5kZWRSZWN0Q2xpcChSb3VuZGVkUmVjdChlbmNsb3NpbmdJbnRSZWN0KGJv dHRvbUdyYWRpZW50KSwgSW50U2l6ZSgpLCBJbnRTaXplKCksIGJvdW5kLnJhZGlpKCkuYm90dG9t TGVmdCgpLCBib3VuZC5yYWRpaSgpLmJvdHRvbVJpZ2h0KCkpKTsKKyAgICAgICAgcGFpbnRJbmZv LmNvbnRleHQtPmNsaXBSb3VuZGVkUmVjdChSb3VuZGVkUmVjdChlbmNsb3NpbmdJbnRSZWN0KGJv dHRvbUdyYWRpZW50KSwgSW50U2l6ZSgpLCBJbnRTaXplKCksIGJvdW5kLnJhZGlpKCkuYm90dG9t TGVmdCgpLCBib3VuZC5yYWRpaSgpLmJvdHRvbVJpZ2h0KCkpKTsKICAgICAgICAgQ0dDb250ZXh0 RHJhd1NoYWRpbmcoY29udGV4dCwgYm90dG9tU2hhZGluZy5nZXQoKSk7CiAgICAgICAgIHBhaW50 SW5mby5jb250ZXh0LT5yZXN0b3JlKCk7CiAgICAgfQogCiAgICAgcGFpbnRJbmZvLmNvbnRleHQt PnNhdmUoKTsKICAgICBDR0NvbnRleHRDbGlwVG9SZWN0KGNvbnRleHQsIGJvdW5kLnJlY3QoKSk7 Ci0gICAgcGFpbnRJbmZvLmNvbnRleHQtPmFkZFJvdW5kZWRSZWN0Q2xpcChib3VuZCk7CisgICAg cGFpbnRJbmZvLmNvbnRleHQtPmNsaXBSb3VuZGVkUmVjdChib3VuZCk7CiAgICAgQ0dDb250ZXh0 RHJhd1NoYWRpbmcoY29udGV4dCwgbGVmdFNoYWRpbmcuZ2V0KCkpOwogICAgIENHQ29udGV4dERy YXdTaGFkaW5nKGNvbnRleHQsIHJpZ2h0U2hhZGluZy5nZXQoKSk7CiAgICAgcGFpbnRJbmZvLmNv bnRleHQtPnJlc3RvcmUoKTsKQEAgLTk4MSw3ICs5ODEsNyBAQCBib29sIFJlbmRlclRoZW1lU2Fm YXJpOjpwYWludFNsaWRlclRyYWNrKFJlbmRlck9iamVjdCogbywgY29uc3QgUGFpbnRJbmZvJiBw YWludAogICAgIGVsc2UKICAgICAgICAgbWFpblNoYWRpbmcuYWRvcHRDRihDR1NoYWRpbmdDcmVh dGVBeGlhbChjc3BhY2UsIENHUG9pbnRNYWtlKGJvdW5kcy5yZWN0KCkueCgpLCAgYm91bmRzLnJl Y3QoKS55KCkpLCBDR1BvaW50TWFrZShib3VuZHMucmVjdCgpLngoKSwgYm91bmRzLnJlY3QoKS5t YXhZKCkpLCBtYWluRnVuY3Rpb24uZ2V0KCksIGZhbHNlLCBmYWxzZSkpOwogCi0gICAgcGFpbnRJ bmZvLmNvbnRleHQtPmFkZFJvdW5kZWRSZWN0Q2xpcChib3VuZHMpOworICAgIHBhaW50SW5mby5j b250ZXh0LT5jbGlwUm91bmRlZFJlY3QoYm91bmRzKTsKICAgICBDR0NvbnRleHREcmF3U2hhZGlu Zyhjb250ZXh0LCBtYWluU2hhZGluZy5nZXQoKSk7CiAgICAgcGFpbnRJbmZvLmNvbnRleHQtPnJl c3RvcmUoKTsKICAgICAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJUaGVtZVdpbkNFLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZVdp bkNFLmNwcAppbmRleCBjNTc1MGY0YmM2NmFmZGJhNWVjOWQ4YzMxMzVhNDc2NTE5NDg1OGI1Li45 NTBkZjMxZjQ0NDVlMjk2MTRjMjhkOGFkNzM5ZjgzNmVjNDRjOWEwIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVXaW5DRS5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lV2luQ0UuY3BwCkBAIC0zNzksNyArMzc5LDcgQEAg Ym9vbCBSZW5kZXJUaGVtZVdpbkNFOjpwYWludFNlYXJjaEZpZWxkQ2FuY2VsQnV0dG9uKFJlbmRl ck9iamVjdCogbywgY29uc3QgUGFpbnQKICAgICBpbnQgeSA9IHIueSgpICsgKHIuaGVpZ2h0KCkg LSBjYW5jZWxTaXplLmhlaWdodCgpKSAvIDIgKyAxOwogICAgIEludFJlY3QgY2FuY2VsQm91bmRz KEludFBvaW50KHgsIHkpLCBjYW5jZWxTaXplKTsKICAgICBwYWludEluZm8uY29udGV4dC0+c2F2 ZSgpOwotICAgIHBhaW50SW5mby5jb250ZXh0LT5hZGRSb3VuZGVkUmVjdENsaXAoUm91bmRlZFJl Y3QoY2FuY2VsQm91bmRzLCBjYW5jZWxSYWRpdXMsIGNhbmNlbFJhZGl1cywgY2FuY2VsUmFkaXVz LCBjYW5jZWxSYWRpdXMpKTsKKyAgICBwYWludEluZm8uY29udGV4dC0+Y2xpcFJvdW5kZWRSZWN0 KFJvdW5kZWRSZWN0KGNhbmNlbEJvdW5kcywgY2FuY2VsUmFkaXVzLCBjYW5jZWxSYWRpdXMsIGNh bmNlbFJhZGl1cywgY2FuY2VsUmFkaXVzKSk7CiAgICAgcGFpbnRJbmZvLmNvbnRleHQtPmZpbGxS ZWN0KGNhbmNlbEJvdW5kcywgYnV0dG9uQ29sb3IsIENvbG9yU3BhY2VEZXZpY2VSR0IpOwogCiAg ICAgLy8gRHJhdyB0aGUgJ3gnCg==