173637 2017-06-20 21:40:29 -0700 Fix AVVideoCaptureSource frameRate setter and getter 2017-06-21 14:06:26 -0700 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf commit-queue eric.carlson jonlee webkit-bug-importer oldest_to_newest 1321401 0 youennf 2017-06-20 21:40:29 -0700 Fix AVVideoCaptureSource frameRate setter and getter 1321406 1 313489 youennf 2017-06-20 21:48:53 -0700 Created attachment 313489 Patch 1321413 2 youennf 2017-06-20 22:47:54 -0700 rdar://problem/32593823 1321590 3 313540 youennf 2017-06-21 13:18:20 -0700 Created attachment 313540 Patch for landing 1321592 4 313540 commit-queue 2017-06-21 13:21:19 -0700 Comment on attachment 313540 Patch for landing Rejecting attachment 313540 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-03', 'validate-changelog', '--check-oops', '--non-interactive', 313540, '--port=mac']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit ChangeLog entry in Source/WebCore/ChangeLog contains OOPS!. Full output: http://webkit-queues.webkit.org/results/3973638 1321593 5 313542 youennf 2017-06-21 13:22:36 -0700 Created attachment 313542 Patch 1321622 6 313542 commit-queue 2017-06-21 14:06:25 -0700 Comment on attachment 313542 Patch Clearing flags on attachment: 313542 Committed r218647: <http://trac.webkit.org/changeset/218647> 1321623 7 commit-queue 2017-06-21 14:06:26 -0700 All reviewed patches have been landed. Closing bug. 313489 2017-06-20 21:48:53 -0700 2017-06-21 13:18:19 -0700 Patch bug-173637-20170620214851.patch text/plain 5595 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjE4NTkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTA2Y2M4N2IwNWJmMDcw ZTM1MTg1M2E1ODRiNjNhNmNhMGM5YjU1ZC4uYmU0ZGI3MzhiNTliYjE3ODE0Yjg2Y2IxOGZjYzg5 MjZjZjExZDdlMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI2IEBACiAyMDE3LTA2LTIwICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAorICAgICAgICBGaXggQVZWaWRlb0NhcHR1 cmVTb3VyY2UgZnJhbWVSYXRlIHNldHRlciBhbmQgZ2V0dGVyCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzM2MzcKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDb3ZlcmVkIGJ5IG1hbnVhbCB0ZXN0aW5nLgor CisgICAgICAgIFVzaW5nIGFjdGl2ZVZpZGVvTWF4RnJhbWVEdXJhdGlvbiB0byBnZXQgdGhlIGZy YW1lIHJhdGUuCisgICAgICAgIFNldHRpbmcgdGhlIGZyYW1lIHJhdGUgYWNjb3JkaW5nIHRoZSBn aXZlbiB2YWxlIGlmIGluIHRoZSBhbGxvd2VkIHJhbmdlLgorCisgICAgICAgICogcGxhdGZvcm0v bWVkaWFzdHJlYW0vbWFjL0FWVmlkZW9DYXB0dXJlU291cmNlLmg6CisgICAgICAgICogcGxhdGZv cm0vbWVkaWFzdHJlYW0vbWFjL0FWVmlkZW9DYXB0dXJlU291cmNlLm1tOgorICAgICAgICAoV2Vi Q29yZTo6QVZWaWRlb0NhcHR1cmVTb3VyY2U6OnVwZGF0ZVNldHRpbmdzKToKKyAgICAgICAgKFdl YkNvcmU6OkFWVmlkZW9DYXB0dXJlU291cmNlOjphcHBseUZyYW1lUmF0ZSk6CisgICAgICAgIChX ZWJDb3JlOjpBVlZpZGVvQ2FwdHVyZVNvdXJjZTo6YXBwbHlTaXplQW5kRnJhbWVSYXRlKToKKyAg ICAgICAgKFdlYkNvcmU6OkFWVmlkZW9DYXB0dXJlU291cmNlOjpzaHV0ZG93bkNhcHR1cmVTZXNz aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OkFWVmlkZW9DYXB0dXJlU291cmNlOjpwcm9jZXNzTmV3 RnJhbWUpOgorICAgICAgICAoV2ViQ29yZTo6QVZWaWRlb0NhcHR1cmVTb3VyY2U6OnVwZGF0ZUZy YW1lcmF0ZSk6IERlbGV0ZWQuCisKKzIwMTctMDYtMjAgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5A YXBwbGUuY29tPgorCiAgICAgICAgIFJlZnJlc2ggbGlid2VicnRjIGNvZGUgdXAgdG8gYTg3Njc1 ZDRhMTYwZTJjNDljM2U3NTRjZDljYTI5MWQ2YzhmMzZhZQogICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTczNjAyCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9BVlZpZGVvQ2FwdHVyZVNvdXJjZS5oIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL0FWVmlkZW9DYXB0dXJlU291 cmNlLmgKaW5kZXggOWE2YzI2Y2EzMzIzZjk3MDM3OWE1ZTQwNjdmZTI1MzdlNWNjODEyMS4uMTY1 M2FhOTg1NDUxZmQyNWRiYjk1NGZlODc2YTYwZjhmYzE0NzgzNiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL0FWVmlkZW9DYXB0dXJlU291cmNlLmgK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL0FWVmlkZW9DYXB0 dXJlU291cmNlLmgKQEAgLTgwLDggKzgwLDYgQEAgcHJpdmF0ZToKIAogICAgIGJvb2wgc2V0RnJh bWVSYXRlQ29uc3RyYWludChkb3VibGUgbWluRnJhbWVSYXRlLCBkb3VibGUgbWF4RnJhbWVSYXRl KTsKIAotICAgIGJvb2wgdXBkYXRlRnJhbWVyYXRlKENNU2FtcGxlQnVmZmVyUmVmKTsKLQogICAg IHZvaWQgY2FwdHVyZU91dHB1dERpZE91dHB1dFNhbXBsZUJ1ZmZlckZyb21Db25uZWN0aW9uKEFW Q2FwdHVyZU91dHB1dCosIENNU2FtcGxlQnVmZmVyUmVmLCBBVkNhcHR1cmVDb25uZWN0aW9uKikg ZmluYWw7CiAgICAgdm9pZCBwcm9jZXNzTmV3RnJhbWUoUmV0YWluUHRyPENNU2FtcGxlQnVmZmVy UmVmPiwgUmV0YWluUHRyPEFWQ2FwdHVyZUNvbm5lY3Rpb24+KTsKIApAQCAtOTIsOCArOTAsNiBA QCBwcml2YXRlOgogCiAgICAgc3RkOjp1bmlxdWVfcHRyPFBpeGVsQnVmZmVyQ29uZm9ybWVyQ1Y+ IG1fcGl4ZWxCdWZmZXJDb25mb3JtZXI7CiAKLSAgICBWZWN0b3I8RmxvYXQ2ND4gbV92aWRlb0Zy YW1lVGltZVN0YW1wczsKLSAgICBGbG9hdDY0IG1fZnJhbWVSYXRlIHsgMCB9OwogICAgIGludDMy X3QgbV93aWR0aCB7IDAgfTsKICAgICBpbnQzMl90IG1faGVpZ2h0IHsgMCB9OwogICAgIGludCBt X3NlbnNvck9yaWVudGF0aW9uIHsgMCB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vbWVkaWFzdHJlYW0vbWFjL0FWVmlkZW9DYXB0dXJlU291cmNlLm1tIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL0FWVmlkZW9DYXB0dXJlU291cmNlLm1tCmlu ZGV4IGYxZjRlYTY3Njk5MjU1ZjEyYzRmY2M2MmQyNzI1YzNkYzI3ZmQ2NDEuLmMyMDkzMjkyN2My OTlmZDc0ZjI4ZWQ2ODJhYTI1NWU2MjM5YTI5MWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9BVlZpZGVvQ2FwdHVyZVNvdXJjZS5tbQorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQVZWaWRlb0NhcHR1cmVTb3Vy Y2UubW0KQEAgLTI1Nyw4ICsyNTcsMTAgQEAgdm9pZCBBVlZpZGVvQ2FwdHVyZVNvdXJjZTo6dXBk YXRlU2V0dGluZ3MoUmVhbHRpbWVNZWRpYVNvdXJjZVNldHRpbmdzJiBzZXR0aW5ncykKICAgICAg ICAgc2V0dGluZ3Muc2V0RmFjaW5nTW9kZShSZWFsdGltZU1lZGlhU291cmNlU2V0dGluZ3M6OkVu dmlyb25tZW50KTsKICAgICBlbHNlCiAgICAgICAgIHNldHRpbmdzLnNldEZhY2luZ01vZGUoUmVh bHRpbWVNZWRpYVNvdXJjZVNldHRpbmdzOjpVbmtub3duKTsKLSAgICAKLSAgICBzZXR0aW5ncy5z ZXRGcmFtZVJhdGUobV9mcmFtZVJhdGUpOworCisgICAgLy8gRklYTUU6IE9ic2VydmUgZnJhbWUg cmF0ZSBjaGFuZ2VzLgorICAgIGF1dG8gbWF4RnJhbWVEdXJhdGlvbiA9IFtkZXZpY2UoKSBhY3Rp dmVWaWRlb01heEZyYW1lRHVyYXRpb25dOworICAgIHNldHRpbmdzLnNldEZyYW1lUmF0ZShtYXhG cmFtZUR1cmF0aW9uLnRpbWVzY2FsZSAvIG1heEZyYW1lRHVyYXRpb24udmFsdWUpOwogICAgIHNl dHRpbmdzLnNldFdpZHRoKG1fd2lkdGgpOwogICAgIHNldHRpbmdzLnNldEhlaWdodChtX2hlaWdo dCk7CiAgICAgc2V0dGluZ3Muc2V0QXNwZWN0UmF0aW8oc3RhdGljX2Nhc3Q8ZmxvYXQ+KG1fd2lk dGgpIC8gbV9oZWlnaHQpOwpAQCAtMzQyLDcgKzM0NCw4IEBAIGJvb2wgQVZWaWRlb0NhcHR1cmVT b3VyY2U6OmFwcGx5RnJhbWVSYXRlKGRvdWJsZSByYXRlKQogICAgIE5TRXJyb3IgKmVycm9yID0g bmlsOwogICAgIEB0cnkgewogICAgICAgICBpZiAoW2RldmljZSgpIGxvY2tGb3JDb25maWd1cmF0 aW9uOiZlcnJvcl0pIHsKLSAgICAgICAgICAgIFtkZXZpY2UoKSBzZXRBY3RpdmVWaWRlb01pbkZy YW1lRHVyYXRpb246W2Jlc3RGcmFtZVJhdGVSYW5nZSBtaW5GcmFtZUR1cmF0aW9uXV07CisgICAg ICAgICAgICBbZGV2aWNlKCkgc2V0QWN0aXZlVmlkZW9NaW5GcmFtZUR1cmF0aW9uOiBDTVRpbWVN YWtlKDEsIHJhdGUpXTsKKyAgICAgICAgICAgIFtkZXZpY2UoKSBzZXRBY3RpdmVWaWRlb01heEZy YW1lRHVyYXRpb246IENNVGltZU1ha2UoMSwgcmF0ZSldOwogICAgICAgICAgICAgW2RldmljZSgp IHVubG9ja0ZvckNvbmZpZ3VyYXRpb25dOwogICAgICAgICB9CiAgICAgfSBAY2F0Y2goTlNFeGNl cHRpb24gKmV4Y2VwdGlvbikgewpAQCAtMzYxLDcgKzM2NCw4IEBAIGJvb2wgQVZWaWRlb0NhcHR1 cmVTb3VyY2U6OmFwcGx5RnJhbWVSYXRlKGRvdWJsZSByYXRlKQogCiB2b2lkIEFWVmlkZW9DYXB0 dXJlU291cmNlOjphcHBseVNpemVBbmRGcmFtZVJhdGUoc3RkOjpvcHRpb25hbDxpbnQ+IHdpZHRo LCBzdGQ6Om9wdGlvbmFsPGludD4gaGVpZ2h0LCBzdGQ6Om9wdGlvbmFsPGRvdWJsZT4gZnJhbWVS YXRlKQogewotICAgIHNldFByZXNldChiZXN0U2Vzc2lvblByZXNldEZvclZpZGVvRGltZW5zaW9u cyhXVEZNb3ZlKHdpZHRoKSwgV1RGTW92ZShoZWlnaHQpKSk7CisgICAgaWYgKHdpZHRoIHx8IGhl aWdodCkKKyAgICAgICAgc2V0UHJlc2V0KGJlc3RTZXNzaW9uUHJlc2V0Rm9yVmlkZW9EaW1lbnNp b25zKFdURk1vdmUod2lkdGgpLCBXVEZNb3ZlKGhlaWdodCkpKTsKIAogICAgIGlmIChmcmFtZVJh dGUpCiAgICAgICAgIGFwcGx5RnJhbWVSYXRlKGZyYW1lUmF0ZS52YWx1ZSgpKTsKQEAgLTQ1MSwz MiArNDU1LDEwIEBAIHZvaWQgQVZWaWRlb0NhcHR1cmVTb3VyY2U6OnNodXRkb3duQ2FwdHVyZVNl c3Npb24oKQogewogICAgIG1fYnVmZmVyID0gbnVsbHB0cjsKICAgICBtX2xhc3RJbWFnZSA9IG51 bGxwdHI7Ci0gICAgbV92aWRlb0ZyYW1lVGltZVN0YW1wcy5jbGVhcigpOwotICAgIG1fZnJhbWVS YXRlID0gMDsKICAgICBtX3dpZHRoID0gMDsKICAgICBtX2hlaWdodCA9IDA7CiB9CiAKLWJvb2wg QVZWaWRlb0NhcHR1cmVTb3VyY2U6OnVwZGF0ZUZyYW1lcmF0ZShDTVNhbXBsZUJ1ZmZlclJlZiBz YW1wbGVCdWZmZXIpCi17Ci0gICAgQ01UaW1lIHNhbXBsZVRpbWUgPSBDTVNhbXBsZUJ1ZmZlckdl dFByZXNlbnRhdGlvblRpbWVTdGFtcChzYW1wbGVCdWZmZXIpOwotICAgIGlmICghQ01USU1FX0lT X05VTUVSSUMoc2FtcGxlVGltZSkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgIEZsb2F0 NjQgZnJhbWVUaW1lID0gQ01UaW1lR2V0U2Vjb25kcyhzYW1wbGVUaW1lKTsKLSAgICBGbG9hdDY0 IG9uZVNlY29uZEFnbyA9IGZyYW1lVGltZSAtIDE7Ci0gICAgCi0gICAgbV92aWRlb0ZyYW1lVGlt ZVN0YW1wcy5hcHBlbmQoZnJhbWVUaW1lKTsKLSAgICAKLSAgICB3aGlsZSAobV92aWRlb0ZyYW1l VGltZVN0YW1wc1swXSA8IG9uZVNlY29uZEFnbykKLSAgICAgICAgbV92aWRlb0ZyYW1lVGltZVN0 YW1wcy5yZW1vdmUoMCk7Ci0KLSAgICBGbG9hdDY0IGZyYW1lUmF0ZSA9IG1fZnJhbWVSYXRlOwot ICAgIG1fZnJhbWVSYXRlID0gKG1fZnJhbWVSYXRlICsgbV92aWRlb0ZyYW1lVGltZVN0YW1wcy5z aXplKCkpIC8gMjsKLQotICAgIHJldHVybiBmcmFtZVJhdGUgIT0gbV9mcmFtZVJhdGU7Ci19Ci0K IHZvaWQgQVZWaWRlb0NhcHR1cmVTb3VyY2U6Om1vbml0b3JPcmllbnRhdGlvbihPcmllbnRhdGlv bk5vdGlmaWVyJiBub3RpZmllcikKIHsKICNpZiBQTEFURk9STShJT1MpCkBAIC01MjksNyArNTEx LDYgQEAgdm9pZCBBVlZpZGVvQ2FwdHVyZVNvdXJjZTo6cHJvY2Vzc05ld0ZyYW1lKFJldGFpblB0 cjxDTVNhbXBsZUJ1ZmZlclJlZj4gc2FtcGxlQnUKICAgICBpZiAoIWZvcm1hdERlc2NyaXB0aW9u KQogICAgICAgICByZXR1cm47CiAKLSAgICB1cGRhdGVGcmFtZXJhdGUoc2FtcGxlQnVmZmVyLmdl dCgpKTsKICAgICBtX2J1ZmZlciA9IHNhbXBsZUJ1ZmZlcjsKICAgICBtX2xhc3RJbWFnZSA9IG51 bGxwdHI7CiAK 313540 2017-06-21 13:18:20 -0700 2017-06-21 13:22:35 -0700 Patch for landing bug-173637-20170621131819.patch text/plain 8503 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjE4NTkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDJjMDAxNDRkODQyZDVi ZmFkNjgwY2JiY2NiMmM2M2NjNThiYjdjNi4uY2ZiODQzZTRiYTRmNmZlZjM3MjEyODVlODNjMTFi MTZmYmMxYTYwOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE3LTA2LTIxICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBGaXggQVZWaWRlb0NhcHR1 cmVTb3VyY2UgZnJhbWVSYXRlIHNldHRlciBhbmQgZ2V0dGVyCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzM2MzcKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDb3ZlcmVkIGJ5IG1hbnVhbCB0ZXN0aW5nLgor CisgICAgICAgIFVzaW5nIGFjdGl2ZVZpZGVvTWF4RnJhbWVEdXJhdGlvbiB0byBnZXQgdGhlIGZy YW1lIHJhdGUuCisgICAgICAgIFNldHRpbmcgdGhlIGZyYW1lIHJhdGUgYWNjb3JkaW5nIHRoZSBn aXZlbiB2YWxlIGlmIGluIHRoZSBhbGxvd2VkIHJhbmdlLgorCisgICAgICAgICogcGxhdGZvcm0v bWVkaWFzdHJlYW0vbWFjL0FWVmlkZW9DYXB0dXJlU291cmNlLmg6CisgICAgICAgICogcGxhdGZv cm0vbWVkaWFzdHJlYW0vbWFjL0FWVmlkZW9DYXB0dXJlU291cmNlLm1tOgorICAgICAgICAoV2Vi Q29yZTo6QVZWaWRlb0NhcHR1cmVTb3VyY2U6OnVwZGF0ZVNldHRpbmdzKToKKyAgICAgICAgKFdl YkNvcmU6OkFWVmlkZW9DYXB0dXJlU291cmNlOjphcHBseUZyYW1lUmF0ZSk6CisgICAgICAgIChX ZWJDb3JlOjpBVlZpZGVvQ2FwdHVyZVNvdXJjZTo6YXBwbHlTaXplQW5kRnJhbWVSYXRlKToKKyAg ICAgICAgKFdlYkNvcmU6OkFWVmlkZW9DYXB0dXJlU291cmNlOjpzaHV0ZG93bkNhcHR1cmVTZXNz aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OkFWVmlkZW9DYXB0dXJlU291cmNlOjpwcm9jZXNzTmV3 RnJhbWUpOgorICAgICAgICAoV2ViQ29yZTo6QVZWaWRlb0NhcHR1cmVTb3VyY2U6OnVwZGF0ZUZy YW1lcmF0ZSk6IERlbGV0ZWQuCisKIDIwMTctMDYtMjAgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5A YXBwbGUuY29tPgogCiAgICAgICAgIFtXZWJSVENdIFByZXZlbnQgY2FwdHVyaW5nIGF0IHVuY29u dmVudGlvbmFsIHJlc29sdXRpb25zIHdoZW4gdXNpbmcgdGhlIFNXIGVuY29kZXIgb24gTWFjCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQVZWaWRl b0NhcHR1cmVTb3VyY2UuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL21h Yy9BVlZpZGVvQ2FwdHVyZVNvdXJjZS5oCmluZGV4IDlhNmMyNmNhMzMyM2Y5NzAzNzlhNWU0MDY3 ZmUyNTM3ZTVjYzgxMjEuLmQyYzdlMjlkZDI3M2IzYjU3NmY4Zjk1YmIxZGE3YzdlODkxNzc0NTQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9BVlZp ZGVvQ2FwdHVyZVNvdXJjZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3Ry ZWFtL21hYy9BVlZpZGVvQ2FwdHVyZVNvdXJjZS5oCkBAIC02OSw2ICs2OSw4IEBAIHByaXZhdGU6 CiAgICAgdm9pZCBtb25pdG9yT3JpZW50YXRpb24oT3JpZW50YXRpb25Ob3RpZmllciYpIGZpbmFs OwogICAgIHZvaWQgY29tcHV0ZVNhbXBsZVJvdGF0aW9uKCk7CiAKKyAgICBib29sIGlzRnJhbWVS YXRlU3VwcG9ydGVkKGRvdWJsZSBmcmFtZVJhdGUpOworCiAgICAgTlNTdHJpbmcgKmJlc3RTZXNz aW9uUHJlc2V0Rm9yVmlkZW9EaW1lbnNpb25zKHN0ZDo6b3B0aW9uYWw8aW50PiB3aWR0aCwgc3Rk OjpvcHRpb25hbDxpbnQ+IGhlaWdodCkgY29uc3Q7CiAgICAgYm9vbCBzdXBwb3J0c1NpemVBbmRG cmFtZVJhdGUoc3RkOjpvcHRpb25hbDxpbnQ+IHdpZHRoLCBzdGQ6Om9wdGlvbmFsPGludD4gaGVp Z2h0LCBzdGQ6Om9wdGlvbmFsPGRvdWJsZT4pIGZpbmFsOwogCkBAIC04MCw4ICs4Miw2IEBAIHBy aXZhdGU6CiAKICAgICBib29sIHNldEZyYW1lUmF0ZUNvbnN0cmFpbnQoZG91YmxlIG1pbkZyYW1l UmF0ZSwgZG91YmxlIG1heEZyYW1lUmF0ZSk7CiAKLSAgICBib29sIHVwZGF0ZUZyYW1lcmF0ZShD TVNhbXBsZUJ1ZmZlclJlZik7Ci0KICAgICB2b2lkIGNhcHR1cmVPdXRwdXREaWRPdXRwdXRTYW1w bGVCdWZmZXJGcm9tQ29ubmVjdGlvbihBVkNhcHR1cmVPdXRwdXQqLCBDTVNhbXBsZUJ1ZmZlclJl ZiwgQVZDYXB0dXJlQ29ubmVjdGlvbiopIGZpbmFsOwogICAgIHZvaWQgcHJvY2Vzc05ld0ZyYW1l KFJldGFpblB0cjxDTVNhbXBsZUJ1ZmZlclJlZj4sIFJldGFpblB0cjxBVkNhcHR1cmVDb25uZWN0 aW9uPik7CiAKQEAgLTkyLDggKzkyLDYgQEAgcHJpdmF0ZToKIAogICAgIHN0ZDo6dW5pcXVlX3B0 cjxQaXhlbEJ1ZmZlckNvbmZvcm1lckNWPiBtX3BpeGVsQnVmZmVyQ29uZm9ybWVyOwogCi0gICAg VmVjdG9yPEZsb2F0NjQ+IG1fdmlkZW9GcmFtZVRpbWVTdGFtcHM7Ci0gICAgRmxvYXQ2NCBtX2Zy YW1lUmF0ZSB7IDAgfTsKICAgICBpbnQzMl90IG1fd2lkdGggeyAwIH07CiAgICAgaW50MzJfdCBt X2hlaWdodCB7IDAgfTsKICAgICBpbnQgbV9zZW5zb3JPcmllbnRhdGlvbiB7IDAgfTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9BVlZpZGVvQ2Fw dHVyZVNvdXJjZS5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL21hYy9B VlZpZGVvQ2FwdHVyZVNvdXJjZS5tbQppbmRleCBmMWY0ZWE2NzY5OTI1NWYxMmM0ZmNjNjJkMjcy NWMzZGMyN2ZkNjQxLi5kYzdmYjdkNWQ4OGFjZWExMTFlZjI0MWZmMzhkMTFiYzhiMDVlNDgzIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQVZWaWRl b0NhcHR1cmVTb3VyY2UubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJl YW0vbWFjL0FWVmlkZW9DYXB0dXJlU291cmNlLm1tCkBAIC0yNTcsOCArMjU3LDEwIEBAIHZvaWQg QVZWaWRlb0NhcHR1cmVTb3VyY2U6OnVwZGF0ZVNldHRpbmdzKFJlYWx0aW1lTWVkaWFTb3VyY2VT ZXR0aW5ncyYgc2V0dGluZ3MpCiAgICAgICAgIHNldHRpbmdzLnNldEZhY2luZ01vZGUoUmVhbHRp bWVNZWRpYVNvdXJjZVNldHRpbmdzOjpFbnZpcm9ubWVudCk7CiAgICAgZWxzZQogICAgICAgICBz ZXR0aW5ncy5zZXRGYWNpbmdNb2RlKFJlYWx0aW1lTWVkaWFTb3VyY2VTZXR0aW5nczo6VW5rbm93 bik7Ci0gICAgCi0gICAgc2V0dGluZ3Muc2V0RnJhbWVSYXRlKG1fZnJhbWVSYXRlKTsKKworICAg IC8vIEZJWE1FOiBPYnNlcnZlIGZyYW1lIHJhdGUgY2hhbmdlcy4KKyAgICBhdXRvIG1heEZyYW1l RHVyYXRpb24gPSBbZGV2aWNlKCkgYWN0aXZlVmlkZW9NYXhGcmFtZUR1cmF0aW9uXTsKKyAgICBz ZXR0aW5ncy5zZXRGcmFtZVJhdGUobWF4RnJhbWVEdXJhdGlvbi50aW1lc2NhbGUgLyBtYXhGcmFt ZUR1cmF0aW9uLnZhbHVlKTsKICAgICBzZXR0aW5ncy5zZXRXaWR0aChtX3dpZHRoKTsKICAgICBz ZXR0aW5ncy5zZXRIZWlnaHQobV9oZWlnaHQpOwogICAgIHNldHRpbmdzLnNldEFzcGVjdFJhdGlv KHN0YXRpY19jYXN0PGZsb2F0PihtX3dpZHRoKSAvIG1faGVpZ2h0KTsKQEAgLTMyNiwxNSArMzI4 LDE2IEBAIGJvb2wgQVZWaWRlb0NhcHR1cmVTb3VyY2U6OnNldFByZXNldChOU1N0cmluZyAqcHJl c2V0KQogCiBib29sIEFWVmlkZW9DYXB0dXJlU291cmNlOjphcHBseUZyYW1lUmF0ZShkb3VibGUg cmF0ZSkKIHsKKyAgICBkb3VibGUgZXBzaWxvbiA9IDAuMDAwMDE7CiAgICAgQVZGcmFtZVJhdGVS YW5nZVR5cGUgKmJlc3RGcmFtZVJhdGVSYW5nZSA9IG5pbDsKICAgICBmb3IgKEFWRnJhbWVSYXRl UmFuZ2VUeXBlICpmcmFtZVJhdGVSYW5nZSBpbiBbW2RldmljZSgpIGFjdGl2ZUZvcm1hdF0gdmlk ZW9TdXBwb3J0ZWRGcmFtZVJhdGVSYW5nZXNdKSB7Ci0gICAgICAgIGlmIChyYXRlID49IFtmcmFt ZVJhdGVSYW5nZSBtaW5GcmFtZVJhdGVdICYmIHJhdGUgPD0gW2ZyYW1lUmF0ZVJhbmdlIG1heEZy YW1lUmF0ZV0pIHsKKyAgICAgICAgaWYgKHJhdGUgKyBlcHNpbG9uID49IFtmcmFtZVJhdGVSYW5n ZSBtaW5GcmFtZVJhdGVdICYmIHJhdGUgLSBlcHNpbG9uIDw9IFtmcmFtZVJhdGVSYW5nZSBtYXhG cmFtZVJhdGVdKSB7CiAgICAgICAgICAgICBpZiAoIWJlc3RGcmFtZVJhdGVSYW5nZSB8fCBDTVRJ TUVfQ09NUEFSRV9JTkxJTkUoW2ZyYW1lUmF0ZVJhbmdlIG1pbkZyYW1lRHVyYXRpb25dLCA+LCBb YmVzdEZyYW1lUmF0ZVJhbmdlIG1pbkZyYW1lRHVyYXRpb25dKSkKICAgICAgICAgICAgICAgICBi ZXN0RnJhbWVSYXRlUmFuZ2UgPSBmcmFtZVJhdGVSYW5nZTsKICAgICAgICAgfQogICAgIH0KIAot ICAgIGlmICghYmVzdEZyYW1lUmF0ZVJhbmdlKSB7CisgICAgaWYgKCFiZXN0RnJhbWVSYXRlUmFu Z2UgfHwgIWlzRnJhbWVSYXRlU3VwcG9ydGVkKHJhdGUpKSB7CiAgICAgICAgIExPRyhNZWRpYSwg IkFWVmlkZW9DYXB0dXJlU291cmNlOjphcHBseUZyYW1lUmF0ZSglcCksIGZyYW1lIHJhdGUgJWYg bm90IHN1cHBvcnRlZCBieSB2aWRlbyBkZXZpY2UiLCB0aGlzLCByYXRlKTsKICAgICAgICAgcmV0 dXJuIGZhbHNlOwogICAgIH0KQEAgLTM0Miw3ICszNDUsMTMgQEAgYm9vbCBBVlZpZGVvQ2FwdHVy ZVNvdXJjZTo6YXBwbHlGcmFtZVJhdGUoZG91YmxlIHJhdGUpCiAgICAgTlNFcnJvciAqZXJyb3Ig PSBuaWw7CiAgICAgQHRyeSB7CiAgICAgICAgIGlmIChbZGV2aWNlKCkgbG9ja0ZvckNvbmZpZ3Vy YXRpb246JmVycm9yXSkgewotICAgICAgICAgICAgW2RldmljZSgpIHNldEFjdGl2ZVZpZGVvTWlu RnJhbWVEdXJhdGlvbjpbYmVzdEZyYW1lUmF0ZVJhbmdlIG1pbkZyYW1lRHVyYXRpb25dXTsKKyAg ICAgICAgICAgIGlmIChiZXN0RnJhbWVSYXRlUmFuZ2UubWluRnJhbWVSYXRlID09IGJlc3RGcmFt ZVJhdGVSYW5nZS5tYXhGcmFtZVJhdGUpIHsKKyAgICAgICAgICAgICAgICBbZGV2aWNlKCkgc2V0 QWN0aXZlVmlkZW9NaW5GcmFtZUR1cmF0aW9uOltiZXN0RnJhbWVSYXRlUmFuZ2UgbWluRnJhbWVE dXJhdGlvbl1dOworICAgICAgICAgICAgICAgIFtkZXZpY2UoKSBzZXRBY3RpdmVWaWRlb01heEZy YW1lRHVyYXRpb246W2Jlc3RGcmFtZVJhdGVSYW5nZSBtYXhGcmFtZUR1cmF0aW9uXV07CisgICAg ICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgICAgIFtkZXZpY2UoKSBzZXRBY3RpdmVWaWRl b01pbkZyYW1lRHVyYXRpb246IENNVGltZU1ha2UoMSwgcmF0ZSldOworICAgICAgICAgICAgICAg IFtkZXZpY2UoKSBzZXRBY3RpdmVWaWRlb01heEZyYW1lRHVyYXRpb246IENNVGltZU1ha2UoMSwg cmF0ZSldOworICAgICAgICAgICAgfQogICAgICAgICAgICAgW2RldmljZSgpIHVubG9ja0ZvckNv bmZpZ3VyYXRpb25dOwogICAgICAgICB9CiAgICAgfSBAY2F0Y2goTlNFeGNlcHRpb24gKmV4Y2Vw dGlvbikgewpAQCAtMzYxLDcgKzM3MCw4IEBAIGJvb2wgQVZWaWRlb0NhcHR1cmVTb3VyY2U6OmFw cGx5RnJhbWVSYXRlKGRvdWJsZSByYXRlKQogCiB2b2lkIEFWVmlkZW9DYXB0dXJlU291cmNlOjph cHBseVNpemVBbmRGcmFtZVJhdGUoc3RkOjpvcHRpb25hbDxpbnQ+IHdpZHRoLCBzdGQ6Om9wdGlv bmFsPGludD4gaGVpZ2h0LCBzdGQ6Om9wdGlvbmFsPGRvdWJsZT4gZnJhbWVSYXRlKQogewotICAg IHNldFByZXNldChiZXN0U2Vzc2lvblByZXNldEZvclZpZGVvRGltZW5zaW9ucyhXVEZNb3ZlKHdp ZHRoKSwgV1RGTW92ZShoZWlnaHQpKSk7CisgICAgaWYgKHdpZHRoIHx8IGhlaWdodCkKKyAgICAg ICAgc2V0UHJlc2V0KGJlc3RTZXNzaW9uUHJlc2V0Rm9yVmlkZW9EaW1lbnNpb25zKFdURk1vdmUo d2lkdGgpLCBXVEZNb3ZlKGhlaWdodCkpKTsKIAogICAgIGlmIChmcmFtZVJhdGUpCiAgICAgICAg IGFwcGx5RnJhbWVSYXRlKGZyYW1lUmF0ZS52YWx1ZSgpKTsKQEAgLTQ1MSwzMiArNDYxLDEwIEBA IHZvaWQgQVZWaWRlb0NhcHR1cmVTb3VyY2U6OnNodXRkb3duQ2FwdHVyZVNlc3Npb24oKQogewog ICAgIG1fYnVmZmVyID0gbnVsbHB0cjsKICAgICBtX2xhc3RJbWFnZSA9IG51bGxwdHI7Ci0gICAg bV92aWRlb0ZyYW1lVGltZVN0YW1wcy5jbGVhcigpOwotICAgIG1fZnJhbWVSYXRlID0gMDsKICAg ICBtX3dpZHRoID0gMDsKICAgICBtX2hlaWdodCA9IDA7CiB9CiAKLWJvb2wgQVZWaWRlb0NhcHR1 cmVTb3VyY2U6OnVwZGF0ZUZyYW1lcmF0ZShDTVNhbXBsZUJ1ZmZlclJlZiBzYW1wbGVCdWZmZXIp Ci17Ci0gICAgQ01UaW1lIHNhbXBsZVRpbWUgPSBDTVNhbXBsZUJ1ZmZlckdldFByZXNlbnRhdGlv blRpbWVTdGFtcChzYW1wbGVCdWZmZXIpOwotICAgIGlmICghQ01USU1FX0lTX05VTUVSSUMoc2Ft cGxlVGltZSkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgIEZsb2F0NjQgZnJhbWVUaW1l ID0gQ01UaW1lR2V0U2Vjb25kcyhzYW1wbGVUaW1lKTsKLSAgICBGbG9hdDY0IG9uZVNlY29uZEFn byA9IGZyYW1lVGltZSAtIDE7Ci0gICAgCi0gICAgbV92aWRlb0ZyYW1lVGltZVN0YW1wcy5hcHBl bmQoZnJhbWVUaW1lKTsKLSAgICAKLSAgICB3aGlsZSAobV92aWRlb0ZyYW1lVGltZVN0YW1wc1sw XSA8IG9uZVNlY29uZEFnbykKLSAgICAgICAgbV92aWRlb0ZyYW1lVGltZVN0YW1wcy5yZW1vdmUo MCk7Ci0KLSAgICBGbG9hdDY0IGZyYW1lUmF0ZSA9IG1fZnJhbWVSYXRlOwotICAgIG1fZnJhbWVS YXRlID0gKG1fZnJhbWVSYXRlICsgbV92aWRlb0ZyYW1lVGltZVN0YW1wcy5zaXplKCkpIC8gMjsK LQotICAgIHJldHVybiBmcmFtZVJhdGUgIT0gbV9mcmFtZVJhdGU7Ci19Ci0KIHZvaWQgQVZWaWRl b0NhcHR1cmVTb3VyY2U6Om1vbml0b3JPcmllbnRhdGlvbihPcmllbnRhdGlvbk5vdGlmaWVyJiBu b3RpZmllcikKIHsKICNpZiBQTEFURk9STShJT1MpCkBAIC01MjksNyArNTE3LDYgQEAgdm9pZCBB VlZpZGVvQ2FwdHVyZVNvdXJjZTo6cHJvY2Vzc05ld0ZyYW1lKFJldGFpblB0cjxDTVNhbXBsZUJ1 ZmZlclJlZj4gc2FtcGxlQnUKICAgICBpZiAoIWZvcm1hdERlc2NyaXB0aW9uKQogICAgICAgICBy ZXR1cm47CiAKLSAgICB1cGRhdGVGcmFtZXJhdGUoc2FtcGxlQnVmZmVyLmdldCgpKTsKICAgICBt X2J1ZmZlciA9IHNhbXBsZUJ1ZmZlcjsKICAgICBtX2xhc3RJbWFnZSA9IG51bGxwdHI7CiAKQEAg LTU4MSw2ICs1NjgsMTYgQEAgTlNTdHJpbmcqIEFWVmlkZW9DYXB0dXJlU291cmNlOjpiZXN0U2Vz c2lvblByZXNldEZvclZpZGVvRGltZW5zaW9ucyhzdGQ6Om9wdGlvbmEKICAgICByZXR1cm4gbmls OwogfQogCitib29sIEFWVmlkZW9DYXB0dXJlU291cmNlOjppc0ZyYW1lUmF0ZVN1cHBvcnRlZChk b3VibGUgZnJhbWVSYXRlKQoreworICAgIGRvdWJsZSBlcHNpbG9uID0gMC4wMDAwMTsKKyAgICBm b3IgKEFWRnJhbWVSYXRlUmFuZ2VUeXBlICpyYW5nZSBpbiBbW2RldmljZSgpIGFjdGl2ZUZvcm1h dF0gdmlkZW9TdXBwb3J0ZWRGcmFtZVJhdGVSYW5nZXNdKSB7CisgICAgICAgIGlmIChmcmFtZVJh dGUgKyBlcHNpbG9uID49IHJhbmdlLm1pbkZyYW1lUmF0ZSAmJiBmcmFtZVJhdGUgLSBlcHNpbG9u IDw9IHJhbmdlLm1heEZyYW1lUmF0ZSkKKyAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgIH0K KyAgICByZXR1cm4gZmFsc2U7Cit9CisKIGJvb2wgQVZWaWRlb0NhcHR1cmVTb3VyY2U6OnN1cHBv cnRzU2l6ZUFuZEZyYW1lUmF0ZShzdGQ6Om9wdGlvbmFsPGludD4gd2lkdGgsIHN0ZDo6b3B0aW9u YWw8aW50PiBoZWlnaHQsIHN0ZDo6b3B0aW9uYWw8ZG91YmxlPiBmcmFtZVJhdGUpCiB7CiAgICAg aWYgKCFoZWlnaHQgJiYgIXdpZHRoICYmICFmcmFtZVJhdGUpCkBAIC01OTIsMTMgKzU4OSw3IEBA IGJvb2wgQVZWaWRlb0NhcHR1cmVTb3VyY2U6OnN1cHBvcnRzU2l6ZUFuZEZyYW1lUmF0ZShzdGQ6 Om9wdGlvbmFsPGludD4gd2lkdGgsIHN0CiAgICAgaWYgKCFmcmFtZVJhdGUpCiAgICAgICAgIHJl dHVybiB0cnVlOwogCi0gICAgaW50IHJhdGUgPSBzdGF0aWNfY2FzdDxpbnQ+KGZyYW1lUmF0ZS52 YWx1ZSgpKTsKLSAgICBmb3IgKEFWRnJhbWVSYXRlUmFuZ2VUeXBlICpyYW5nZSBpbiBbW2Rldmlj ZSgpIGFjdGl2ZUZvcm1hdF0gdmlkZW9TdXBwb3J0ZWRGcmFtZVJhdGVSYW5nZXNdKSB7Ci0gICAg ICAgIGlmIChyYXRlID49IHN0YXRpY19jYXN0PGludD4ocmFuZ2UubWluRnJhbWVSYXRlKSAmJiBy YXRlIDw9IHN0YXRpY19jYXN0PGludD4ocmFuZ2UubWF4RnJhbWVSYXRlKSkKLSAgICAgICAgICAg IHJldHVybiB0cnVlOwotICAgIH0KLQotICAgIHJldHVybiBmYWxzZTsKKyAgICByZXR1cm4gaXNG cmFtZVJhdGVTdXBwb3J0ZWQoZnJhbWVSYXRlLnZhbHVlKCkpOwogfQogCiB9IC8vIG5hbWVzcGFj ZSBXZWJDb3JlCg== 313542 2017-06-21 13:22:36 -0700 2017-06-21 14:06:25 -0700 Patch bug-173637-20170621132235.patch text/plain 8501 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjE4NTkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDJjMDAxNDRkODQyZDVi ZmFkNjgwY2JiY2NiMmM2M2NjNThiYjdjNi4uZDBlNDI2MzA4ZDc0YmQ1OTgwZTZiODdkMjBkNTYx NmY2YTcyMWU1NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDE3LTA2LTIxICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBGaXggQVZWaWRlb0NhcHR1 cmVTb3VyY2UgZnJhbWVSYXRlIHNldHRlciBhbmQgZ2V0dGVyCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzM2MzcKKworICAgICAgICBSZXZpZXdlZCBi eSBFcmljIENhcmxzb24uCisKKyAgICAgICAgQ292ZXJlZCBieSBtYW51YWwgdGVzdGluZy4KKwor ICAgICAgICBVc2luZyBhY3RpdmVWaWRlb01heEZyYW1lRHVyYXRpb24gdG8gZ2V0IHRoZSBmcmFt ZSByYXRlLgorICAgICAgICBTZXR0aW5nIHRoZSBmcmFtZSByYXRlIGFjY29yZGluZyB0aGUgZ2l2 ZW4gdmFsZSBpZiBpbiB0aGUgYWxsb3dlZCByYW5nZS4KKworICAgICAgICAqIHBsYXRmb3JtL21l ZGlhc3RyZWFtL21hYy9BVlZpZGVvQ2FwdHVyZVNvdXJjZS5oOgorICAgICAgICAqIHBsYXRmb3Jt L21lZGlhc3RyZWFtL21hYy9BVlZpZGVvQ2FwdHVyZVNvdXJjZS5tbToKKyAgICAgICAgKFdlYkNv cmU6OkFWVmlkZW9DYXB0dXJlU291cmNlOjp1cGRhdGVTZXR0aW5ncyk6CisgICAgICAgIChXZWJD b3JlOjpBVlZpZGVvQ2FwdHVyZVNvdXJjZTo6YXBwbHlGcmFtZVJhdGUpOgorICAgICAgICAoV2Vi Q29yZTo6QVZWaWRlb0NhcHR1cmVTb3VyY2U6OmFwcGx5U2l6ZUFuZEZyYW1lUmF0ZSk6CisgICAg ICAgIChXZWJDb3JlOjpBVlZpZGVvQ2FwdHVyZVNvdXJjZTo6c2h1dGRvd25DYXB0dXJlU2Vzc2lv bik6CisgICAgICAgIChXZWJDb3JlOjpBVlZpZGVvQ2FwdHVyZVNvdXJjZTo6cHJvY2Vzc05ld0Zy YW1lKToKKyAgICAgICAgKFdlYkNvcmU6OkFWVmlkZW9DYXB0dXJlU291cmNlOjp1cGRhdGVGcmFt ZXJhdGUpOiBEZWxldGVkLgorCiAyMDE3LTA2LTIwICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFw cGxlLmNvbT4KIAogICAgICAgICBbV2ViUlRDXSBQcmV2ZW50IGNhcHR1cmluZyBhdCB1bmNvbnZl bnRpb25hbCByZXNvbHV0aW9ucyB3aGVuIHVzaW5nIHRoZSBTVyBlbmNvZGVyIG9uIE1hYwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL0FWVmlkZW9D YXB0dXJlU291cmNlLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMv QVZWaWRlb0NhcHR1cmVTb3VyY2UuaAppbmRleCA5YTZjMjZjYTMzMjNmOTcwMzc5YTVlNDA2N2Zl MjUzN2U1Y2M4MTIxLi5kMmM3ZTI5ZGQyNzNiM2I1NzZmOGY5NWJiMWRhN2M3ZTg5MTc3NDU0IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQVZWaWRl b0NhcHR1cmVTb3VyY2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVh bS9tYWMvQVZWaWRlb0NhcHR1cmVTb3VyY2UuaApAQCAtNjksNiArNjksOCBAQCBwcml2YXRlOgog ICAgIHZvaWQgbW9uaXRvck9yaWVudGF0aW9uKE9yaWVudGF0aW9uTm90aWZpZXImKSBmaW5hbDsK ICAgICB2b2lkIGNvbXB1dGVTYW1wbGVSb3RhdGlvbigpOwogCisgICAgYm9vbCBpc0ZyYW1lUmF0 ZVN1cHBvcnRlZChkb3VibGUgZnJhbWVSYXRlKTsKKwogICAgIE5TU3RyaW5nICpiZXN0U2Vzc2lv blByZXNldEZvclZpZGVvRGltZW5zaW9ucyhzdGQ6Om9wdGlvbmFsPGludD4gd2lkdGgsIHN0ZDo6 b3B0aW9uYWw8aW50PiBoZWlnaHQpIGNvbnN0OwogICAgIGJvb2wgc3VwcG9ydHNTaXplQW5kRnJh bWVSYXRlKHN0ZDo6b3B0aW9uYWw8aW50PiB3aWR0aCwgc3RkOjpvcHRpb25hbDxpbnQ+IGhlaWdo dCwgc3RkOjpvcHRpb25hbDxkb3VibGU+KSBmaW5hbDsKIApAQCAtODAsOCArODIsNiBAQCBwcml2 YXRlOgogCiAgICAgYm9vbCBzZXRGcmFtZVJhdGVDb25zdHJhaW50KGRvdWJsZSBtaW5GcmFtZVJh dGUsIGRvdWJsZSBtYXhGcmFtZVJhdGUpOwogCi0gICAgYm9vbCB1cGRhdGVGcmFtZXJhdGUoQ01T YW1wbGVCdWZmZXJSZWYpOwotCiAgICAgdm9pZCBjYXB0dXJlT3V0cHV0RGlkT3V0cHV0U2FtcGxl QnVmZmVyRnJvbUNvbm5lY3Rpb24oQVZDYXB0dXJlT3V0cHV0KiwgQ01TYW1wbGVCdWZmZXJSZWYs IEFWQ2FwdHVyZUNvbm5lY3Rpb24qKSBmaW5hbDsKICAgICB2b2lkIHByb2Nlc3NOZXdGcmFtZShS ZXRhaW5QdHI8Q01TYW1wbGVCdWZmZXJSZWY+LCBSZXRhaW5QdHI8QVZDYXB0dXJlQ29ubmVjdGlv bj4pOwogCkBAIC05Miw4ICs5Miw2IEBAIHByaXZhdGU6CiAKICAgICBzdGQ6OnVuaXF1ZV9wdHI8 UGl4ZWxCdWZmZXJDb25mb3JtZXJDVj4gbV9waXhlbEJ1ZmZlckNvbmZvcm1lcjsKIAotICAgIFZl Y3RvcjxGbG9hdDY0PiBtX3ZpZGVvRnJhbWVUaW1lU3RhbXBzOwotICAgIEZsb2F0NjQgbV9mcmFt ZVJhdGUgeyAwIH07CiAgICAgaW50MzJfdCBtX3dpZHRoIHsgMCB9OwogICAgIGludDMyX3QgbV9o ZWlnaHQgeyAwIH07CiAgICAgaW50IG1fc2Vuc29yT3JpZW50YXRpb24geyAwIH07CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQVZWaWRlb0NhcHR1 cmVTb3VyY2UubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tZWRpYXN0cmVhbS9tYWMvQVZW aWRlb0NhcHR1cmVTb3VyY2UubW0KaW5kZXggZjFmNGVhNjc2OTkyNTVmMTJjNGZjYzYyZDI3MjVj M2RjMjdmZDY0MS4uZGM3ZmI3ZDVkODhhY2VhMTExZWYyNDFmZjM4ZDExYmM4YjA1ZTQ4MyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vbWFjL0FWVmlkZW9D YXB0dXJlU291cmNlLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFt L21hYy9BVlZpZGVvQ2FwdHVyZVNvdXJjZS5tbQpAQCAtMjU3LDggKzI1NywxMCBAQCB2b2lkIEFW VmlkZW9DYXB0dXJlU291cmNlOjp1cGRhdGVTZXR0aW5ncyhSZWFsdGltZU1lZGlhU291cmNlU2V0 dGluZ3MmIHNldHRpbmdzKQogICAgICAgICBzZXR0aW5ncy5zZXRGYWNpbmdNb2RlKFJlYWx0aW1l TWVkaWFTb3VyY2VTZXR0aW5nczo6RW52aXJvbm1lbnQpOwogICAgIGVsc2UKICAgICAgICAgc2V0 dGluZ3Muc2V0RmFjaW5nTW9kZShSZWFsdGltZU1lZGlhU291cmNlU2V0dGluZ3M6OlVua25vd24p OwotICAgIAotICAgIHNldHRpbmdzLnNldEZyYW1lUmF0ZShtX2ZyYW1lUmF0ZSk7CisKKyAgICAv LyBGSVhNRTogT2JzZXJ2ZSBmcmFtZSByYXRlIGNoYW5nZXMuCisgICAgYXV0byBtYXhGcmFtZUR1 cmF0aW9uID0gW2RldmljZSgpIGFjdGl2ZVZpZGVvTWF4RnJhbWVEdXJhdGlvbl07CisgICAgc2V0 dGluZ3Muc2V0RnJhbWVSYXRlKG1heEZyYW1lRHVyYXRpb24udGltZXNjYWxlIC8gbWF4RnJhbWVE dXJhdGlvbi52YWx1ZSk7CiAgICAgc2V0dGluZ3Muc2V0V2lkdGgobV93aWR0aCk7CiAgICAgc2V0 dGluZ3Muc2V0SGVpZ2h0KG1faGVpZ2h0KTsKICAgICBzZXR0aW5ncy5zZXRBc3BlY3RSYXRpbyhz dGF0aWNfY2FzdDxmbG9hdD4obV93aWR0aCkgLyBtX2hlaWdodCk7CkBAIC0zMjYsMTUgKzMyOCwx NiBAQCBib29sIEFWVmlkZW9DYXB0dXJlU291cmNlOjpzZXRQcmVzZXQoTlNTdHJpbmcgKnByZXNl dCkKIAogYm9vbCBBVlZpZGVvQ2FwdHVyZVNvdXJjZTo6YXBwbHlGcmFtZVJhdGUoZG91YmxlIHJh dGUpCiB7CisgICAgZG91YmxlIGVwc2lsb24gPSAwLjAwMDAxOwogICAgIEFWRnJhbWVSYXRlUmFu Z2VUeXBlICpiZXN0RnJhbWVSYXRlUmFuZ2UgPSBuaWw7CiAgICAgZm9yIChBVkZyYW1lUmF0ZVJh bmdlVHlwZSAqZnJhbWVSYXRlUmFuZ2UgaW4gW1tkZXZpY2UoKSBhY3RpdmVGb3JtYXRdIHZpZGVv U3VwcG9ydGVkRnJhbWVSYXRlUmFuZ2VzXSkgewotICAgICAgICBpZiAocmF0ZSA+PSBbZnJhbWVS YXRlUmFuZ2UgbWluRnJhbWVSYXRlXSAmJiByYXRlIDw9IFtmcmFtZVJhdGVSYW5nZSBtYXhGcmFt ZVJhdGVdKSB7CisgICAgICAgIGlmIChyYXRlICsgZXBzaWxvbiA+PSBbZnJhbWVSYXRlUmFuZ2Ug bWluRnJhbWVSYXRlXSAmJiByYXRlIC0gZXBzaWxvbiA8PSBbZnJhbWVSYXRlUmFuZ2UgbWF4RnJh bWVSYXRlXSkgewogICAgICAgICAgICAgaWYgKCFiZXN0RnJhbWVSYXRlUmFuZ2UgfHwgQ01USU1F X0NPTVBBUkVfSU5MSU5FKFtmcmFtZVJhdGVSYW5nZSBtaW5GcmFtZUR1cmF0aW9uXSwgPiwgW2Jl c3RGcmFtZVJhdGVSYW5nZSBtaW5GcmFtZUR1cmF0aW9uXSkpCiAgICAgICAgICAgICAgICAgYmVz dEZyYW1lUmF0ZVJhbmdlID0gZnJhbWVSYXRlUmFuZ2U7CiAgICAgICAgIH0KICAgICB9CiAKLSAg ICBpZiAoIWJlc3RGcmFtZVJhdGVSYW5nZSkgeworICAgIGlmICghYmVzdEZyYW1lUmF0ZVJhbmdl IHx8ICFpc0ZyYW1lUmF0ZVN1cHBvcnRlZChyYXRlKSkgewogICAgICAgICBMT0coTWVkaWEsICJB VlZpZGVvQ2FwdHVyZVNvdXJjZTo6YXBwbHlGcmFtZVJhdGUoJXApLCBmcmFtZSByYXRlICVmIG5v dCBzdXBwb3J0ZWQgYnkgdmlkZW8gZGV2aWNlIiwgdGhpcywgcmF0ZSk7CiAgICAgICAgIHJldHVy biBmYWxzZTsKICAgICB9CkBAIC0zNDIsNyArMzQ1LDEzIEBAIGJvb2wgQVZWaWRlb0NhcHR1cmVT b3VyY2U6OmFwcGx5RnJhbWVSYXRlKGRvdWJsZSByYXRlKQogICAgIE5TRXJyb3IgKmVycm9yID0g bmlsOwogICAgIEB0cnkgewogICAgICAgICBpZiAoW2RldmljZSgpIGxvY2tGb3JDb25maWd1cmF0 aW9uOiZlcnJvcl0pIHsKLSAgICAgICAgICAgIFtkZXZpY2UoKSBzZXRBY3RpdmVWaWRlb01pbkZy YW1lRHVyYXRpb246W2Jlc3RGcmFtZVJhdGVSYW5nZSBtaW5GcmFtZUR1cmF0aW9uXV07CisgICAg ICAgICAgICBpZiAoYmVzdEZyYW1lUmF0ZVJhbmdlLm1pbkZyYW1lUmF0ZSA9PSBiZXN0RnJhbWVS YXRlUmFuZ2UubWF4RnJhbWVSYXRlKSB7CisgICAgICAgICAgICAgICAgW2RldmljZSgpIHNldEFj dGl2ZVZpZGVvTWluRnJhbWVEdXJhdGlvbjpbYmVzdEZyYW1lUmF0ZVJhbmdlIG1pbkZyYW1lRHVy YXRpb25dXTsKKyAgICAgICAgICAgICAgICBbZGV2aWNlKCkgc2V0QWN0aXZlVmlkZW9NYXhGcmFt ZUR1cmF0aW9uOltiZXN0RnJhbWVSYXRlUmFuZ2UgbWF4RnJhbWVEdXJhdGlvbl1dOworICAgICAg ICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAgICBbZGV2aWNlKCkgc2V0QWN0aXZlVmlkZW9N aW5GcmFtZUR1cmF0aW9uOiBDTVRpbWVNYWtlKDEsIHJhdGUpXTsKKyAgICAgICAgICAgICAgICBb ZGV2aWNlKCkgc2V0QWN0aXZlVmlkZW9NYXhGcmFtZUR1cmF0aW9uOiBDTVRpbWVNYWtlKDEsIHJh dGUpXTsKKyAgICAgICAgICAgIH0KICAgICAgICAgICAgIFtkZXZpY2UoKSB1bmxvY2tGb3JDb25m aWd1cmF0aW9uXTsKICAgICAgICAgfQogICAgIH0gQGNhdGNoKE5TRXhjZXB0aW9uICpleGNlcHRp b24pIHsKQEAgLTM2MSw3ICszNzAsOCBAQCBib29sIEFWVmlkZW9DYXB0dXJlU291cmNlOjphcHBs eUZyYW1lUmF0ZShkb3VibGUgcmF0ZSkKIAogdm9pZCBBVlZpZGVvQ2FwdHVyZVNvdXJjZTo6YXBw bHlTaXplQW5kRnJhbWVSYXRlKHN0ZDo6b3B0aW9uYWw8aW50PiB3aWR0aCwgc3RkOjpvcHRpb25h bDxpbnQ+IGhlaWdodCwgc3RkOjpvcHRpb25hbDxkb3VibGU+IGZyYW1lUmF0ZSkKIHsKLSAgICBz ZXRQcmVzZXQoYmVzdFNlc3Npb25QcmVzZXRGb3JWaWRlb0RpbWVuc2lvbnMoV1RGTW92ZSh3aWR0 aCksIFdURk1vdmUoaGVpZ2h0KSkpOworICAgIGlmICh3aWR0aCB8fCBoZWlnaHQpCisgICAgICAg IHNldFByZXNldChiZXN0U2Vzc2lvblByZXNldEZvclZpZGVvRGltZW5zaW9ucyhXVEZNb3ZlKHdp ZHRoKSwgV1RGTW92ZShoZWlnaHQpKSk7CiAKICAgICBpZiAoZnJhbWVSYXRlKQogICAgICAgICBh cHBseUZyYW1lUmF0ZShmcmFtZVJhdGUudmFsdWUoKSk7CkBAIC00NTEsMzIgKzQ2MSwxMCBAQCB2 b2lkIEFWVmlkZW9DYXB0dXJlU291cmNlOjpzaHV0ZG93bkNhcHR1cmVTZXNzaW9uKCkKIHsKICAg ICBtX2J1ZmZlciA9IG51bGxwdHI7CiAgICAgbV9sYXN0SW1hZ2UgPSBudWxscHRyOwotICAgIG1f dmlkZW9GcmFtZVRpbWVTdGFtcHMuY2xlYXIoKTsKLSAgICBtX2ZyYW1lUmF0ZSA9IDA7CiAgICAg bV93aWR0aCA9IDA7CiAgICAgbV9oZWlnaHQgPSAwOwogfQogCi1ib29sIEFWVmlkZW9DYXB0dXJl U291cmNlOjp1cGRhdGVGcmFtZXJhdGUoQ01TYW1wbGVCdWZmZXJSZWYgc2FtcGxlQnVmZmVyKQot ewotICAgIENNVGltZSBzYW1wbGVUaW1lID0gQ01TYW1wbGVCdWZmZXJHZXRQcmVzZW50YXRpb25U aW1lU3RhbXAoc2FtcGxlQnVmZmVyKTsKLSAgICBpZiAoIUNNVElNRV9JU19OVU1FUklDKHNhbXBs ZVRpbWUpKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAgICBGbG9hdDY0IGZyYW1lVGltZSA9 IENNVGltZUdldFNlY29uZHMoc2FtcGxlVGltZSk7Ci0gICAgRmxvYXQ2NCBvbmVTZWNvbmRBZ28g PSBmcmFtZVRpbWUgLSAxOwotICAgIAotICAgIG1fdmlkZW9GcmFtZVRpbWVTdGFtcHMuYXBwZW5k KGZyYW1lVGltZSk7Ci0gICAgCi0gICAgd2hpbGUgKG1fdmlkZW9GcmFtZVRpbWVTdGFtcHNbMF0g PCBvbmVTZWNvbmRBZ28pCi0gICAgICAgIG1fdmlkZW9GcmFtZVRpbWVTdGFtcHMucmVtb3ZlKDAp OwotCi0gICAgRmxvYXQ2NCBmcmFtZVJhdGUgPSBtX2ZyYW1lUmF0ZTsKLSAgICBtX2ZyYW1lUmF0 ZSA9IChtX2ZyYW1lUmF0ZSArIG1fdmlkZW9GcmFtZVRpbWVTdGFtcHMuc2l6ZSgpKSAvIDI7Ci0K LSAgICByZXR1cm4gZnJhbWVSYXRlICE9IG1fZnJhbWVSYXRlOwotfQotCiB2b2lkIEFWVmlkZW9D YXB0dXJlU291cmNlOjptb25pdG9yT3JpZW50YXRpb24oT3JpZW50YXRpb25Ob3RpZmllciYgbm90 aWZpZXIpCiB7CiAjaWYgUExBVEZPUk0oSU9TKQpAQCAtNTI5LDcgKzUxNyw2IEBAIHZvaWQgQVZW aWRlb0NhcHR1cmVTb3VyY2U6OnByb2Nlc3NOZXdGcmFtZShSZXRhaW5QdHI8Q01TYW1wbGVCdWZm ZXJSZWY+IHNhbXBsZUJ1CiAgICAgaWYgKCFmb3JtYXREZXNjcmlwdGlvbikKICAgICAgICAgcmV0 dXJuOwogCi0gICAgdXBkYXRlRnJhbWVyYXRlKHNhbXBsZUJ1ZmZlci5nZXQoKSk7CiAgICAgbV9i dWZmZXIgPSBzYW1wbGVCdWZmZXI7CiAgICAgbV9sYXN0SW1hZ2UgPSBudWxscHRyOwogCkBAIC01 ODEsNiArNTY4LDE2IEBAIE5TU3RyaW5nKiBBVlZpZGVvQ2FwdHVyZVNvdXJjZTo6YmVzdFNlc3Np b25QcmVzZXRGb3JWaWRlb0RpbWVuc2lvbnMoc3RkOjpvcHRpb25hCiAgICAgcmV0dXJuIG5pbDsK IH0KIAorYm9vbCBBVlZpZGVvQ2FwdHVyZVNvdXJjZTo6aXNGcmFtZVJhdGVTdXBwb3J0ZWQoZG91 YmxlIGZyYW1lUmF0ZSkKK3sKKyAgICBkb3VibGUgZXBzaWxvbiA9IDAuMDAwMDE7CisgICAgZm9y IChBVkZyYW1lUmF0ZVJhbmdlVHlwZSAqcmFuZ2UgaW4gW1tkZXZpY2UoKSBhY3RpdmVGb3JtYXRd IHZpZGVvU3VwcG9ydGVkRnJhbWVSYXRlUmFuZ2VzXSkgeworICAgICAgICBpZiAoZnJhbWVSYXRl ICsgZXBzaWxvbiA+PSByYW5nZS5taW5GcmFtZVJhdGUgJiYgZnJhbWVSYXRlIC0gZXBzaWxvbiA8 PSByYW5nZS5tYXhGcmFtZVJhdGUpCisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9Cisg ICAgcmV0dXJuIGZhbHNlOworfQorCiBib29sIEFWVmlkZW9DYXB0dXJlU291cmNlOjpzdXBwb3J0 c1NpemVBbmRGcmFtZVJhdGUoc3RkOjpvcHRpb25hbDxpbnQ+IHdpZHRoLCBzdGQ6Om9wdGlvbmFs PGludD4gaGVpZ2h0LCBzdGQ6Om9wdGlvbmFsPGRvdWJsZT4gZnJhbWVSYXRlKQogewogICAgIGlm ICghaGVpZ2h0ICYmICF3aWR0aCAmJiAhZnJhbWVSYXRlKQpAQCAtNTkyLDEzICs1ODksNyBAQCBi b29sIEFWVmlkZW9DYXB0dXJlU291cmNlOjpzdXBwb3J0c1NpemVBbmRGcmFtZVJhdGUoc3RkOjpv cHRpb25hbDxpbnQ+IHdpZHRoLCBzdAogICAgIGlmICghZnJhbWVSYXRlKQogICAgICAgICByZXR1 cm4gdHJ1ZTsKIAotICAgIGludCByYXRlID0gc3RhdGljX2Nhc3Q8aW50PihmcmFtZVJhdGUudmFs dWUoKSk7Ci0gICAgZm9yIChBVkZyYW1lUmF0ZVJhbmdlVHlwZSAqcmFuZ2UgaW4gW1tkZXZpY2Uo KSBhY3RpdmVGb3JtYXRdIHZpZGVvU3VwcG9ydGVkRnJhbWVSYXRlUmFuZ2VzXSkgewotICAgICAg ICBpZiAocmF0ZSA+PSBzdGF0aWNfY2FzdDxpbnQ+KHJhbmdlLm1pbkZyYW1lUmF0ZSkgJiYgcmF0 ZSA8PSBzdGF0aWNfY2FzdDxpbnQ+KHJhbmdlLm1heEZyYW1lUmF0ZSkpCi0gICAgICAgICAgICBy ZXR1cm4gdHJ1ZTsKLSAgICB9Ci0KLSAgICByZXR1cm4gZmFsc2U7CisgICAgcmV0dXJuIGlzRnJh bWVSYXRlU3VwcG9ydGVkKGZyYW1lUmF0ZS52YWx1ZSgpKTsKIH0KIAogfSAvLyBuYW1lc3BhY2Ug V2ViQ29yZQo=