176170 2017-08-31 10:16:21 -0700 MSE-to-Canvas painting can become "stuck" during heavy workloads 2017-08-31 11:48:49 -0700 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jer.noble jer.noble commit-queue eric.carlson webkit-bug-importer oldest_to_newest 1343975 0 jer.noble 2017-08-31 10:16:21 -0700 MSE-to-Canvas painting can become "stuck" during heavy workloads 1343977 1 319471 jer.noble 2017-08-31 10:21:00 -0700 Created attachment 319471 Patch 1343978 2 319472 jer.noble 2017-08-31 10:21:42 -0700 Created attachment 319472 Patch 1343979 3 webkit-bug-importer 2017-08-31 10:22:18 -0700 <rdar://problem/34188602> 1344043 4 319472 commit-queue 2017-08-31 11:48:48 -0700 Comment on attachment 319472 Patch Clearing flags on attachment: 319472 Committed r221430: <http://trac.webkit.org/changeset/221430> 1344044 5 commit-queue 2017-08-31 11:48:49 -0700 All reviewed patches have been landed. Closing bug. 319471 2017-08-31 10:21:00 -0700 2017-08-31 10:21:40 -0700 Patch bug-176170-20170831102059.patch text/plain 10934 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjIxMTE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTVjM2MyMzlmNGJhNTVm MDM3MzUyNTI0OTNkOTliNTI4ZTNhYmJkYi4uODZmZTQzYjE4NzAyZjU2YjFkZjU5OTJiMTJlMzZm NTg4YTI1YTQwZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE3LTA4LTMxICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIE1TRS10by1DYW52YXMgcGFp bnRpbmcgY2FuIGJlY29tZSAic3R1Y2siIGR1cmluZyBoZWF2eSB3b3JrbG9hZHMKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3NjE3MAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIER1cmluZyBoZWF2eSB3b3Jr bG9hZHMsIHRoZSB0cmlnZ2VyIGZyb20gQ01CdWZmZXJRdWV1ZSBub3RpZnlpbmcgdXMgdGhhdCB3 ZSBoYXZlIGRpcHBlZCBiZWxvdworICAgICAgICB0aGUgImxvdy13YXRlciBtYXJrIiBvZiBkZWNv ZGVkIChhbmQgZGVjb2RpbmcpIGZyYW1lcyB3aWxsIG5vdCBmaXJlLiBJbnN0ZWFkIG9mIHVzaW5n IGEgdHJpZ2dlcgorICAgICAgICAoc2luY2UgaXQgd2lsbCBub3QgZmlyZSB3aGVuIHRoZSBudW1i ZXIgb2YgImZyYW1lcyBiZWluZyBkZWNvZGVkIiBjaGFuZ2VzLCBqdXN0IHRoZSBudW1iZXIgb2YK KyAgICAgICAgZGVjb2RlZCBmcmFtZXMpLCBqdXN0IGNhbGwgbWF5YmVCZWNvbWVSZWFkeUZvck1v cmVNZWRpYURhdGEoKSB3aGVuZXZlciB0aGUgbnVtYmVyIG9mIGZyYW1lcyBpbgorICAgICAgICB0 aGUgZGVjb2RlZCBxdWV1ZSBkZWNyZWFzZXMsIG9yIHdoZW4gdGhlIG51bWJlciBvZiBmcmFtZXMg YmVpbmcgZGVjb2RlZCBkZWNyZWFzZXMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9j b2NvYS9XZWJDb3JlRGVjb21wcmVzc2lvblNlc3Npb24uaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9jb2NvYS9XZWJDb3JlRGVjb21wcmVzc2lvblNlc3Npb24ubW06CisgICAgICAgIChX ZWJDb3JlOjpXZWJDb3JlRGVjb21wcmVzc2lvblNlc3Npb246Om1heWJlQmVjb21lUmVhZHlGb3JN b3JlTWVkaWFEYXRhKToKKyAgICAgICAgKFdlYkNvcmU6OldlYkNvcmVEZWNvbXByZXNzaW9uU2Vz c2lvbjo6ZW5xdWV1ZVNhbXBsZSk6CisgICAgICAgIChXZWJDb3JlOjpXZWJDb3JlRGVjb21wcmVz c2lvblNlc3Npb246OmRlY29kZVNhbXBsZSk6CisgICAgICAgIChXZWJDb3JlOjpXZWJDb3JlRGVj b21wcmVzc2lvblNlc3Npb246OmhhbmRsZURlY29tcHJlc3Npb25PdXRwdXQpOgorICAgICAgICAo V2ViQ29yZTo6V2ViQ29yZURlY29tcHJlc3Npb25TZXNzaW9uOjpnZXRGaXJzdFZpZGVvRnJhbWUp OgorICAgICAgICAoV2ViQ29yZTo6V2ViQ29yZURlY29tcHJlc3Npb25TZXNzaW9uOjphdXRvbWF0 aWNEZXF1ZXVlKToKKyAgICAgICAgKFdlYkNvcmU6OldlYkNvcmVEZWNvbXByZXNzaW9uU2Vzc2lv bjo6aW1hZ2VGb3JUaW1lKToKKyAgICAgICAgKFdlYkNvcmU6OldlYkNvcmVEZWNvbXByZXNzaW9u U2Vzc2lvbjo6bWF5YmVCZWNvbWVSZWFkeUZvck1vcmVNZWRpYURhdGFDYWxsYmFjayk6IERlbGV0 ZWQuCisKIDIwMTctMDgtMzAgIEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CiAKICAg ICAgICAgVmlydHVhbGl6ZSBJbWFnZURlY29kZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL1dlYkNvcmVEZWNvbXByZXNzaW9uU2Vzc2lvbi5oIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvV2ViQ29yZURlY29tcHJlc3Np b25TZXNzaW9uLmgKaW5kZXggNDczZGVhNDU0NGI3ZWQwOTA1N2MzYWEyYzQwYTM5OTFlYzcyMDAy Yi4uNGQ4ZTc5NDZjZmFmMzY4MWNhYzE2ODIxOWNjZTM2ZmFhODlkZDNkZSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvV2ViQ29yZURlY29tcHJlc3Np b25TZXNzaW9uLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2Ev V2ViQ29yZURlY29tcHJlc3Npb25TZXNzaW9uLmgKQEAgLTM4LDcgKzM4LDYgQEAKIAogdHlwZWRl ZiBDRlR5cGVSZWYgQ01CdWZmZXJSZWY7CiB0eXBlZGVmIHN0cnVjdCBvcGFxdWVDTUJ1ZmZlclF1 ZXVlICpDTUJ1ZmZlclF1ZXVlUmVmOwotdHlwZWRlZiBzdHJ1Y3Qgb3BhcXVlQ01CdWZmZXJRdWV1 ZVRyaWdnZXJUb2tlbiAqQ01CdWZmZXJRdWV1ZVRyaWdnZXJUb2tlbjsKIHR5cGVkZWYgc3RydWN0 IG9wYXF1ZUNNU2FtcGxlQnVmZmVyICpDTVNhbXBsZUJ1ZmZlclJlZjsKIHR5cGVkZWYgc3RydWN0 IE9wYXF1ZUNNVGltZWJhc2UqIENNVGltZWJhc2VSZWY7CiB0eXBlZGVmIHNpZ25lZCBsb25nIENN SXRlbUNvdW50OwpAQCAtOTEsNyArOTAsNiBAQCBwcml2YXRlOgogICAgIHN0YXRpYyBDTVRpbWUg Z2V0UHJlc2VudGF0aW9uVGltZShDTUJ1ZmZlclJlZiwgdm9pZCogcmVmY29uKTsKICAgICBzdGF0 aWMgQ01UaW1lIGdldER1cmF0aW9uKENNQnVmZmVyUmVmLCB2b2lkKiByZWZjb24pOwogICAgIHN0 YXRpYyBDRkNvbXBhcmlzb25SZXN1bHQgY29tcGFyZUJ1ZmZlcnMoQ01CdWZmZXJSZWYgYnVmMSwg Q01CdWZmZXJSZWYgYnVmMiwgdm9pZCogcmVmY29uKTsKLSAgICBzdGF0aWMgdm9pZCBtYXliZUJl Y29tZVJlYWR5Rm9yTW9yZU1lZGlhRGF0YUNhbGxiYWNrKHZvaWQqIHJlZmNvbiwgQ01CdWZmZXJR dWV1ZVRyaWdnZXJUb2tlbik7CiAgICAgdm9pZCBtYXliZUJlY29tZVJlYWR5Rm9yTW9yZU1lZGlh RGF0YSgpOwogCiAgICAgc3RhdGljIGNvbnN0IENNSXRlbUNvdW50IGtNYXhpbXVtQ2FwYWNpdHkg PSAxMjA7CkBAIC0xMDgsNyArMTA2LDYgQEAgcHJpdmF0ZToKICAgICBPU09iamVjdFB0cjxkaXNw YXRjaF9zb3VyY2VfdD4gbV90aW1lclNvdXJjZTsKICAgICBzdGQ6OmZ1bmN0aW9uPHZvaWQoKT4g bV9ub3RpZmljYXRpb25DYWxsYmFjazsKICAgICBzdGQ6OmZ1bmN0aW9uPHZvaWQoKT4gbV9oYXNB dmFpbGFibGVGcmFtZUNhbGxiYWNrOwotICAgIENNQnVmZmVyUXVldWVUcmlnZ2VyVG9rZW4gbV9k aWRCZWNvbWVSZWFkeVRyaWdnZXIgeyBudWxscHRyIH07CiAKICAgICBib29sIG1faW52YWxpZGF0 ZWQgeyBmYWxzZSB9OwogICAgIGludCBtX2ZyYW1lc0JlaW5nRGVjb2RlZCB7IDAgfTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL1dlYkNvcmVEZWNv bXByZXNzaW9uU2Vzc2lvbi5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nv Y29hL1dlYkNvcmVEZWNvbXByZXNzaW9uU2Vzc2lvbi5tbQppbmRleCBjZDIyZjA0ZGRiMzI5ZWQw YmU2OWI3MjhlYzFjNzNiMmU3NTEyOTMyLi4xOGY0MTkyODAxZDYxYmEyYzNkYjA1MmZlNTcyODQz OTYxZjVmZGRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j b2NvYS9XZWJDb3JlRGVjb21wcmVzc2lvblNlc3Npb24ubW0KKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvV2ViQ29yZURlY29tcHJlc3Npb25TZXNzaW9uLm1tCkBA IC04NSwxOCArODUsMTMgQEAgdm9pZCBXZWJDb3JlRGVjb21wcmVzc2lvblNlc3Npb246OnNldFRp bWViYXNlKENNVGltZWJhc2VSZWYgdGltZWJhc2UpCiAgICAgfQogfQogCi12b2lkIFdlYkNvcmVE ZWNvbXByZXNzaW9uU2Vzc2lvbjo6bWF5YmVCZWNvbWVSZWFkeUZvck1vcmVNZWRpYURhdGFDYWxs YmFjayh2b2lkKiByZWZjb24sIENNQnVmZmVyUXVldWVUcmlnZ2VyVG9rZW4pCi17Ci0gICAgV2Vi Q29yZURlY29tcHJlc3Npb25TZXNzaW9uKiBzZXNzaW9uID0gc3RhdGljX2Nhc3Q8V2ViQ29yZURl Y29tcHJlc3Npb25TZXNzaW9uKj4ocmVmY29uKTsKLSAgICBzZXNzaW9uLT5tYXliZUJlY29tZVJl YWR5Rm9yTW9yZU1lZGlhRGF0YSgpOwotfQotCiB2b2lkIFdlYkNvcmVEZWNvbXByZXNzaW9uU2Vz c2lvbjo6bWF5YmVCZWNvbWVSZWFkeUZvck1vcmVNZWRpYURhdGEoKQogewotICAgIExPRyhNZWRp YSwgIldlYkNvcmVEZWNvbXByZXNzaW9uU2Vzc2lvbjo6bWF5YmVCZWNvbWVSZWFkeUZvck1vcmVN ZWRpYURhdGEoJXApIC0gaXNSZWFkeUZvck1vcmVNZWRpYURhdGEoJWQpLCBoYXNDYWxsYmFjaygl ZCkiLCB0aGlzLCBpc1JlYWR5Rm9yTW9yZU1lZGlhRGF0YSgpLCAhIW1fbm90aWZpY2F0aW9uQ2Fs bGJhY2spOwogICAgIGlmICghaXNSZWFkeUZvck1vcmVNZWRpYURhdGEoKSB8fCAhbV9ub3RpZmlj YXRpb25DYWxsYmFjaykKICAgICAgICAgcmV0dXJuOwogCisgICAgTE9HKE1lZGlhLCAiV2ViQ29y ZURlY29tcHJlc3Npb25TZXNzaW9uOjptYXliZUJlY29tZVJlYWR5Rm9yTW9yZU1lZGlhRGF0YSgl cCkgLSBpc1JlYWR5Rm9yTW9yZU1lZGlhRGF0YSglZCksIGhhc0NhbGxiYWNrKCVkKSIsIHRoaXMs IGlzUmVhZHlGb3JNb3JlTWVkaWFEYXRhKCksICEhbV9ub3RpZmljYXRpb25DYWxsYmFjayk7CisK ICAgICBpZiAoaXNNYWluVGhyZWFkKCkpIHsKICAgICAgICAgbV9ub3RpZmljYXRpb25DYWxsYmFj aygpOwogICAgICAgICByZXR1cm47CkBAIC0xNDgsOCArMTQzLDYgQEAgdm9pZCBXZWJDb3JlRGVj b21wcmVzc2lvblNlc3Npb246OmVucXVldWVTYW1wbGUoQ01TYW1wbGVCdWZmZXJSZWYgc2FtcGxl QnVmZmVyLAogI3ByYWdtYSBwYWNrKHBvcCkKICAgICAgICAgQ01CdWZmZXJRdWV1ZUNyZWF0ZShr Q0ZBbGxvY2F0b3JEZWZhdWx0LCBrTWF4aW11bUNhcGFjaXR5LCAmY2FsbGJhY2tzLmNhbGxiYWNr cywgJm91dFF1ZXVlKTsKICAgICAgICAgbV9wcm9kdWNlclF1ZXVlID0gYWRvcHRDRihvdXRRdWV1 ZSk7Ci0KLSAgICAgICAgQ01CdWZmZXJRdWV1ZUluc3RhbGxUcmlnZ2VyV2l0aEludGVnZXJUaHJl c2hvbGQobV9wcm9kdWNlclF1ZXVlLmdldCgpLCBtYXliZUJlY29tZVJlYWR5Rm9yTW9yZU1lZGlh RGF0YUNhbGxiYWNrLCB0aGlzLCBrQ01CdWZmZXJRdWV1ZVRyaWdnZXJfV2hlbkJ1ZmZlckNvdW50 QmVjb21lc0xlc3NUaGFuLCBrTG93V2F0ZXJNYXJrLCAmbV9kaWRCZWNvbWVSZWFkeVRyaWdnZXIp OwogICAgIH0KIAogICAgIGlmICghbV9jb25zdW1lclF1ZXVlKSB7CkBAIC0yNDIsNiArMjM1LDcg QEAgdm9pZCBXZWJDb3JlRGVjb21wcmVzc2lvblNlc3Npb246OmRlY29kZVNhbXBsZShDTVNhbXBs ZUJ1ZmZlclJlZiBzYW1wbGUsIGJvb2wgZGkKICAgICBpZiAoIXNob3VsZERlY29kZVNhbXBsZShz YW1wbGUsIGRpc3BsYXlpbmcpKSB7CiAgICAgICAgICsrbV90b3RhbFZpZGVvRnJhbWVzOwogICAg ICAgICArK21fZHJvcHBlZFZpZGVvRnJhbWVzOworICAgICAgICAtLW1fZnJhbWVzQmVpbmdEZWNv ZGVkOwogICAgICAgICByZXR1cm47CiAgICAgfQogCkBAIC0yNjQsNiArMjU4LDcgQEAgdm9pZCBX ZWJDb3JlRGVjb21wcmVzc2lvblNlc3Npb246OmhhbmRsZURlY29tcHJlc3Npb25PdXRwdXQoYm9v bCBkaXNwbGF5aW5nLCBPU1MKICAgICBDTVZpZGVvRm9ybWF0RGVzY3JpcHRpb25SZWYgcmF3SW1h Z2VCdWZmZXJEZXNjcmlwdGlvbiA9IG51bGxwdHI7CiAgICAgaWYgKHN0YXR1cyAhPSBub0VyciB8 fCBub0VyciAhPSBDTVZpZGVvRm9ybWF0RGVzY3JpcHRpb25DcmVhdGVGb3JJbWFnZUJ1ZmZlcihr Q0ZBbGxvY2F0b3JEZWZhdWx0LCByYXdJbWFnZUJ1ZmZlciwgJnJhd0ltYWdlQnVmZmVyRGVzY3Jp cHRpb24pKSB7CiAgICAgICAgICsrbV9jb3JydXB0ZWRWaWRlb0ZyYW1lczsKKyAgICAgICAgLS1t X2ZyYW1lc0JlaW5nRGVjb2RlZDsKICAgICAgICAgcmV0dXJuOwogICAgIH0KICAgICBSZXRhaW5Q dHI8Q01WaWRlb0Zvcm1hdERlc2NyaXB0aW9uUmVmPiBpbWFnZUJ1ZmZlckRlc2NyaXB0aW9uID0g YWRvcHRDRihyYXdJbWFnZUJ1ZmZlckRlc2NyaXB0aW9uKTsKQEAgLTI3Nyw2ICsyNzIsNyBAQCB2 b2lkIFdlYkNvcmVEZWNvbXByZXNzaW9uU2Vzc2lvbjo6aGFuZGxlRGVjb21wcmVzc2lvbk91dHB1 dChib29sIGRpc3BsYXlpbmcsIE9TUwogICAgIENNU2FtcGxlQnVmZmVyUmVmIHJhd0ltYWdlU2Ft cGxlQnVmZmVyID0gbnVsbHB0cjsKICAgICBpZiAobm9FcnIgIT0gQ01TYW1wbGVCdWZmZXJDcmVh dGVSZWFkeVdpdGhJbWFnZUJ1ZmZlcihrQ0ZBbGxvY2F0b3JEZWZhdWx0LCByYXdJbWFnZUJ1ZmZl ciwgaW1hZ2VCdWZmZXJEZXNjcmlwdGlvbi5nZXQoKSwgJmltYWdlQnVmZmVyVGltaW5nLCAmcmF3 SW1hZ2VTYW1wbGVCdWZmZXIpKSB7CiAgICAgICAgICsrbV9jb3JydXB0ZWRWaWRlb0ZyYW1lczsK KyAgICAgICAgLS1tX2ZyYW1lc0JlaW5nRGVjb2RlZDsKICAgICAgICAgcmV0dXJuOwogICAgIH0K IApAQCAtMzAxLDYgKzI5Nyw5IEBAIFJldGFpblB0cjxDVlBpeGVsQnVmZmVyUmVmPiBXZWJDb3Jl RGVjb21wcmVzc2lvblNlc3Npb246OmdldEZpcnN0VmlkZW9GcmFtZSgpCiAgICAgUmV0YWluUHRy PENNU2FtcGxlQnVmZmVyUmVmPiBjdXJyZW50U2FtcGxlID0gYWRvcHRDRigoQ01TYW1wbGVCdWZm ZXJSZWYpQ01CdWZmZXJRdWV1ZURlcXVldWVBbmRSZXRhaW4obV9wcm9kdWNlclF1ZXVlLmdldCgp KSk7CiAgICAgUmV0YWluUHRyPENWUGl4ZWxCdWZmZXJSZWY+IGltYWdlQnVmZmVyID0gKENWUGl4 ZWxCdWZmZXJSZWYpQ01TYW1wbGVCdWZmZXJHZXRJbWFnZUJ1ZmZlcihjdXJyZW50U2FtcGxlLmdl dCgpKTsKICAgICBBU1NFUlQoQ0ZHZXRUeXBlSUQoaW1hZ2VCdWZmZXIuZ2V0KCkpID09IENWUGl4 ZWxCdWZmZXJHZXRUeXBlSUQoKSk7CisKKyAgICBtYXliZUJlY29tZVJlYWR5Rm9yTW9yZU1lZGlh RGF0YSgpOworCiAgICAgcmV0dXJuIGltYWdlQnVmZmVyOwogfQogCkBAIC0zMTIsMTIgKzMxMSwx NiBAQCB2b2lkIFdlYkNvcmVEZWNvbXByZXNzaW9uU2Vzc2lvbjo6YXV0b21hdGljRGVxdWV1ZSgp CiAgICAgYXV0byB0aW1lID0gdG9NZWRpYVRpbWUoQ01UaW1lYmFzZUdldFRpbWUobV90aW1lYmFz ZS5nZXQoKSkpOwogICAgIExPRyhNZWRpYSwgIldlYkNvcmVEZWNvbXByZXNzaW9uU2Vzc2lvbjo6 YXV0b21hdGljRGVxdWV1ZSglcCkgLSBwdXJnaW5nIGFsbCBzYW1wbGVzIGJlZm9yZSB0aW1lKCVz KSIsIHRoaXMsIHRvU3RyaW5nKHRpbWUpLnV0ZjgoKS5kYXRhKCkpOwogCisgICAgTWVkaWFUaW1l IG5leHRGaXJlVGltZSA9IE1lZGlhVGltZTo6cG9zaXRpdmVJbmZpbml0ZVRpbWUoKTsKKyAgICBi b29sIHJlbGVhc2VkSW1hZ2VCdWZmZXJzID0gZmFsc2U7CisKICAgICB3aGlsZSAoQ01TYW1wbGVC dWZmZXJSZWYgZmlyc3RTYW1wbGUgPSAoQ01TYW1wbGVCdWZmZXJSZWYpQ01CdWZmZXJRdWV1ZUdl dEhlYWQobV9wcm9kdWNlclF1ZXVlLmdldCgpKSkgewogICAgICAgICBNZWRpYVRpbWUgcHJlc2Vu dGF0aW9uVGltZXN0YW1wID0gdG9NZWRpYVRpbWUoQ01TYW1wbGVCdWZmZXJHZXRQcmVzZW50YXRp b25UaW1lU3RhbXAoZmlyc3RTYW1wbGUpKTsKICAgICAgICAgTWVkaWFUaW1lIGR1cmF0aW9uID0g dG9NZWRpYVRpbWUoQ01TYW1wbGVCdWZmZXJHZXREdXJhdGlvbihmaXJzdFNhbXBsZSkpOwogICAg ICAgICBNZWRpYVRpbWUgcHJlc2VudGF0aW9uRW5kVGltZXN0YW1wID0gcHJlc2VudGF0aW9uVGlt ZXN0YW1wICsgZHVyYXRpb247CiAgICAgICAgIGlmICh0aW1lID4gcHJlc2VudGF0aW9uRW5kVGlt ZXN0YW1wKSB7CiAgICAgICAgICAgICBDRlJlbGVhc2UoQ01CdWZmZXJRdWV1ZURlcXVldWVBbmRS ZXRhaW4obV9wcm9kdWNlclF1ZXVlLmdldCgpKSk7CisgICAgICAgICAgICByZWxlYXNlZEltYWdl QnVmZmVycyA9IHRydWU7CiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgfQogCkBAIC0z MjYsMTIgKzMyOSwxNiBAQCB2b2lkIFdlYkNvcmVEZWNvbXByZXNzaW9uU2Vzc2lvbjo6YXV0b21h dGljRGVxdWV1ZSgpCiAgICAgICAgIGF1dG8gZW5kID0gdG9NZWRpYVRpbWUoQ01CdWZmZXJRdWV1 ZUdldEVuZFByZXNlbnRhdGlvblRpbWVTdGFtcChtX3Byb2R1Y2VyUXVldWUuZ2V0KCkpKTsKICAg ICAgICAgTE9HKE1lZGlhLCAiV2ViQ29yZURlY29tcHJlc3Npb25TZXNzaW9uOjphdXRvbWF0aWNE ZXF1ZXVlKCVwKSAtIHF1ZXVlKCVzIC0+ICVzKSIsIHRoaXMsIHRvU3RyaW5nKGJlZ2luKS51dGY4 KCkuZGF0YSgpLCB0b1N0cmluZyhlbmQpLnV0ZjgoKS5kYXRhKCkpOwogI2VuZGlmCi0gICAgICAg IENNVGltZWJhc2VTZXRUaW1lckRpc3BhdGNoU291cmNlTmV4dEZpcmVUaW1lKG1fdGltZWJhc2Uu Z2V0KCksIG1fdGltZXJTb3VyY2UuZ2V0KCksIHRvQ01UaW1lKHByZXNlbnRhdGlvbkVuZFRpbWVz dGFtcCksIDApOwotICAgICAgICByZXR1cm47CisKKyAgICAgICAgbmV4dEZpcmVUaW1lID0gcHJl c2VudGF0aW9uRW5kVGltZXN0YW1wOworICAgICAgICBicmVhazsKICAgICB9CiAKKyAgICBpZiAo cmVsZWFzZWRJbWFnZUJ1ZmZlcnMpCisgICAgICAgIG1heWJlQmVjb21lUmVhZHlGb3JNb3JlTWVk aWFEYXRhKCk7CisKICAgICBMT0coTWVkaWEsICJXZWJDb3JlRGVjb21wcmVzc2lvblNlc3Npb246 OmF1dG9tYXRpY0RlcXVldWUoJXApIC0gcXVldWUgZW1wdHkiLCB0aGlzLCB0b1N0cmluZyh0aW1l KS51dGY4KCkuZGF0YSgpKTsKLSAgICBDTVRpbWViYXNlU2V0VGltZXJEaXNwYXRjaFNvdXJjZU5l eHRGaXJlVGltZShtX3RpbWViYXNlLmdldCgpLCBtX3RpbWVyU291cmNlLmdldCgpLCBrQ01UaW1l UG9zaXRpdmVJbmZpbml0eSwgMCk7CisgICAgQ01UaW1lYmFzZVNldFRpbWVyRGlzcGF0Y2hTb3Vy Y2VOZXh0RmlyZVRpbWUobV90aW1lYmFzZS5nZXQoKSwgbV90aW1lclNvdXJjZS5nZXQoKSwgdG9D TVRpbWUobmV4dEZpcmVUaW1lKSwgMCk7CiB9CiAKIHZvaWQgV2ViQ29yZURlY29tcHJlc3Npb25T ZXNzaW9uOjplbnF1ZXVlRGVjb2RlZFNhbXBsZShDTVNhbXBsZUJ1ZmZlclJlZiBzYW1wbGUsIGJv b2wgZGlzcGxheWluZykKQEAgLTQyOCw2ICs0MzUsOCBAQCBSZXRhaW5QdHI8Q1ZQaXhlbEJ1ZmZl clJlZj4gV2ViQ29yZURlY29tcHJlc3Npb25TZXNzaW9uOjppbWFnZUZvclRpbWUoY29uc3QgTWVk aQogICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAgICB9CiAKKyAgICBib29sIHJlbGVhc2VkSW1h Z2VCdWZmZXJzID0gZmFsc2U7CisKICAgICB3aGlsZSAoQ01TYW1wbGVCdWZmZXJSZWYgZmlyc3RT YW1wbGUgPSAoQ01TYW1wbGVCdWZmZXJSZWYpQ01CdWZmZXJRdWV1ZUdldEhlYWQobV9wcm9kdWNl clF1ZXVlLmdldCgpKSkgewogICAgICAgICBNZWRpYVRpbWUgcHJlc2VudGF0aW9uVGltZXN0YW1w ID0gdG9NZWRpYVRpbWUoQ01TYW1wbGVCdWZmZXJHZXRQcmVzZW50YXRpb25UaW1lU3RhbXAoZmly c3RTYW1wbGUpKTsKICAgICAgICAgTWVkaWFUaW1lIGR1cmF0aW9uID0gdG9NZWRpYVRpbWUoQ01T YW1wbGVCdWZmZXJHZXREdXJhdGlvbihmaXJzdFNhbXBsZSkpOwpAQCAtNDM2LDYgKzQ0NSw3IEBA IFJldGFpblB0cjxDVlBpeGVsQnVmZmVyUmVmPiBXZWJDb3JlRGVjb21wcmVzc2lvblNlc3Npb246 OmltYWdlRm9yVGltZShjb25zdCBNZWRpCiAgICAgICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAg ICAgICAgaWYgKCFhbGxvd0VhcmxpZXIgJiYgcHJlc2VudGF0aW9uRW5kVGltZXN0YW1wIDwgdGlt ZSkgewogICAgICAgICAgICAgQ0ZSZWxlYXNlKENNQnVmZmVyUXVldWVEZXF1ZXVlQW5kUmV0YWlu KG1fcHJvZHVjZXJRdWV1ZS5nZXQoKSkpOworICAgICAgICAgICAgcmVsZWFzZWRJbWFnZUJ1ZmZl cnMgPSB0cnVlOwogICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgIH0KIApAQCAtNDQ2LDYg KzQ1Niw4IEBAIFJldGFpblB0cjxDVlBpeGVsQnVmZmVyUmVmPiBXZWJDb3JlRGVjb21wcmVzc2lv blNlc3Npb246OmltYWdlRm9yVGltZShjb25zdCBNZWRpCiAgICAgICAgIGlmIChtX3RpbWViYXNl KQogICAgICAgICAgICAgQ01UaW1lYmFzZVNldFRpbWVyRGlzcGF0Y2hTb3VyY2VUb0ZpcmVJbW1l ZGlhdGVseShtX3RpbWViYXNlLmdldCgpLCBtX3RpbWVyU291cmNlLmdldCgpKTsKIAorICAgICAg ICBtYXliZUJlY29tZVJlYWR5Rm9yTW9yZU1lZGlhRGF0YSgpOworCiAgICAgICAgIExPRyhNZWRp YSwgIldlYkNvcmVEZWNvbXByZXNzaW9uU2Vzc2lvbjo6aW1hZ2VGb3JUaW1lKCVwKSAtIGZvdW5k IHNhbXBsZSBmb3IgdGltZSglcykgaW4gcXVldWUoJXMgLT4gJXMpIiwgdGhpcywgdG9TdHJpbmco dGltZSkudXRmOCgpLmRhdGEoKSwgdG9TdHJpbmcoc3RhcnRUaW1lKS51dGY4KCkuZGF0YSgpLCB0 b1N0cmluZyhlbmRUaW1lKS51dGY4KCkuZGF0YSgpKTsKICAgICAgICAgcmV0dXJuIGltYWdlQnVm ZmVyOwogICAgIH0KQEAgLTQ1Myw2ICs0NjUsOSBAQCBSZXRhaW5QdHI8Q1ZQaXhlbEJ1ZmZlclJl Zj4gV2ViQ29yZURlY29tcHJlc3Npb25TZXNzaW9uOjppbWFnZUZvclRpbWUoY29uc3QgTWVkaQog ICAgIGlmIChtX3RpbWViYXNlKQogICAgICAgICBDTVRpbWViYXNlU2V0VGltZXJEaXNwYXRjaFNv dXJjZVRvRmlyZUltbWVkaWF0ZWx5KG1fdGltZWJhc2UuZ2V0KCksIG1fdGltZXJTb3VyY2UuZ2V0 KCkpOwogCisgICAgaWYgKHJlbGVhc2VkSW1hZ2VCdWZmZXJzKQorICAgICAgICBtYXliZUJlY29t ZVJlYWR5Rm9yTW9yZU1lZGlhRGF0YSgpOworCiAgICAgTE9HKE1lZGlhLCAiV2ViQ29yZURlY29t cHJlc3Npb25TZXNzaW9uOjppbWFnZUZvclRpbWUoJXApIC0gbm8gbWF0Y2hpbmcgc2FtcGxlIGZv ciB0aW1lKCVzKSBpbiBxdWV1ZSglcyAtPiAlcykiLCB0aGlzLCB0b1N0cmluZyh0aW1lKS51dGY4 KCkuZGF0YSgpLCB0b1N0cmluZyhzdGFydFRpbWUpLnV0ZjgoKS5kYXRhKCksIHRvU3RyaW5nKGVu ZFRpbWUpLnV0ZjgoKS5kYXRhKCkpOwogICAgIHJldHVybiBudWxscHRyOwogfQo= 319472 2017-08-31 10:21:42 -0700 2017-08-31 11:48:48 -0700 Patch bug-176170-20170831102141.patch text/plain 11069 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjIxMTE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTVjM2MyMzlmNGJhNTVm MDM3MzUyNTI0OTNkOTliNTI4ZTNhYmJkYi4uODZmZTQzYjE4NzAyZjU2YjFkZjU5OTJiMTJlMzZm NTg4YTI1YTQwZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE3LTA4LTMxICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIE1TRS10by1DYW52YXMgcGFp bnRpbmcgY2FuIGJlY29tZSAic3R1Y2siIGR1cmluZyBoZWF2eSB3b3JrbG9hZHMKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3NjE3MAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIER1cmluZyBoZWF2eSB3b3Jr bG9hZHMsIHRoZSB0cmlnZ2VyIGZyb20gQ01CdWZmZXJRdWV1ZSBub3RpZnlpbmcgdXMgdGhhdCB3 ZSBoYXZlIGRpcHBlZCBiZWxvdworICAgICAgICB0aGUgImxvdy13YXRlciBtYXJrIiBvZiBkZWNv ZGVkIChhbmQgZGVjb2RpbmcpIGZyYW1lcyB3aWxsIG5vdCBmaXJlLiBJbnN0ZWFkIG9mIHVzaW5n IGEgdHJpZ2dlcgorICAgICAgICAoc2luY2UgaXQgd2lsbCBub3QgZmlyZSB3aGVuIHRoZSBudW1i ZXIgb2YgImZyYW1lcyBiZWluZyBkZWNvZGVkIiBjaGFuZ2VzLCBqdXN0IHRoZSBudW1iZXIgb2YK KyAgICAgICAgZGVjb2RlZCBmcmFtZXMpLCBqdXN0IGNhbGwgbWF5YmVCZWNvbWVSZWFkeUZvck1v cmVNZWRpYURhdGEoKSB3aGVuZXZlciB0aGUgbnVtYmVyIG9mIGZyYW1lcyBpbgorICAgICAgICB0 aGUgZGVjb2RlZCBxdWV1ZSBkZWNyZWFzZXMsIG9yIHdoZW4gdGhlIG51bWJlciBvZiBmcmFtZXMg YmVpbmcgZGVjb2RlZCBkZWNyZWFzZXMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9j b2NvYS9XZWJDb3JlRGVjb21wcmVzc2lvblNlc3Npb24uaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9jb2NvYS9XZWJDb3JlRGVjb21wcmVzc2lvblNlc3Npb24ubW06CisgICAgICAgIChX ZWJDb3JlOjpXZWJDb3JlRGVjb21wcmVzc2lvblNlc3Npb246Om1heWJlQmVjb21lUmVhZHlGb3JN b3JlTWVkaWFEYXRhKToKKyAgICAgICAgKFdlYkNvcmU6OldlYkNvcmVEZWNvbXByZXNzaW9uU2Vz c2lvbjo6ZW5xdWV1ZVNhbXBsZSk6CisgICAgICAgIChXZWJDb3JlOjpXZWJDb3JlRGVjb21wcmVz c2lvblNlc3Npb246OmRlY29kZVNhbXBsZSk6CisgICAgICAgIChXZWJDb3JlOjpXZWJDb3JlRGVj b21wcmVzc2lvblNlc3Npb246OmhhbmRsZURlY29tcHJlc3Npb25PdXRwdXQpOgorICAgICAgICAo V2ViQ29yZTo6V2ViQ29yZURlY29tcHJlc3Npb25TZXNzaW9uOjpnZXRGaXJzdFZpZGVvRnJhbWUp OgorICAgICAgICAoV2ViQ29yZTo6V2ViQ29yZURlY29tcHJlc3Npb25TZXNzaW9uOjphdXRvbWF0 aWNEZXF1ZXVlKToKKyAgICAgICAgKFdlYkNvcmU6OldlYkNvcmVEZWNvbXByZXNzaW9uU2Vzc2lv bjo6aW1hZ2VGb3JUaW1lKToKKyAgICAgICAgKFdlYkNvcmU6OldlYkNvcmVEZWNvbXByZXNzaW9u U2Vzc2lvbjo6bWF5YmVCZWNvbWVSZWFkeUZvck1vcmVNZWRpYURhdGFDYWxsYmFjayk6IERlbGV0 ZWQuCisKIDIwMTctMDgtMzAgIEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CiAKICAg ICAgICAgVmlydHVhbGl6ZSBJbWFnZURlY29kZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL1dlYkNvcmVEZWNvbXByZXNzaW9uU2Vzc2lvbi5oIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvV2ViQ29yZURlY29tcHJlc3Np b25TZXNzaW9uLmgKaW5kZXggNDczZGVhNDU0NGI3ZWQwOTA1N2MzYWEyYzQwYTM5OTFlYzcyMDAy Yi4uNGQ4ZTc5NDZjZmFmMzY4MWNhYzE2ODIxOWNjZTM2ZmFhODlkZDNkZSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvV2ViQ29yZURlY29tcHJlc3Np b25TZXNzaW9uLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2Ev V2ViQ29yZURlY29tcHJlc3Npb25TZXNzaW9uLmgKQEAgLTM4LDcgKzM4LDYgQEAKIAogdHlwZWRl ZiBDRlR5cGVSZWYgQ01CdWZmZXJSZWY7CiB0eXBlZGVmIHN0cnVjdCBvcGFxdWVDTUJ1ZmZlclF1 ZXVlICpDTUJ1ZmZlclF1ZXVlUmVmOwotdHlwZWRlZiBzdHJ1Y3Qgb3BhcXVlQ01CdWZmZXJRdWV1 ZVRyaWdnZXJUb2tlbiAqQ01CdWZmZXJRdWV1ZVRyaWdnZXJUb2tlbjsKIHR5cGVkZWYgc3RydWN0 IG9wYXF1ZUNNU2FtcGxlQnVmZmVyICpDTVNhbXBsZUJ1ZmZlclJlZjsKIHR5cGVkZWYgc3RydWN0 IE9wYXF1ZUNNVGltZWJhc2UqIENNVGltZWJhc2VSZWY7CiB0eXBlZGVmIHNpZ25lZCBsb25nIENN SXRlbUNvdW50OwpAQCAtOTEsNyArOTAsNiBAQCBwcml2YXRlOgogICAgIHN0YXRpYyBDTVRpbWUg Z2V0UHJlc2VudGF0aW9uVGltZShDTUJ1ZmZlclJlZiwgdm9pZCogcmVmY29uKTsKICAgICBzdGF0 aWMgQ01UaW1lIGdldER1cmF0aW9uKENNQnVmZmVyUmVmLCB2b2lkKiByZWZjb24pOwogICAgIHN0 YXRpYyBDRkNvbXBhcmlzb25SZXN1bHQgY29tcGFyZUJ1ZmZlcnMoQ01CdWZmZXJSZWYgYnVmMSwg Q01CdWZmZXJSZWYgYnVmMiwgdm9pZCogcmVmY29uKTsKLSAgICBzdGF0aWMgdm9pZCBtYXliZUJl Y29tZVJlYWR5Rm9yTW9yZU1lZGlhRGF0YUNhbGxiYWNrKHZvaWQqIHJlZmNvbiwgQ01CdWZmZXJR dWV1ZVRyaWdnZXJUb2tlbik7CiAgICAgdm9pZCBtYXliZUJlY29tZVJlYWR5Rm9yTW9yZU1lZGlh RGF0YSgpOwogCiAgICAgc3RhdGljIGNvbnN0IENNSXRlbUNvdW50IGtNYXhpbXVtQ2FwYWNpdHkg PSAxMjA7CkBAIC0xMDgsNyArMTA2LDYgQEAgcHJpdmF0ZToKICAgICBPU09iamVjdFB0cjxkaXNw YXRjaF9zb3VyY2VfdD4gbV90aW1lclNvdXJjZTsKICAgICBzdGQ6OmZ1bmN0aW9uPHZvaWQoKT4g bV9ub3RpZmljYXRpb25DYWxsYmFjazsKICAgICBzdGQ6OmZ1bmN0aW9uPHZvaWQoKT4gbV9oYXNB dmFpbGFibGVGcmFtZUNhbGxiYWNrOwotICAgIENNQnVmZmVyUXVldWVUcmlnZ2VyVG9rZW4gbV9k aWRCZWNvbWVSZWFkeVRyaWdnZXIgeyBudWxscHRyIH07CiAKICAgICBib29sIG1faW52YWxpZGF0 ZWQgeyBmYWxzZSB9OwogICAgIGludCBtX2ZyYW1lc0JlaW5nRGVjb2RlZCB7IDAgfTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL1dlYkNvcmVEZWNv bXByZXNzaW9uU2Vzc2lvbi5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nv Y29hL1dlYkNvcmVEZWNvbXByZXNzaW9uU2Vzc2lvbi5tbQppbmRleCBjZDIyZjA0ZGRiMzI5ZWQw YmU2OWI3MjhlYzFjNzNiMmU3NTEyOTMyLi40MGNjZGZiNDFhMTM3NTI0Y2Q5MmMwMzc4NGM2OWI4 Y2RlOTZmYzc3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j b2NvYS9XZWJDb3JlRGVjb21wcmVzc2lvblNlc3Npb24ubW0KKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvV2ViQ29yZURlY29tcHJlc3Npb25TZXNzaW9uLm1tCkBA IC04NSwxOCArODUsMTMgQEAgdm9pZCBXZWJDb3JlRGVjb21wcmVzc2lvblNlc3Npb246OnNldFRp bWViYXNlKENNVGltZWJhc2VSZWYgdGltZWJhc2UpCiAgICAgfQogfQogCi12b2lkIFdlYkNvcmVE ZWNvbXByZXNzaW9uU2Vzc2lvbjo6bWF5YmVCZWNvbWVSZWFkeUZvck1vcmVNZWRpYURhdGFDYWxs YmFjayh2b2lkKiByZWZjb24sIENNQnVmZmVyUXVldWVUcmlnZ2VyVG9rZW4pCi17Ci0gICAgV2Vi Q29yZURlY29tcHJlc3Npb25TZXNzaW9uKiBzZXNzaW9uID0gc3RhdGljX2Nhc3Q8V2ViQ29yZURl Y29tcHJlc3Npb25TZXNzaW9uKj4ocmVmY29uKTsKLSAgICBzZXNzaW9uLT5tYXliZUJlY29tZVJl YWR5Rm9yTW9yZU1lZGlhRGF0YSgpOwotfQotCiB2b2lkIFdlYkNvcmVEZWNvbXByZXNzaW9uU2Vz c2lvbjo6bWF5YmVCZWNvbWVSZWFkeUZvck1vcmVNZWRpYURhdGEoKQogewotICAgIExPRyhNZWRp YSwgIldlYkNvcmVEZWNvbXByZXNzaW9uU2Vzc2lvbjo6bWF5YmVCZWNvbWVSZWFkeUZvck1vcmVN ZWRpYURhdGEoJXApIC0gaXNSZWFkeUZvck1vcmVNZWRpYURhdGEoJWQpLCBoYXNDYWxsYmFjaygl ZCkiLCB0aGlzLCBpc1JlYWR5Rm9yTW9yZU1lZGlhRGF0YSgpLCAhIW1fbm90aWZpY2F0aW9uQ2Fs bGJhY2spOwogICAgIGlmICghaXNSZWFkeUZvck1vcmVNZWRpYURhdGEoKSB8fCAhbV9ub3RpZmlj YXRpb25DYWxsYmFjaykKICAgICAgICAgcmV0dXJuOwogCisgICAgTE9HKE1lZGlhLCAiV2ViQ29y ZURlY29tcHJlc3Npb25TZXNzaW9uOjptYXliZUJlY29tZVJlYWR5Rm9yTW9yZU1lZGlhRGF0YSgl cCkgLSBpc1JlYWR5Rm9yTW9yZU1lZGlhRGF0YSglZCksIGhhc0NhbGxiYWNrKCVkKSIsIHRoaXMs IGlzUmVhZHlGb3JNb3JlTWVkaWFEYXRhKCksICEhbV9ub3RpZmljYXRpb25DYWxsYmFjayk7CisK ICAgICBpZiAoaXNNYWluVGhyZWFkKCkpIHsKICAgICAgICAgbV9ub3RpZmljYXRpb25DYWxsYmFj aygpOwogICAgICAgICByZXR1cm47CkBAIC0xNDgsOCArMTQzLDYgQEAgdm9pZCBXZWJDb3JlRGVj b21wcmVzc2lvblNlc3Npb246OmVucXVldWVTYW1wbGUoQ01TYW1wbGVCdWZmZXJSZWYgc2FtcGxl QnVmZmVyLAogI3ByYWdtYSBwYWNrKHBvcCkKICAgICAgICAgQ01CdWZmZXJRdWV1ZUNyZWF0ZShr Q0ZBbGxvY2F0b3JEZWZhdWx0LCBrTWF4aW11bUNhcGFjaXR5LCAmY2FsbGJhY2tzLmNhbGxiYWNr cywgJm91dFF1ZXVlKTsKICAgICAgICAgbV9wcm9kdWNlclF1ZXVlID0gYWRvcHRDRihvdXRRdWV1 ZSk7Ci0KLSAgICAgICAgQ01CdWZmZXJRdWV1ZUluc3RhbGxUcmlnZ2VyV2l0aEludGVnZXJUaHJl c2hvbGQobV9wcm9kdWNlclF1ZXVlLmdldCgpLCBtYXliZUJlY29tZVJlYWR5Rm9yTW9yZU1lZGlh RGF0YUNhbGxiYWNrLCB0aGlzLCBrQ01CdWZmZXJRdWV1ZVRyaWdnZXJfV2hlbkJ1ZmZlckNvdW50 QmVjb21lc0xlc3NUaGFuLCBrTG93V2F0ZXJNYXJrLCAmbV9kaWRCZWNvbWVSZWFkeVRyaWdnZXIp OwogICAgIH0KIAogICAgIGlmICghbV9jb25zdW1lclF1ZXVlKSB7CkBAIC0yNDIsNiArMjM1LDgg QEAgdm9pZCBXZWJDb3JlRGVjb21wcmVzc2lvblNlc3Npb246OmRlY29kZVNhbXBsZShDTVNhbXBs ZUJ1ZmZlclJlZiBzYW1wbGUsIGJvb2wgZGkKICAgICBpZiAoIXNob3VsZERlY29kZVNhbXBsZShz YW1wbGUsIGRpc3BsYXlpbmcpKSB7CiAgICAgICAgICsrbV90b3RhbFZpZGVvRnJhbWVzOwogICAg ICAgICArK21fZHJvcHBlZFZpZGVvRnJhbWVzOworICAgICAgICAtLW1fZnJhbWVzQmVpbmdEZWNv ZGVkOworICAgICAgICBtYXliZUJlY29tZVJlYWR5Rm9yTW9yZU1lZGlhRGF0YSgpOwogICAgICAg ICByZXR1cm47CiAgICAgfQogCkBAIC0yNjQsNiArMjU5LDggQEAgdm9pZCBXZWJDb3JlRGVjb21w cmVzc2lvblNlc3Npb246OmhhbmRsZURlY29tcHJlc3Npb25PdXRwdXQoYm9vbCBkaXNwbGF5aW5n LCBPU1MKICAgICBDTVZpZGVvRm9ybWF0RGVzY3JpcHRpb25SZWYgcmF3SW1hZ2VCdWZmZXJEZXNj cmlwdGlvbiA9IG51bGxwdHI7CiAgICAgaWYgKHN0YXR1cyAhPSBub0VyciB8fCBub0VyciAhPSBD TVZpZGVvRm9ybWF0RGVzY3JpcHRpb25DcmVhdGVGb3JJbWFnZUJ1ZmZlcihrQ0ZBbGxvY2F0b3JE ZWZhdWx0LCByYXdJbWFnZUJ1ZmZlciwgJnJhd0ltYWdlQnVmZmVyRGVzY3JpcHRpb24pKSB7CiAg ICAgICAgICsrbV9jb3JydXB0ZWRWaWRlb0ZyYW1lczsKKyAgICAgICAgLS1tX2ZyYW1lc0JlaW5n RGVjb2RlZDsKKyAgICAgICAgbWF5YmVCZWNvbWVSZWFkeUZvck1vcmVNZWRpYURhdGEoKTsKICAg ICAgICAgcmV0dXJuOwogICAgIH0KICAgICBSZXRhaW5QdHI8Q01WaWRlb0Zvcm1hdERlc2NyaXB0 aW9uUmVmPiBpbWFnZUJ1ZmZlckRlc2NyaXB0aW9uID0gYWRvcHRDRihyYXdJbWFnZUJ1ZmZlckRl c2NyaXB0aW9uKTsKQEAgLTI3Nyw2ICsyNzQsOCBAQCB2b2lkIFdlYkNvcmVEZWNvbXByZXNzaW9u U2Vzc2lvbjo6aGFuZGxlRGVjb21wcmVzc2lvbk91dHB1dChib29sIGRpc3BsYXlpbmcsIE9TUwog ICAgIENNU2FtcGxlQnVmZmVyUmVmIHJhd0ltYWdlU2FtcGxlQnVmZmVyID0gbnVsbHB0cjsKICAg ICBpZiAobm9FcnIgIT0gQ01TYW1wbGVCdWZmZXJDcmVhdGVSZWFkeVdpdGhJbWFnZUJ1ZmZlcihr Q0ZBbGxvY2F0b3JEZWZhdWx0LCByYXdJbWFnZUJ1ZmZlciwgaW1hZ2VCdWZmZXJEZXNjcmlwdGlv bi5nZXQoKSwgJmltYWdlQnVmZmVyVGltaW5nLCAmcmF3SW1hZ2VTYW1wbGVCdWZmZXIpKSB7CiAg ICAgICAgICsrbV9jb3JydXB0ZWRWaWRlb0ZyYW1lczsKKyAgICAgICAgLS1tX2ZyYW1lc0JlaW5n RGVjb2RlZDsKKyAgICAgICAgbWF5YmVCZWNvbWVSZWFkeUZvck1vcmVNZWRpYURhdGEoKTsKICAg ICAgICAgcmV0dXJuOwogICAgIH0KIApAQCAtMzAxLDYgKzMwMCw5IEBAIFJldGFpblB0cjxDVlBp eGVsQnVmZmVyUmVmPiBXZWJDb3JlRGVjb21wcmVzc2lvblNlc3Npb246OmdldEZpcnN0VmlkZW9G cmFtZSgpCiAgICAgUmV0YWluUHRyPENNU2FtcGxlQnVmZmVyUmVmPiBjdXJyZW50U2FtcGxlID0g YWRvcHRDRigoQ01TYW1wbGVCdWZmZXJSZWYpQ01CdWZmZXJRdWV1ZURlcXVldWVBbmRSZXRhaW4o bV9wcm9kdWNlclF1ZXVlLmdldCgpKSk7CiAgICAgUmV0YWluUHRyPENWUGl4ZWxCdWZmZXJSZWY+ IGltYWdlQnVmZmVyID0gKENWUGl4ZWxCdWZmZXJSZWYpQ01TYW1wbGVCdWZmZXJHZXRJbWFnZUJ1 ZmZlcihjdXJyZW50U2FtcGxlLmdldCgpKTsKICAgICBBU1NFUlQoQ0ZHZXRUeXBlSUQoaW1hZ2VC dWZmZXIuZ2V0KCkpID09IENWUGl4ZWxCdWZmZXJHZXRUeXBlSUQoKSk7CisKKyAgICBtYXliZUJl Y29tZVJlYWR5Rm9yTW9yZU1lZGlhRGF0YSgpOworCiAgICAgcmV0dXJuIGltYWdlQnVmZmVyOwog fQogCkBAIC0zMTIsMTIgKzMxNCwxNiBAQCB2b2lkIFdlYkNvcmVEZWNvbXByZXNzaW9uU2Vzc2lv bjo6YXV0b21hdGljRGVxdWV1ZSgpCiAgICAgYXV0byB0aW1lID0gdG9NZWRpYVRpbWUoQ01UaW1l YmFzZUdldFRpbWUobV90aW1lYmFzZS5nZXQoKSkpOwogICAgIExPRyhNZWRpYSwgIldlYkNvcmVE ZWNvbXByZXNzaW9uU2Vzc2lvbjo6YXV0b21hdGljRGVxdWV1ZSglcCkgLSBwdXJnaW5nIGFsbCBz YW1wbGVzIGJlZm9yZSB0aW1lKCVzKSIsIHRoaXMsIHRvU3RyaW5nKHRpbWUpLnV0ZjgoKS5kYXRh KCkpOwogCisgICAgTWVkaWFUaW1lIG5leHRGaXJlVGltZSA9IE1lZGlhVGltZTo6cG9zaXRpdmVJ bmZpbml0ZVRpbWUoKTsKKyAgICBib29sIHJlbGVhc2VkSW1hZ2VCdWZmZXJzID0gZmFsc2U7CisK ICAgICB3aGlsZSAoQ01TYW1wbGVCdWZmZXJSZWYgZmlyc3RTYW1wbGUgPSAoQ01TYW1wbGVCdWZm ZXJSZWYpQ01CdWZmZXJRdWV1ZUdldEhlYWQobV9wcm9kdWNlclF1ZXVlLmdldCgpKSkgewogICAg ICAgICBNZWRpYVRpbWUgcHJlc2VudGF0aW9uVGltZXN0YW1wID0gdG9NZWRpYVRpbWUoQ01TYW1w bGVCdWZmZXJHZXRQcmVzZW50YXRpb25UaW1lU3RhbXAoZmlyc3RTYW1wbGUpKTsKICAgICAgICAg TWVkaWFUaW1lIGR1cmF0aW9uID0gdG9NZWRpYVRpbWUoQ01TYW1wbGVCdWZmZXJHZXREdXJhdGlv bihmaXJzdFNhbXBsZSkpOwogICAgICAgICBNZWRpYVRpbWUgcHJlc2VudGF0aW9uRW5kVGltZXN0 YW1wID0gcHJlc2VudGF0aW9uVGltZXN0YW1wICsgZHVyYXRpb247CiAgICAgICAgIGlmICh0aW1l ID4gcHJlc2VudGF0aW9uRW5kVGltZXN0YW1wKSB7CiAgICAgICAgICAgICBDRlJlbGVhc2UoQ01C dWZmZXJRdWV1ZURlcXVldWVBbmRSZXRhaW4obV9wcm9kdWNlclF1ZXVlLmdldCgpKSk7CisgICAg ICAgICAgICByZWxlYXNlZEltYWdlQnVmZmVycyA9IHRydWU7CiAgICAgICAgICAgICBjb250aW51 ZTsKICAgICAgICAgfQogCkBAIC0zMjYsMTIgKzMzMiwxNiBAQCB2b2lkIFdlYkNvcmVEZWNvbXBy ZXNzaW9uU2Vzc2lvbjo6YXV0b21hdGljRGVxdWV1ZSgpCiAgICAgICAgIGF1dG8gZW5kID0gdG9N ZWRpYVRpbWUoQ01CdWZmZXJRdWV1ZUdldEVuZFByZXNlbnRhdGlvblRpbWVTdGFtcChtX3Byb2R1 Y2VyUXVldWUuZ2V0KCkpKTsKICAgICAgICAgTE9HKE1lZGlhLCAiV2ViQ29yZURlY29tcHJlc3Np b25TZXNzaW9uOjphdXRvbWF0aWNEZXF1ZXVlKCVwKSAtIHF1ZXVlKCVzIC0+ICVzKSIsIHRoaXMs IHRvU3RyaW5nKGJlZ2luKS51dGY4KCkuZGF0YSgpLCB0b1N0cmluZyhlbmQpLnV0ZjgoKS5kYXRh KCkpOwogI2VuZGlmCi0gICAgICAgIENNVGltZWJhc2VTZXRUaW1lckRpc3BhdGNoU291cmNlTmV4 dEZpcmVUaW1lKG1fdGltZWJhc2UuZ2V0KCksIG1fdGltZXJTb3VyY2UuZ2V0KCksIHRvQ01UaW1l KHByZXNlbnRhdGlvbkVuZFRpbWVzdGFtcCksIDApOwotICAgICAgICByZXR1cm47CisKKyAgICAg ICAgbmV4dEZpcmVUaW1lID0gcHJlc2VudGF0aW9uRW5kVGltZXN0YW1wOworICAgICAgICBicmVh azsKICAgICB9CiAKKyAgICBpZiAocmVsZWFzZWRJbWFnZUJ1ZmZlcnMpCisgICAgICAgIG1heWJl QmVjb21lUmVhZHlGb3JNb3JlTWVkaWFEYXRhKCk7CisKICAgICBMT0coTWVkaWEsICJXZWJDb3Jl RGVjb21wcmVzc2lvblNlc3Npb246OmF1dG9tYXRpY0RlcXVldWUoJXApIC0gcXVldWUgZW1wdHki LCB0aGlzLCB0b1N0cmluZyh0aW1lKS51dGY4KCkuZGF0YSgpKTsKLSAgICBDTVRpbWViYXNlU2V0 VGltZXJEaXNwYXRjaFNvdXJjZU5leHRGaXJlVGltZShtX3RpbWViYXNlLmdldCgpLCBtX3RpbWVy U291cmNlLmdldCgpLCBrQ01UaW1lUG9zaXRpdmVJbmZpbml0eSwgMCk7CisgICAgQ01UaW1lYmFz ZVNldFRpbWVyRGlzcGF0Y2hTb3VyY2VOZXh0RmlyZVRpbWUobV90aW1lYmFzZS5nZXQoKSwgbV90 aW1lclNvdXJjZS5nZXQoKSwgdG9DTVRpbWUobmV4dEZpcmVUaW1lKSwgMCk7CiB9CiAKIHZvaWQg V2ViQ29yZURlY29tcHJlc3Npb25TZXNzaW9uOjplbnF1ZXVlRGVjb2RlZFNhbXBsZShDTVNhbXBs ZUJ1ZmZlclJlZiBzYW1wbGUsIGJvb2wgZGlzcGxheWluZykKQEAgLTQyOCw2ICs0MzgsOCBAQCBS ZXRhaW5QdHI8Q1ZQaXhlbEJ1ZmZlclJlZj4gV2ViQ29yZURlY29tcHJlc3Npb25TZXNzaW9uOjpp bWFnZUZvclRpbWUoY29uc3QgTWVkaQogICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAgICB9CiAK KyAgICBib29sIHJlbGVhc2VkSW1hZ2VCdWZmZXJzID0gZmFsc2U7CisKICAgICB3aGlsZSAoQ01T YW1wbGVCdWZmZXJSZWYgZmlyc3RTYW1wbGUgPSAoQ01TYW1wbGVCdWZmZXJSZWYpQ01CdWZmZXJR dWV1ZUdldEhlYWQobV9wcm9kdWNlclF1ZXVlLmdldCgpKSkgewogICAgICAgICBNZWRpYVRpbWUg cHJlc2VudGF0aW9uVGltZXN0YW1wID0gdG9NZWRpYVRpbWUoQ01TYW1wbGVCdWZmZXJHZXRQcmVz ZW50YXRpb25UaW1lU3RhbXAoZmlyc3RTYW1wbGUpKTsKICAgICAgICAgTWVkaWFUaW1lIGR1cmF0 aW9uID0gdG9NZWRpYVRpbWUoQ01TYW1wbGVCdWZmZXJHZXREdXJhdGlvbihmaXJzdFNhbXBsZSkp OwpAQCAtNDM2LDYgKzQ0OCw3IEBAIFJldGFpblB0cjxDVlBpeGVsQnVmZmVyUmVmPiBXZWJDb3Jl RGVjb21wcmVzc2lvblNlc3Npb246OmltYWdlRm9yVGltZShjb25zdCBNZWRpCiAgICAgICAgICAg ICByZXR1cm4gbnVsbHB0cjsKICAgICAgICAgaWYgKCFhbGxvd0VhcmxpZXIgJiYgcHJlc2VudGF0 aW9uRW5kVGltZXN0YW1wIDwgdGltZSkgewogICAgICAgICAgICAgQ0ZSZWxlYXNlKENNQnVmZmVy UXVldWVEZXF1ZXVlQW5kUmV0YWluKG1fcHJvZHVjZXJRdWV1ZS5nZXQoKSkpOworICAgICAgICAg ICAgcmVsZWFzZWRJbWFnZUJ1ZmZlcnMgPSB0cnVlOwogICAgICAgICAgICAgY29udGludWU7CiAg ICAgICAgIH0KIApAQCAtNDQ2LDYgKzQ1OSw4IEBAIFJldGFpblB0cjxDVlBpeGVsQnVmZmVyUmVm PiBXZWJDb3JlRGVjb21wcmVzc2lvblNlc3Npb246OmltYWdlRm9yVGltZShjb25zdCBNZWRpCiAg ICAgICAgIGlmIChtX3RpbWViYXNlKQogICAgICAgICAgICAgQ01UaW1lYmFzZVNldFRpbWVyRGlz cGF0Y2hTb3VyY2VUb0ZpcmVJbW1lZGlhdGVseShtX3RpbWViYXNlLmdldCgpLCBtX3RpbWVyU291 cmNlLmdldCgpKTsKIAorICAgICAgICBtYXliZUJlY29tZVJlYWR5Rm9yTW9yZU1lZGlhRGF0YSgp OworCiAgICAgICAgIExPRyhNZWRpYSwgIldlYkNvcmVEZWNvbXByZXNzaW9uU2Vzc2lvbjo6aW1h Z2VGb3JUaW1lKCVwKSAtIGZvdW5kIHNhbXBsZSBmb3IgdGltZSglcykgaW4gcXVldWUoJXMgLT4g JXMpIiwgdGhpcywgdG9TdHJpbmcodGltZSkudXRmOCgpLmRhdGEoKSwgdG9TdHJpbmcoc3RhcnRU aW1lKS51dGY4KCkuZGF0YSgpLCB0b1N0cmluZyhlbmRUaW1lKS51dGY4KCkuZGF0YSgpKTsKICAg ICAgICAgcmV0dXJuIGltYWdlQnVmZmVyOwogICAgIH0KQEAgLTQ1Myw2ICs0NjgsOSBAQCBSZXRh aW5QdHI8Q1ZQaXhlbEJ1ZmZlclJlZj4gV2ViQ29yZURlY29tcHJlc3Npb25TZXNzaW9uOjppbWFn ZUZvclRpbWUoY29uc3QgTWVkaQogICAgIGlmIChtX3RpbWViYXNlKQogICAgICAgICBDTVRpbWVi YXNlU2V0VGltZXJEaXNwYXRjaFNvdXJjZVRvRmlyZUltbWVkaWF0ZWx5KG1fdGltZWJhc2UuZ2V0 KCksIG1fdGltZXJTb3VyY2UuZ2V0KCkpOwogCisgICAgaWYgKHJlbGVhc2VkSW1hZ2VCdWZmZXJz KQorICAgICAgICBtYXliZUJlY29tZVJlYWR5Rm9yTW9yZU1lZGlhRGF0YSgpOworCiAgICAgTE9H KE1lZGlhLCAiV2ViQ29yZURlY29tcHJlc3Npb25TZXNzaW9uOjppbWFnZUZvclRpbWUoJXApIC0g bm8gbWF0Y2hpbmcgc2FtcGxlIGZvciB0aW1lKCVzKSBpbiBxdWV1ZSglcyAtPiAlcykiLCB0aGlz LCB0b1N0cmluZyh0aW1lKS51dGY4KCkuZGF0YSgpLCB0b1N0cmluZyhzdGFydFRpbWUpLnV0Zjgo KS5kYXRhKCksIHRvU3RyaW5nKGVuZFRpbWUpLnV0ZjgoKS5kYXRhKCkpOwogICAgIHJldHVybiBu dWxscHRyOwogfQo=