193591 2019-01-18 13:51:05 -0800 Separate out outline-style: auto user-agent appearance from Mac animated focus ring drawing 2019-02-11 11:02:42 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Local Build All All RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=193583 https://bugs.webkit.org/show_bug.cgi?id=193581 InRadar P2 Normal --- 1 dbates dbates bfulgham mcatanzaro simon.fraser webkit-bug-importer zalan oldest_to_newest 1496017 0 dbates 2019-01-18 13:51:05 -0800 Currently the focus ring appearance for outline-style: auto is tangled with the Mac animated focus ring logic. We should separate them so that a non-Mac port can opt-into the former and opt-out of the latter. In particular, the iOS ports wants to opt into the former and opt-out of the latter. 1496022 1 359536 dbates 2019-01-18 14:01:10 -0800 Created attachment 359536 Patch 1496026 2 359536 simon.fraser 2019-01-18 14:10:26 -0800 Comment on attachment 359536 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=359536&action=review > Source/WebCore/page/Settings.yaml:799 > +usePlatformFocusRingColorForOutlineStyleAuto: > + initial: defaultUsePlatformFocusRingColorForOutlineStyleAuto() > + > +useShrinkWrappedFocusRingForOutlineStyleAuto: > + initial: defaultUseShrinkWrappedFocusRingForOutlineStyleAuto() Do you really need settings here, or can you just have a static function somewhere whose return values depend on #ifdefs? I think Settings are only useful if you are ever going to change them at runtime, e.g. for testing. I could imagine some static methods on Theme/RenderTheme, for instance. 1496036 3 359540 dbates 2019-01-18 14:30:01 -0800 Created attachment 359540 Patch 1504693 4 361633 dbates 2019-02-10 10:44:12 -0800 Created attachment 361633 Patch 1504694 5 dbates 2019-02-10 10:45:09 -0800 (In reply to Simon Fraser (smfr) from comment #2) > Comment on attachment 359536 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=359536&action=review > > > Source/WebCore/page/Settings.yaml:799 > > +usePlatformFocusRingColorForOutlineStyleAuto: > > + initial: defaultUsePlatformFocusRingColorForOutlineStyleAuto() > > + > > +useShrinkWrappedFocusRingForOutlineStyleAuto: > > + initial: defaultUseShrinkWrappedFocusRingForOutlineStyleAuto() > > Do you really need settings here, or can you just have a static function > somewhere whose return values depend on #ifdefs? > Took this approach. 1504926 6 361633 dbates 2019-02-11 11:00:13 -0800 Comment on attachment 361633 Patch Clearing flags on attachment: 361633 Committed r241271: <https://trac.webkit.org/changeset/241271> 1504927 7 dbates 2019-02-11 11:00:15 -0800 All reviewed patches have been landed. Closing bug. 1504933 8 webkit-bug-importer 2019-02-11 11:02:42 -0800 <rdar://problem/47970888> 359536 2019-01-18 14:01:10 -0800 2019-01-18 14:30:00 -0800 Patch bug-193591-20190118140109.patch text/plain 10487 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjQwMDQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODdhNzQ4YTBlYmMwNDdl NDMxNTdkMjlhMjM3YWQ2ZTkwMmJmMGFkMS4uNTFkOTIyMjk0MmZmYjE4Yjk1M2VmNzMwYjM5NTdj MTgxZmZjNjgxMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDE5LTAxLTE4ICBEYW5p ZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBTZXBhcmF0ZSBvdXQgb3V0 bGluZS1zdHlsZTogYXV0byB1c2VyLWFnZW50IGFwcGVhcmFuY2UgZnJvbSBNYWMgYW5pbWF0ZWQg Zm9jdXMgcmluZyBkcmF3aW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xOTM1OTEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBVbnRhbmdsZSB0aGUgTWFjLXNwZWNpZmljIGNvbmNlcHQgb2YgYW5pbWF0ZWQg Zm9jdXMgcmluZyBkcmF3aW5nIGZyb20gdGhlIGNvbmNlcHRzIG9mIHVzaW5nCisgICAgICAgIHRo ZSBmYW5jeSBzaHJpbmstd3JhcHBlZCBmb2N1cyByaW5nIGFwcGVhcmFuY2UgYW5kIHVzaW5nIHRo ZSBwbGF0Zm9ybSBmb2N1cyByaW5nIGNvbG9yIHdoZW4KKyAgICAgICAgb3V0bGluZS1zdHlsZTog YXV0by4KKworICAgICAgICBObyBmdW5jdGlvbmFsaXR5IGNoYW5nZWQuIFNvLCBubyBuZXcgdGVz dHMuCisKKyAgICAgICAgKiBwYWdlL1NldHRpbmdzLnlhbWw6CisgICAgICAgICogcGFnZS9TZXR0 aW5nc0Jhc2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2V0dGluZ3NCYXNlOjpkZWZhdWx0VXNl UGxhdGZvcm1Gb2N1c1JpbmdDb2xvckZvck91dGxpbmVTdHlsZUF1dG8pOiBVc2UgdGhlIHBsYXRm b3JtCisgICAgICAgIGZvY3VzIHJpbmcgY29sb3Igb24gQ29jb2EtYmFzZWQgcGxhdGZvcm1zLiBB bGwgb3RoZXIgcGxhdGZvcm1zIHdpbGwgdXNlIHRoZSBDU1Mgb3V0bGluZS1jb2xvci4KKyAgICAg ICAgKFdlYkNvcmU6OlNldHRpbmdzQmFzZTo6ZGVmYXVsdFVzZVNocmlua1dyYXBwZWRGb2N1c1Jp bmdGb3JPdXRsaW5lU3R5bGVBdXRvKTogRW5hYmxlIHRoZSBmYW5jeQorICAgICAgICBzaHJpbmsg d3JhcHBlZCBmb2N1cyByaW5nIGFwcGVhcmFuY2Ugb24gQ29jb2EtYmFzZWQgcGxhdGZvcm1zLiBE aXNhYmxlIGl0IC0gdXNlIGEgcGxhaW4gcmVjdGFuZ2xlIC0KKyAgICAgICAgb24gYWxsIG90aGVy IHBsYXRmb3Jtcy4KKyAgICAgICAgKiBwYWdlL1NldHRpbmdzQmFzZS5oOgorCisgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0Lmg6CisgICAgICAgICogcGxhdGZvcm0v Z3JhcGhpY3MvY29jb2EvR3JhcGhpY3NDb250ZXh0Q29jb2EubW06CisgICAgICAgIChXZWJDb3Jl OjpkcmF3Rm9jdXNSaW5nKToKKyAgICAgICAgKFdlYkNvcmU6OmRyYXdGb2N1c1JpbmdUb0NvbnRl eHRBdFRpbWUpOgorICAgICAgICBDaGFuZ2Ugc29tZSBtYWNybyBndWFyZHMuCisKKyAgICAgICAg KiByZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJF bGVtZW50OjpwYWludEZvY3VzUmluZyk6IFF1ZXJ5IHRoZSBzZXR0aW5ncyB0byBkZXRlcm1pbmUg d2hldGhlciB0byBwZXJmb3JtCisgICAgICAgIGZhbmN5IHNocmluay13cmFwcGluZyBhbmQgd2hl dGhlciB0byB1c2UgdGhlIHBsYXRmb3JtIGZvY3VzIHJpbmcgY29sb3Igb3ZlciB0aGUgQ1NTIG91 dGxpbmUtY29sb3IuCisgICAgICAgIE9ubHkgY29tcGlsZSBjYWxscyB0byB0aGUgYW5pbWF0ZWQg ZHJhd0ZvY3VzUmluZygpIHZhcmlhbnRzIHdoZW4gYnVpbGRpbmcgb24gTWFjIGFzIHRoaXMgaXMg dGhlCisgICAgICAgIG9ubHkgcGxhdGZvcm0gdGhhdCBzdXBwb3J0cyB0aGVtIGF0IHRoZSB0aW1l IG9mIHdyaXRpbmcuCisKIDIwMTktMDEtMTggIERhbmllbCBCYXRlcyAgPGRhYmF0ZXNAYXBwbGUu Y29tPgogCiAgICAgICAgIENTUyBhdXRvIGZvY3VzLXJpbmcgb3V0bGluZXMgZG9uJ3QgcmVuZGVy IG9uIGlPUwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy55YW1sIGIv U291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy55YW1sCmluZGV4IDJiMTg3ZTEzNTkzYjQ2Nzlj MTVhM2IzYzNkMDQ4ZDNhYTJiYTAyNGMuLmJiNGU5MmE0OWRjYjkyNGIwN2NhOTQ3YWMzODVlOWY5 YzRlNWVmYTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MueWFtbAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLnlhbWwKQEAgLTc5MSwzICs3OTEsOSBA QCB2aWRlb1F1YWxpdHlJbmNsdWRlc0Rpc3BsYXlDb21wb3NpdGluZ0VuYWJsZWQ6CiAKIGVkaXRh YmxlSW1hZ2VzRW5hYmxlZDoKICAgaW5pdGlhbDogZmFsc2UKKwordXNlUGxhdGZvcm1Gb2N1c1Jp bmdDb2xvckZvck91dGxpbmVTdHlsZUF1dG86CisgIGluaXRpYWw6IGRlZmF1bHRVc2VQbGF0Zm9y bUZvY3VzUmluZ0NvbG9yRm9yT3V0bGluZVN0eWxlQXV0bygpCisKK3VzZVNocmlua1dyYXBwZWRG b2N1c1JpbmdGb3JPdXRsaW5lU3R5bGVBdXRvOgorICBpbml0aWFsOiBkZWZhdWx0VXNlU2hyaW5r V3JhcHBlZEZvY3VzUmluZ0Zvck91dGxpbmVTdHlsZUF1dG8oKQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGFnZS9TZXR0aW5nc0Jhc2UuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0 aW5nc0Jhc2UuY3BwCmluZGV4IGNkNGM0ZTgxMThmMTUxNTIwYTJjMDJiMmI0MTM0M2ZjZWRkMmU3 ODIuLjRlZmUyNDZjYWRiZWY3ODg4NTA1ODVhNTI4ODdiN2M4MDBjNDFjNzAgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3NCYXNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wYWdlL1NldHRpbmdzQmFzZS5jcHAKQEAgLTEwMyw2ICsxMDMsMjQgQEAgYm9vbCBTZXR0aW5n c0Jhc2U6OmRlZmF1bHREb3dubG9hZGFibGVCaW5hcnlGb250c0VuYWJsZWQoKQogI2VuZGlmCiB9 CiAKK2Jvb2wgU2V0dGluZ3NCYXNlOjpkZWZhdWx0VXNlUGxhdGZvcm1Gb2N1c1JpbmdDb2xvckZv ck91dGxpbmVTdHlsZUF1dG8oKQoreworI2lmIFBMQVRGT1JNKENPQ09BKQorICAgIHJldHVybiB0 cnVlOworI2Vsc2UKKyAgICByZXR1cm4gZmFsc2U7CisjZW5kaWYKK30KKworYm9vbCBTZXR0aW5n c0Jhc2U6OmRlZmF1bHRVc2VTaHJpbmtXcmFwcGVkRm9jdXNSaW5nRm9yT3V0bGluZVN0eWxlQXV0 bygpCit7CisjaWYgUExBVEZPUk0oQ09DT0EpCisgICAgcmV0dXJuIHRydWU7CisjZWxzZQorICAg IHJldHVybiBmYWxzZTsKKyNlbmRpZgorfQorCiAjaWYgIVBMQVRGT1JNKENPQ09BKQogY29uc3Qg U3RyaW5nJiBTZXR0aW5nc0Jhc2U6OmRlZmF1bHRNZWRpYUNvbnRlbnRUeXBlc1JlcXVpcmluZ0hh cmR3YXJlU3VwcG9ydCgpCiB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRp bmdzQmFzZS5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5nc0Jhc2UuaAppbmRleCBkNjQ3 MWMyNGQ5ZWJjNzBkYTkzN2FmYWI1OWJjYmFkMDFlMTE5ZGZkLi5kYmQ2OTMwMWM4YWZhODMwZGU5 OWFjYjAxNTJjN2I2YmY1NmQxMWUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1Nl dHRpbmdzQmFzZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3NCYXNlLmgKQEAg LTExNiw2ICsxMTYsOSBAQCBwdWJsaWM6CiAgICAgV0VCQ09SRV9FWFBPUlQgc3RhdGljIGZsb2F0 IGRlZmF1bHRNaW5pbXVtWm9vbUZvbnRTaXplKCk7CiAgICAgV0VCQ09SRV9FWFBPUlQgc3RhdGlj IGJvb2wgZGVmYXVsdERvd25sb2FkYWJsZUJpbmFyeUZvbnRzRW5hYmxlZCgpOwogCisgICAgV0VC Q09SRV9FWFBPUlQgc3RhdGljIGJvb2wgZGVmYXVsdFVzZVBsYXRmb3JtRm9jdXNSaW5nQ29sb3JG b3JPdXRsaW5lU3R5bGVBdXRvKCk7CisgICAgV0VCQ09SRV9FWFBPUlQgc3RhdGljIGJvb2wgZGVm YXVsdFVzZVNocmlua1dyYXBwZWRGb2N1c1JpbmdGb3JPdXRsaW5lU3R5bGVBdXRvKCk7CisKICAg ICBzdGF0aWMgY29uc3QgdW5zaWduZWQgZGVmYXVsdE1heGltdW1IVE1MUGFyc2VyRE9NVHJlZURl cHRoID0gNTEyOwogICAgIHN0YXRpYyBjb25zdCB1bnNpZ25lZCBkZWZhdWx0TWF4aW11bVJlbmRl clRyZWVEZXB0aCA9IDUxMjsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9HcmFwaGljc0NvbnRleHQuaAppbmRleCA5NTkyMTQzNTAwZGVmNjc1YjZlNTMxNDk3NDlm NmZjMzkwNWMzNGFiLi5mMTYxOGI1NzBjODc2MjgzZTJiZThmZDQ5NTA2Njk0OTEzNDYzNWQwIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRl eHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRl eHQuaApAQCAtNDQ3LDkgKzQ0Nyw3IEBAIHB1YmxpYzoKICAgICB2b2lkIGRyYXdGb2N1c1Jpbmco Y29uc3QgVmVjdG9yPEZsb2F0UmVjdD4mLCBmbG9hdCB3aWR0aCwgZmxvYXQgb2Zmc2V0LCBjb25z dCBDb2xvciYpOwogICAgIHZvaWQgZHJhd0ZvY3VzUmluZyhjb25zdCBQYXRoJiwgZmxvYXQgd2lk dGgsIGZsb2F0IG9mZnNldCwgY29uc3QgQ29sb3ImKTsKIAotICAgIC8vIEZJWE1FOiBUaGUgZm9s bG93aW5nIGZ1bmN0aW9ucyBzaG91bGQgb25seSBiZSBjb21waWxlZCBmb3IgTWFjLiBPbmNlIHdl IGZpeCA8aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MzU4MT4KLSAg ICAvLyB3ZSB3aWxsIGJlIGluIGEgcG9zaXRpb24gdG8gb25seSBjYWxsIHRoZXNlIGZ1bmN0aW9u cyBmb3IgTWFjLgotI2lmIFBMQVRGT1JNKENPQ09BKQorI2lmIFBMQVRGT1JNKE1BQykKICAgICB2 b2lkIGRyYXdGb2N1c1JpbmcoY29uc3QgUGF0aCYsIGRvdWJsZSB0aW1lT2Zmc2V0LCBib29sJiBu ZWVkc1JlZHJhdywgY29uc3QgQ29sb3ImKTsKICAgICB2b2lkIGRyYXdGb2N1c1JpbmcoY29uc3Qg VmVjdG9yPEZsb2F0UmVjdD4mLCBkb3VibGUgdGltZU9mZnNldCwgYm9vbCYgbmVlZHNSZWRyYXcs IGNvbnN0IENvbG9yJik7CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2NvY29hL0dyYXBoaWNzQ29udGV4dENvY29hLm1tIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvR3JhcGhpY3NDb250ZXh0Q29jb2EubW0KaW5kZXgg Njk4NjBlZTlkM2ZlY2NiZjcyNzVjZmNkMzlmZjhkZmJjZDkzYTBmNC4uN2U3MGU0NjQ5ZjIxNzA2 MTc0NzhiZGJhNmYzZWFjZDRjZjcxYmIzNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY29jb2EvR3JhcGhpY3NDb250ZXh0Q29jb2EubW0KKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvR3JhcGhpY3NDb250ZXh0Q29jb2EubW0K QEAgLTk1LDcgKzk1LDcgQEAgc3RhdGljIGJvb2wgZHJhd0ZvY3VzUmluZ0F0VGltZShDR0NvbnRl eHRSZWYgY29udGV4dCwgTlNUaW1lSW50ZXJ2YWwgdGltZU9mZnNldCwKICAgICByZXR1cm4gbmVl ZHNSZXBhaW50OwogfQogCi1zdGF0aWMgdm9pZCBkcmF3Rm9jdXNSaW5nKENHQ29udGV4dFJlZiBj b250ZXh0LCBjb25zdCBDb2xvciYgY29sb3IpCitpbmxpbmUgc3RhdGljIHZvaWQgZHJhd0ZvY3Vz UmluZyhDR0NvbnRleHRSZWYgY29udGV4dCwgY29uc3QgQ29sb3ImIGNvbG9yKQogewogICAgIGRy YXdGb2N1c1JpbmdBdFRpbWUoY29udGV4dCwgc3RkOjpudW1lcmljX2xpbWl0czxkb3VibGU+Ojpt YXgoKSwgY29sb3IpOwogfQpAQCAtMTA3LDE0ICsxMDcsNiBAQCBzdGF0aWMgdm9pZCBkcmF3Rm9j dXNSaW5nVG9Db250ZXh0KENHQ29udGV4dFJlZiBjb250ZXh0LCBDR1BhdGhSZWYgZm9jdXNSaW5n UGF0aAogICAgIGRyYXdGb2N1c1JpbmcoY29udGV4dCwgY29sb3IpOwogfQogCi1zdGF0aWMgYm9v bCBkcmF3Rm9jdXNSaW5nVG9Db250ZXh0QXRUaW1lKENHQ29udGV4dFJlZiBjb250ZXh0LCBDR1Bh dGhSZWYgZm9jdXNSaW5nUGF0aCwgZG91YmxlIHRpbWVPZmZzZXQsIGNvbnN0IENvbG9yJiBjb2xv cikKLXsKLSAgICBVTlVTRURfUEFSQU0odGltZU9mZnNldCk7Ci0gICAgQ0dDb250ZXh0QmVnaW5Q YXRoKGNvbnRleHQpOwotICAgIENHQ29udGV4dEFkZFBhdGgoY29udGV4dCwgZm9jdXNSaW5nUGF0 aCk7Ci0gICAgcmV0dXJuIGRyYXdGb2N1c1JpbmdBdFRpbWUoY29udGV4dCwgc3RkOjpudW1lcmlj X2xpbWl0czxkb3VibGU+OjptYXgoKSwgY29sb3IpOwotfQotCiAjZW5kaWYgLy8gRU5BQkxFKEZV TExfS0VZQk9BUkRfQUNDRVNTKQogCiB2b2lkIEdyYXBoaWNzQ29udGV4dDo6ZHJhd0ZvY3VzUmlu Zyhjb25zdCBQYXRoJiBwYXRoLCBmbG9hdCB3aWR0aCwgZmxvYXQgb2Zmc2V0LCBjb25zdCBDb2xv ciYgY29sb3IpCkBAIC0xMzcsOSArMTI5LDE1IEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpkcmF3 Rm9jdXNSaW5nKGNvbnN0IFBhdGgmIHBhdGgsIGZsb2F0IHdpZHRoLCBmbG9hdCBvZmZzZXQsCiAj ZW5kaWYKIH0KIAotLy8gRklYTUU6IFRoZSBmb2xsb3dpbmcgZnVuY3Rpb25zIHNob3VsZCBvbmx5 IGJlIGNvbXBpbGVkIGZvciBNYWMuIE9uY2Ugd2UgZml4IDxodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTkzNTgxPgotLy8gd2Ugd2lsbCBiZSBpbiBhIHBvc2l0aW9uIHRv IG9ubHkgY2FsbCB0aGVzZSBmdW5jdGlvbnMgZm9yIE1hYy4KLSNpZiBFTkFCTEUoRlVMTF9LRVlC T0FSRF9BQ0NFU1MpCisjaWYgUExBVEZPUk0oTUFDKQorCitzdGF0aWMgYm9vbCBkcmF3Rm9jdXNS aW5nVG9Db250ZXh0QXRUaW1lKENHQ29udGV4dFJlZiBjb250ZXh0LCBDR1BhdGhSZWYgZm9jdXNS aW5nUGF0aCwgZG91YmxlIHRpbWVPZmZzZXQsIGNvbnN0IENvbG9yJiBjb2xvcikKK3sKKyAgICBV TlVTRURfUEFSQU0odGltZU9mZnNldCk7CisgICAgQ0dDb250ZXh0QmVnaW5QYXRoKGNvbnRleHQp OworICAgIENHQ29udGV4dEFkZFBhdGgoY29udGV4dCwgZm9jdXNSaW5nUGF0aCk7CisgICAgcmV0 dXJuIGRyYXdGb2N1c1JpbmdBdFRpbWUoY29udGV4dCwgc3RkOjpudW1lcmljX2xpbWl0czxkb3Vi bGU+OjptYXgoKSwgY29sb3IpOworfQogCiB2b2lkIEdyYXBoaWNzQ29udGV4dDo6ZHJhd0ZvY3Vz UmluZyhjb25zdCBQYXRoJiBwYXRoLCBkb3VibGUgdGltZU9mZnNldCwgYm9vbCYgbmVlZHNSZWRy YXcsIGNvbnN0IENvbG9yJiBjb2xvcikKIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJFbGVtZW50LmNwcAppbmRleCAzNjQxZGQ5YWUyZGQ3YmE5ODZkNWMxMTUwMjRmOWY1OTFlNDk4 YzEyLi4xOTRhYmRhMjY3MGI1OGMyZWE4MTNmMGQ0OWNiNzNhMDY3YjcwODc1IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQuY3BwCkBAIC0xODE5LDI2ICsxODE5LDI5 IEBAIHZvaWQgUmVuZGVyRWxlbWVudDo6cGFpbnRGb2N1c1JpbmcoUGFpbnRJbmZvJiBwYWludElu Zm8sIGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsCiAgICAgICAgIHJlY3QuaW5mbGF0ZShvdXRsaW5l T2Zmc2V0KTsKICAgICAgICAgcGl4ZWxTbmFwcGVkRm9jdXNSaW5nUmVjdHMuYXBwZW5kKHNuYXBS ZWN0VG9EZXZpY2VQaXhlbHMocmVjdCwgZGV2aWNlU2NhbGVGYWN0b3IpKTsKICAgICB9Ci0gICAg Ly8gRklYTUU6IFRoZSBmb2xsb3dpbmcgY29kZSBzaG91bGQgb25seSBiZSBjb21waWxlZCBmb3Ig TWFjLiBPbmNlIHdlIGZpeCA8aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE5MzU4MT4KLSAgICAvLyB3ZSBjYW4gZXh0cmFjdCB0aGUgcGxhdGZvcm0taW5kZXBlbmRlbnQg c2hyaW5rLXdyYXBwaW5nIGxvZ2ljIGFuZCBvbmx5IGd1YXJkIHRoZSBjYWxscyB0byB0aGUgcmVw YWludC1hd2FyZSBkcmF3Rm9jdXNSaW5nKCkKLSAgICAvLyB2YXJpYW50cyBpbiBQTEFURk9STShN QUMpLgotI2lmIFBMQVRGT1JNKENPQ09BKQotICAgIGJvb2wgbmVlZHNSZXBhaW50OwotICAgIGlm IChzdHlsZS5oYXNCb3JkZXJSYWRpdXMoKSkgeworICAgIENvbG9yIGZvY3VzUmluZ0NvbG9yID0g c2V0dGluZ3MoKS51c2VQbGF0Zm9ybUZvY3VzUmluZ0NvbG9yRm9yT3V0bGluZVN0eWxlQXV0bygp ID8gUmVuZGVyVGhlbWU6OnNpbmdsZXRvbigpLmZvY3VzUmluZ0NvbG9yKHN0eWxlQ29sb3JPcHRp b25zKCkpIDogc3R5bGUudmlzaXRlZERlcGVuZGVudENvbG9yV2l0aENvbG9yRmlsdGVyKENTU1By b3BlcnR5T3V0bGluZUNvbG9yKTsKKyAgICBib29sIG5lZWRzUmVwYWludCA9IGZhbHNlOworICAg IGlmIChzZXR0aW5ncygpLnVzZVNocmlua1dyYXBwZWRGb2N1c1JpbmdGb3JPdXRsaW5lU3R5bGVB dXRvKCkgJiYgc3R5bGUuaGFzQm9yZGVyUmFkaXVzKCkpIHsKICAgICAgICAgUGF0aCBwYXRoID0g UGF0aFV0aWxpdGllczo6cGF0aFdpdGhTaHJpbmtXcmFwcGVkUmVjdHNGb3JPdXRsaW5lKHBpeGVs U25hcHBlZEZvY3VzUmluZ1JlY3RzLCBzdHlsZS5ib3JkZXIoKSwgb3V0bGluZU9mZnNldCwgc3R5 bGUuZGlyZWN0aW9uKCksIHN0eWxlLndyaXRpbmdNb2RlKCksCiAgICAgICAgICAgICBkb2N1bWVu dCgpLmRldmljZVNjYWxlRmFjdG9yKCkpOwogICAgICAgICBpZiAocGF0aC5pc0VtcHR5KCkpIHsK ICAgICAgICAgICAgIGZvciAoYXV0byByZWN0IDogcGl4ZWxTbmFwcGVkRm9jdXNSaW5nUmVjdHMp CiAgICAgICAgICAgICAgICAgcGF0aC5hZGRSZWN0KHJlY3QpOwogICAgICAgICB9Ci0gICAgICAg IHBhaW50SW5mby5jb250ZXh0KCkuZHJhd0ZvY3VzUmluZyhwYXRoLCBwYWdlKCkuZm9jdXNDb250 cm9sbGVyKCkudGltZVNpbmNlRm9jdXNXYXNTZXQoKS5zZWNvbmRzKCksIG5lZWRzUmVwYWludCwg UmVuZGVyVGhlbWU6OnNpbmdsZXRvbigpLmZvY3VzUmluZ0NvbG9yKHN0eWxlQ29sb3JPcHRpb25z KCkpKTsKLSAgICB9IGVsc2UKLSAgICAgICAgcGFpbnRJbmZvLmNvbnRleHQoKS5kcmF3Rm9jdXNS aW5nKHBpeGVsU25hcHBlZEZvY3VzUmluZ1JlY3RzLCBwYWdlKCkuZm9jdXNDb250cm9sbGVyKCku dGltZVNpbmNlRm9jdXNXYXNTZXQoKS5zZWNvbmRzKCksIG5lZWRzUmVwYWludCwgUmVuZGVyVGhl bWU6OnNpbmdsZXRvbigpLmZvY3VzUmluZ0NvbG9yKHN0eWxlQ29sb3JPcHRpb25zKCkpKTsKLSAg ICBpZiAobmVlZHNSZXBhaW50KQotICAgICAgICBwYWdlKCkuZm9jdXNDb250cm9sbGVyKCkuc2V0 Rm9jdXNlZEVsZW1lbnROZWVkc1JlcGFpbnQoKTsKKyNpZiBQTEFURk9STShNQUMpCisgICAgICAg IHBhaW50SW5mby5jb250ZXh0KCkuZHJhd0ZvY3VzUmluZyhwYXRoLCBwYWdlKCkuZm9jdXNDb250 cm9sbGVyKCkudGltZVNpbmNlRm9jdXNXYXNTZXQoKS5zZWNvbmRzKCksIG5lZWRzUmVwYWludCwg Zm9jdXNSaW5nQ29sb3IpOworI2Vsc2UKKyAgICAgICAgcGFpbnRJbmZvLmNvbnRleHQoKS5kcmF3 Rm9jdXNSaW5nKHBhdGgsIHN0eWxlLm91dGxpbmVXaWR0aCgpLCBzdHlsZS5vdXRsaW5lT2Zmc2V0 KCksIGZvY3VzUmluZ0NvbG9yKTsKKyNlbmRpZgorICAgIH0gZWxzZSB7CisjaWYgUExBVEZPUk0o TUFDKQorICAgICAgICBwYWludEluZm8uY29udGV4dCgpLmRyYXdGb2N1c1JpbmcocGl4ZWxTbmFw cGVkRm9jdXNSaW5nUmVjdHMsIHBhZ2UoKS5mb2N1c0NvbnRyb2xsZXIoKS50aW1lU2luY2VGb2N1 c1dhc1NldCgpLnNlY29uZHMoKSwgbmVlZHNSZXBhaW50LCBmb2N1c1JpbmdDb2xvcik7CiAjZWxz ZQotICAgIHBhaW50SW5mby5jb250ZXh0KCkuZHJhd0ZvY3VzUmluZyhwaXhlbFNuYXBwZWRGb2N1 c1JpbmdSZWN0cywgc3R5bGUub3V0bGluZVdpZHRoKCksIHN0eWxlLm91dGxpbmVPZmZzZXQoKSwg c3R5bGUudmlzaXRlZERlcGVuZGVudENvbG9yV2l0aENvbG9yRmlsdGVyKENTU1Byb3BlcnR5T3V0 bGluZUNvbG9yKSk7CisgICAgICAgIHBhaW50SW5mby5jb250ZXh0KCkuZHJhd0ZvY3VzUmluZyhw aXhlbFNuYXBwZWRGb2N1c1JpbmdSZWN0cywgc3R5bGUub3V0bGluZVdpZHRoKCksIHN0eWxlLm91 dGxpbmVPZmZzZXQoKSwgZm9jdXNSaW5nQ29sb3IpOwogI2VuZGlmCisgICAgfQorICAgIGlmIChu ZWVkc1JlcGFpbnQpCisgICAgICAgIHBhZ2UoKS5mb2N1c0NvbnRyb2xsZXIoKS5zZXRGb2N1c2Vk RWxlbWVudE5lZWRzUmVwYWludCgpOwogfQogCiB2b2lkIFJlbmRlckVsZW1lbnQ6OnBhaW50T3V0 bGluZShQYWludEluZm8mIHBhaW50SW5mbywgY29uc3QgTGF5b3V0UmVjdCYgcGFpbnRSZWN0KQo= 359540 2019-01-18 14:30:01 -0800 2019-02-10 10:44:11 -0800 Patch bug-193591-20190118143001.patch text/plain 7598 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjQwMTcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDdmODQ3NjM4YmZiNzY3 YWU1MzQzNzhhMGIxNjUyZjM2YmE2ZGY2ZS4uMmU3MzE3MDA3N2I3ODU5NTNlM2M1M2Y1NDA3MmYw Y2RlM2I1ZWRmMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDE5LTAxLTE4ICBEYW5p ZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBTZXBhcmF0ZSBvdXQgb3V0 bGluZS1zdHlsZTogYXV0byB1c2VyLWFnZW50IGFwcGVhcmFuY2UgZnJvbSBNYWMgYW5pbWF0ZWQg Zm9jdXMgcmluZyBkcmF3aW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xOTM1OTEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBVbnRhbmdsZSB0aGUgTWFjLXNwZWNpZmljIGNvbmNlcHQgb2YgYW5pbWF0ZWQg Zm9jdXMgcmluZyBkcmF3aW5nIGZyb20gdGhlIGNvbmNlcHRzIG9mIHVzaW5nCisgICAgICAgIHRo ZSBmYW5jeSBzaHJpbmstd3JhcHBlZCBmb2N1cyByaW5nIGFwcGVhcmFuY2UgYW5kIHVzaW5nIHRo ZSBwbGF0Zm9ybSBmb2N1cyByaW5nIGNvbG9yIHdoZW4KKyAgICAgICAgb3V0bGluZS1zdHlsZTog YXV0by4KKworICAgICAgICBObyBmdW5jdGlvbmFsaXR5IGNoYW5nZWQuIFNvLCBubyBuZXcgdGVz dHMuCisKKyAgICAgICAgKiBwYWdlL1NldHRpbmdzLnlhbWw6CisgICAgICAgICogcGFnZS9TZXR0 aW5nc0Jhc2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2V0dGluZ3NCYXNlOjpkZWZhdWx0VXNl UGxhdGZvcm1Gb2N1c1JpbmdDb2xvckZvck91dGxpbmVTdHlsZUF1dG8pOiBVc2UgdGhlIHBsYXRm b3JtCisgICAgICAgIGZvY3VzIHJpbmcgY29sb3Igb24gQ29jb2EtYmFzZWQgcGxhdGZvcm1zLiBB bGwgb3RoZXIgcGxhdGZvcm1zIHdpbGwgdXNlIHRoZSBDU1Mgb3V0bGluZS1jb2xvci4KKyAgICAg ICAgKFdlYkNvcmU6OlNldHRpbmdzQmFzZTo6ZGVmYXVsdFVzZVNocmlua1dyYXBwZWRGb2N1c1Jp bmdGb3JPdXRsaW5lU3R5bGVBdXRvKTogRW5hYmxlIHRoZSBmYW5jeQorICAgICAgICBzaHJpbmsg d3JhcHBlZCBmb2N1cyByaW5nIGFwcGVhcmFuY2Ugb24gQ29jb2EtYmFzZWQgcGxhdGZvcm1zLiBE aXNhYmxlIGl0IC0gdXNlIGEgcGxhaW4gcmVjdGFuZ2xlIC0KKyAgICAgICAgb24gYWxsIG90aGVy IHBsYXRmb3Jtcy4KKyAgICAgICAgKiBwYWdlL1NldHRpbmdzQmFzZS5oOgorCisgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0Lmg6CisgICAgICAgICogcGxhdGZvcm0v Z3JhcGhpY3MvY29jb2EvR3JhcGhpY3NDb250ZXh0Q29jb2EubW06CisgICAgICAgIChXZWJDb3Jl OjpkcmF3Rm9jdXNSaW5nKToKKyAgICAgICAgKFdlYkNvcmU6OmRyYXdGb2N1c1JpbmdUb0NvbnRl eHRBdFRpbWUpOgorICAgICAgICBDaGFuZ2Ugc29tZSBtYWNybyBndWFyZHMuCisKKyAgICAgICAg KiByZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJF bGVtZW50OjpwYWludEZvY3VzUmluZyk6IFF1ZXJ5IHRoZSBzZXR0aW5ncyB0byBkZXRlcm1pbmUg d2hldGhlciB0byBwZXJmb3JtCisgICAgICAgIGZhbmN5IHNocmluay13cmFwcGluZyBhbmQgd2hl dGhlciB0byB1c2UgdGhlIHBsYXRmb3JtIGZvY3VzIHJpbmcgY29sb3Igb3ZlciB0aGUgQ1NTIG91 dGxpbmUtY29sb3IuCisgICAgICAgIE9ubHkgY29tcGlsZSBjYWxscyB0byB0aGUgYW5pbWF0ZWQg ZHJhd0ZvY3VzUmluZygpIHZhcmlhbnRzIHdoZW4gYnVpbGRpbmcgb24gTWFjIGFzIHRoaXMgaXMg dGhlCisgICAgICAgIG9ubHkgcGxhdGZvcm0gdGhhdCBzdXBwb3J0cyB0aGVtIGF0IHRoZSB0aW1l IG9mIHdyaXRpbmcuCisKIDIwMTktMDEtMTggIERhbmllbCBCYXRlcyAgPGRhYmF0ZXNAYXBwbGUu Y29tPgogCiAgICAgICAgIENTUyBhdXRvIGZvY3VzLXJpbmcgb3V0bGluZXMgZG9uJ3QgcmVuZGVy IG9uIGlPUwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy55YW1sIGIv U291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy55YW1sCmluZGV4IDliOWE2ZTg3YzZhY2RmNWIx ODhlOWRiYzNjMWZmMzk2N2RiMDJhNjAuLjgzMTI2NGU4NzY4OWU0NjQ5MDYxMWQ5ZGEyMzYyZmQ0 YTBjNTdjYmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MueWFtbAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLnlhbWwKQEAgLTc4OCwzICs3ODgsOSBA QCB2aWRlb1F1YWxpdHlJbmNsdWRlc0Rpc3BsYXlDb21wb3NpdGluZ0VuYWJsZWQ6CiAKIGVkaXRh YmxlSW1hZ2VzRW5hYmxlZDoKICAgaW5pdGlhbDogZmFsc2UKKwordXNlUGxhdGZvcm1Gb2N1c1Jp bmdDb2xvckZvck91dGxpbmVTdHlsZUF1dG86CisgIGluaXRpYWw6IGRlZmF1bHRVc2VQbGF0Zm9y bUZvY3VzUmluZ0NvbG9yRm9yT3V0bGluZVN0eWxlQXV0bygpCisKK3VzZVNocmlua1dyYXBwZWRG b2N1c1JpbmdGb3JPdXRsaW5lU3R5bGVBdXRvOgorICBpbml0aWFsOiBkZWZhdWx0VXNlU2hyaW5r V3JhcHBlZEZvY3VzUmluZ0Zvck91dGxpbmVTdHlsZUF1dG8oKQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGFnZS9TZXR0aW5nc0Jhc2UuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0 aW5nc0Jhc2UuY3BwCmluZGV4IGNkNGM0ZTgxMThmMTUxNTIwYTJjMDJiMmI0MTM0M2ZjZWRkMmU3 ODIuLjRlZmUyNDZjYWRiZWY3ODg4NTA1ODVhNTI4ODdiN2M4MDBjNDFjNzAgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3NCYXNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wYWdlL1NldHRpbmdzQmFzZS5jcHAKQEAgLTEwMyw2ICsxMDMsMjQgQEAgYm9vbCBTZXR0aW5n c0Jhc2U6OmRlZmF1bHREb3dubG9hZGFibGVCaW5hcnlGb250c0VuYWJsZWQoKQogI2VuZGlmCiB9 CiAKK2Jvb2wgU2V0dGluZ3NCYXNlOjpkZWZhdWx0VXNlUGxhdGZvcm1Gb2N1c1JpbmdDb2xvckZv ck91dGxpbmVTdHlsZUF1dG8oKQoreworI2lmIFBMQVRGT1JNKENPQ09BKQorICAgIHJldHVybiB0 cnVlOworI2Vsc2UKKyAgICByZXR1cm4gZmFsc2U7CisjZW5kaWYKK30KKworYm9vbCBTZXR0aW5n c0Jhc2U6OmRlZmF1bHRVc2VTaHJpbmtXcmFwcGVkRm9jdXNSaW5nRm9yT3V0bGluZVN0eWxlQXV0 bygpCit7CisjaWYgUExBVEZPUk0oQ09DT0EpCisgICAgcmV0dXJuIHRydWU7CisjZWxzZQorICAg IHJldHVybiBmYWxzZTsKKyNlbmRpZgorfQorCiAjaWYgIVBMQVRGT1JNKENPQ09BKQogY29uc3Qg U3RyaW5nJiBTZXR0aW5nc0Jhc2U6OmRlZmF1bHRNZWRpYUNvbnRlbnRUeXBlc1JlcXVpcmluZ0hh cmR3YXJlU3VwcG9ydCgpCiB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRp bmdzQmFzZS5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5nc0Jhc2UuaAppbmRleCBkNjQ3 MWMyNGQ5ZWJjNzBkYTkzN2FmYWI1OWJjYmFkMDFlMTE5ZGZkLi5kYmQ2OTMwMWM4YWZhODMwZGU5 OWFjYjAxNTJjN2I2YmY1NmQxMWUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1Nl dHRpbmdzQmFzZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3NCYXNlLmgKQEAg LTExNiw2ICsxMTYsOSBAQCBwdWJsaWM6CiAgICAgV0VCQ09SRV9FWFBPUlQgc3RhdGljIGZsb2F0 IGRlZmF1bHRNaW5pbXVtWm9vbUZvbnRTaXplKCk7CiAgICAgV0VCQ09SRV9FWFBPUlQgc3RhdGlj IGJvb2wgZGVmYXVsdERvd25sb2FkYWJsZUJpbmFyeUZvbnRzRW5hYmxlZCgpOwogCisgICAgV0VC Q09SRV9FWFBPUlQgc3RhdGljIGJvb2wgZGVmYXVsdFVzZVBsYXRmb3JtRm9jdXNSaW5nQ29sb3JG b3JPdXRsaW5lU3R5bGVBdXRvKCk7CisgICAgV0VCQ09SRV9FWFBPUlQgc3RhdGljIGJvb2wgZGVm YXVsdFVzZVNocmlua1dyYXBwZWRGb2N1c1JpbmdGb3JPdXRsaW5lU3R5bGVBdXRvKCk7CisKICAg ICBzdGF0aWMgY29uc3QgdW5zaWduZWQgZGVmYXVsdE1heGltdW1IVE1MUGFyc2VyRE9NVHJlZURl cHRoID0gNTEyOwogICAgIHN0YXRpYyBjb25zdCB1bnNpZ25lZCBkZWZhdWx0TWF4aW11bVJlbmRl clRyZWVEZXB0aCA9IDUxMjsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9HcmFwaGljc0NvbnRleHQuaAppbmRleCA4MTZjYWVhN2IxYjAwN2ZiMDMyOTZkM2NlY2I1 ZDc2ODg4ZGU5ZGY3Li4xYzM2NmQ1MWNiZDc0ZDBiY2VkZWM1NzkwZGYyZWQ3MWFhY2M3YTk2IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRl eHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRl eHQuaApAQCAtNDQ2LDkgKzQ0Niw3IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgZHJhd0ZvY3VzUmlu Zyhjb25zdCBWZWN0b3I8RmxvYXRSZWN0PiYsIGZsb2F0IHdpZHRoLCBmbG9hdCBvZmZzZXQsIGNv bnN0IENvbG9yJik7CiAgICAgdm9pZCBkcmF3Rm9jdXNSaW5nKGNvbnN0IFBhdGgmLCBmbG9hdCB3 aWR0aCwgZmxvYXQgb2Zmc2V0LCBjb25zdCBDb2xvciYpOwotCi0gICAgLy8gRklYTUU6IFRoZSBm b2xsb3dpbmcgZnVuY3Rpb25zIHNob3VsZCBvbmx5IGJlIGNvbXBpbGVkIGZvciBNYWMuIFNlZSA8 aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MzU5MT4uCi0jaWYgUExB VEZPUk0oQ09DT0EpCisjaWYgUExBVEZPUk0oTUFDKQogICAgIHZvaWQgZHJhd0ZvY3VzUmluZyhj b25zdCBQYXRoJiwgZG91YmxlIHRpbWVPZmZzZXQsIGJvb2wmIG5lZWRzUmVkcmF3LCBjb25zdCBD b2xvciYpOwogICAgIHZvaWQgZHJhd0ZvY3VzUmluZyhjb25zdCBWZWN0b3I8RmxvYXRSZWN0PiYs IGRvdWJsZSB0aW1lT2Zmc2V0LCBib29sJiBuZWVkc1JlZHJhdywgY29uc3QgQ29sb3ImKTsKICNl bmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2Ev R3JhcGhpY3NDb250ZXh0Q29jb2EubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9jb2NvYS9HcmFwaGljc0NvbnRleHRDb2NvYS5tbQppbmRleCA3MDJkNmM1M2E0YThiMzgyZGU1 MzA3YmU0MDdkNjhmYTU3YmJlODQ1Li5lYWI1NjRiMGUyNDI1NWEwMjFjOTQxMjBiODYxZTdjNjkx NzgxNTA3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2Nv YS9HcmFwaGljc0NvbnRleHRDb2NvYS5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jb2NvYS9HcmFwaGljc0NvbnRleHRDb2NvYS5tbQpAQCAtOTUsNyArOTUsNyBAQCBz dGF0aWMgYm9vbCBkcmF3Rm9jdXNSaW5nQXRUaW1lKENHQ29udGV4dFJlZiBjb250ZXh0LCBOU1Rp bWVJbnRlcnZhbCB0aW1lT2Zmc2V0LAogICAgIHJldHVybiBuZWVkc1JlcGFpbnQ7CiB9CiAKLXN0 YXRpYyB2b2lkIGRyYXdGb2N1c1JpbmcoQ0dDb250ZXh0UmVmIGNvbnRleHQsIGNvbnN0IENvbG9y JiBjb2xvcikKK2lubGluZSBzdGF0aWMgdm9pZCBkcmF3Rm9jdXNSaW5nKENHQ29udGV4dFJlZiBj b250ZXh0LCBjb25zdCBDb2xvciYgY29sb3IpCiB7CiAgICAgZHJhd0ZvY3VzUmluZ0F0VGltZShj b250ZXh0LCBzdGQ6Om51bWVyaWNfbGltaXRzPGRvdWJsZT46Om1heCgpLCBjb2xvcik7CiB9CkBA IC0xMDcsMTQgKzEwNyw2IEBAIHN0YXRpYyB2b2lkIGRyYXdGb2N1c1JpbmdUb0NvbnRleHQoQ0dD b250ZXh0UmVmIGNvbnRleHQsIENHUGF0aFJlZiBmb2N1c1JpbmdQYXRoCiAgICAgZHJhd0ZvY3Vz UmluZyhjb250ZXh0LCBjb2xvcik7CiB9CiAKLXN0YXRpYyBib29sIGRyYXdGb2N1c1JpbmdUb0Nv bnRleHRBdFRpbWUoQ0dDb250ZXh0UmVmIGNvbnRleHQsIENHUGF0aFJlZiBmb2N1c1JpbmdQYXRo LCBkb3VibGUgdGltZU9mZnNldCwgY29uc3QgQ29sb3ImIGNvbG9yKQotewotICAgIFVOVVNFRF9Q QVJBTSh0aW1lT2Zmc2V0KTsKLSAgICBDR0NvbnRleHRCZWdpblBhdGgoY29udGV4dCk7Ci0gICAg Q0dDb250ZXh0QWRkUGF0aChjb250ZXh0LCBmb2N1c1JpbmdQYXRoKTsKLSAgICByZXR1cm4gZHJh d0ZvY3VzUmluZ0F0VGltZShjb250ZXh0LCBzdGQ6Om51bWVyaWNfbGltaXRzPGRvdWJsZT46Om1h eCgpLCBjb2xvcik7Ci19Ci0KICNlbmRpZiAvLyBFTkFCTEUoRlVMTF9LRVlCT0FSRF9BQ0NFU1Mp CiAKIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpkcmF3Rm9jdXNSaW5nKGNvbnN0IFBhdGgmIHBhdGgs IGZsb2F0IHdpZHRoLCBmbG9hdCBvZmZzZXQsIGNvbnN0IENvbG9yJiBjb2xvcikKQEAgLTEzNyw4 ICsxMjksMTUgQEAgdm9pZCBHcmFwaGljc0NvbnRleHQ6OmRyYXdGb2N1c1JpbmcoY29uc3QgUGF0 aCYgcGF0aCwgZmxvYXQgd2lkdGgsIGZsb2F0IG9mZnNldCwKICNlbmRpZgogfQogCi0vLyBGSVhN RTogVGhlIGZvbGxvd2luZyBmdW5jdGlvbnMgc2hvdWxkIG9ubHkgYmUgY29tcGlsZWQgZm9yIE1h Yy4gU2VlIDxodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkzNTkxPi4K LSNpZiBFTkFCTEUoRlVMTF9LRVlCT0FSRF9BQ0NFU1MpCisjaWYgUExBVEZPUk0oTUFDKQorCitz dGF0aWMgYm9vbCBkcmF3Rm9jdXNSaW5nVG9Db250ZXh0QXRUaW1lKENHQ29udGV4dFJlZiBjb250 ZXh0LCBDR1BhdGhSZWYgZm9jdXNSaW5nUGF0aCwgZG91YmxlIHRpbWVPZmZzZXQsIGNvbnN0IENv bG9yJiBjb2xvcikKK3sKKyAgICBVTlVTRURfUEFSQU0odGltZU9mZnNldCk7CisgICAgQ0dDb250 ZXh0QmVnaW5QYXRoKGNvbnRleHQpOworICAgIENHQ29udGV4dEFkZFBhdGgoY29udGV4dCwgZm9j dXNSaW5nUGF0aCk7CisgICAgcmV0dXJuIGRyYXdGb2N1c1JpbmdBdFRpbWUoY29udGV4dCwgc3Rk OjpudW1lcmljX2xpbWl0czxkb3VibGU+OjptYXgoKSwgY29sb3IpOworfQogCiB2b2lkIEdyYXBo aWNzQ29udGV4dDo6ZHJhd0ZvY3VzUmluZyhjb25zdCBQYXRoJiBwYXRoLCBkb3VibGUgdGltZU9m ZnNldCwgYm9vbCYgbmVlZHNSZWRyYXcsIGNvbnN0IENvbG9yJiBjb2xvcikKIHsKQEAgLTE2Niw3 ICsxNjUsNyBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6ZHJhd0ZvY3VzUmluZyhjb25zdCBWZWN0 b3I8RmxvYXRSZWN0PiYgcmVjdHMsIGRvdWJsZSB0aW1lTwogICAgIG5lZWRzUmVkcmF3ID0gZHJh d0ZvY3VzUmluZ1RvQ29udGV4dEF0VGltZShwbGF0Zm9ybUNvbnRleHQoKSwgZm9jdXNSaW5nUGF0 aC5nZXQoKSwgdGltZU9mZnNldCwgY29sb3IpOwogfQogCi0jZW5kaWYKKyNlbmRpZiAvLyBQTEFU Rk9STShNQUMpCiAKIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpkcmF3Rm9jdXNSaW5nKGNvbnN0IFZl Y3RvcjxGbG9hdFJlY3Q+JiByZWN0cywgZmxvYXQgd2lkdGgsIGZsb2F0IG9mZnNldCwgY29uc3Qg Q29sb3ImIGNvbG9yKQogewo= 361633 2019-02-10 10:44:12 -0800 2019-02-11 11:00:13 -0800 Patch bug-193591-20190210104410.patch text/plain 8867 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjQxMjMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzYwMWRmYTEwNGQ3N2Mz MDdiZWY1OTBmNTdiNjA2Y2FmOWY2M2YzYi4uYmFhNDViNGNmOTZhNGUxZjg2YjhmZWFhMTAxMzZi MzVlYTY4ZGJlMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE5LTAyLTEwICBEYW5p ZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBTZXBhcmF0ZSBvdXQgb3V0 bGluZS1zdHlsZTogYXV0byB1c2VyLWFnZW50IGFwcGVhcmFuY2UgZnJvbSBNYWMgYW5pbWF0ZWQg Zm9jdXMgcmluZyBkcmF3aW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xOTM1OTEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBVbnRhbmdsZSB0aGUgTWFjLXNwZWNpZmljIGNvbmNlcHQgb2YgYW5pbWF0ZWQg Zm9jdXMgcmluZyBkcmF3aW5nIGZyb20gdGhlIGNvbmNlcHRzIG9mIHVzaW5nCisgICAgICAgIHRo ZSBmYW5jeSBzaHJpbmstd3JhcHBlZCBmb2N1cyByaW5nIGFwcGVhcmFuY2UgYW5kIHVzaW5nIHRo ZSBwbGF0Zm9ybSBmb2N1cyByaW5nIGNvbG9yIHdoZW4KKyAgICAgICAgb3V0bGluZS1zdHlsZTog YXV0by4KKworICAgICAgICBObyBmdW5jdGlvbmFsaXR5IGNoYW5nZWQuIFNvLCBubyBuZXcgdGVz dHMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuaDoKKyAg ICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9HcmFwaGljc0NvbnRleHRDb2NvYS5tbToK KyAgICAgICAgKFdlYkNvcmU6OmRyYXdGb2N1c1JpbmcpOgorICAgICAgICAoV2ViQ29yZTo6ZHJh d0ZvY3VzUmluZ1RvQ29udGV4dEF0VGltZSk6CisgICAgICAgIENoYW5nZSBzb21lIG1hY3JvIGd1 YXJkcy4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJFbGVtZW50LmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OnVzZVBsYXRmb3JtRm9jdXNSaW5nQ29sb3JGb3JPdXRsaW5lU3R5bGVBdXRvKTog QWRkZWQuCisgICAgICAgIChXZWJDb3JlOjp1c2VTaHJpbmtXcmFwcGVkRm9jdXNSaW5nRm9yT3V0 bGluZVN0eWxlQXV0byk6IEFkZGVkLgorICAgICAgICAoV2ViQ29yZTo6ZHJhd0ZvY3VzUmluZyk6 IEFkZGVkLgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRWxlbWVudDo6cGFpbnRGb2N1c1Jpbmcp OiBXcml0ZSBpbiB0ZXJtcyBvZiBkcmF3Rm9jdXNSaW5nKCkuCisKIDIwMTktMDItMDggIERhbmll bCBCYXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgogCiAgICAgICAgIFtpT1NdIEtleXVwcyBmb3Ig bm9uLW1vZGlmaWVyIGtleXMgaWRlbnRpZmllZCBhcyAiRGVhZCIgd2hlbiBub3QgZm9jdXNlZCBp biBhIGNvbnRlbnQtZWRpdGFibGUgZWxlbWVudApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuaAppbmRleCA4MTZjYWVhN2IxYjAwN2ZiMDMy OTZkM2NlY2I1ZDc2ODg4ZGU5ZGY3Li4xYzM2NmQ1MWNiZDc0ZDBiY2VkZWM1NzkwZGYyZWQ3MWFh Y2M3YTk2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFw aGljc0NvbnRleHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFw aGljc0NvbnRleHQuaApAQCAtNDQ2LDkgKzQ0Niw3IEBAIHB1YmxpYzoKIAogICAgIHZvaWQgZHJh d0ZvY3VzUmluZyhjb25zdCBWZWN0b3I8RmxvYXRSZWN0PiYsIGZsb2F0IHdpZHRoLCBmbG9hdCBv ZmZzZXQsIGNvbnN0IENvbG9yJik7CiAgICAgdm9pZCBkcmF3Rm9jdXNSaW5nKGNvbnN0IFBhdGgm LCBmbG9hdCB3aWR0aCwgZmxvYXQgb2Zmc2V0LCBjb25zdCBDb2xvciYpOwotCi0gICAgLy8gRklY TUU6IFRoZSBmb2xsb3dpbmcgZnVuY3Rpb25zIHNob3VsZCBvbmx5IGJlIGNvbXBpbGVkIGZvciBN YWMuIFNlZSA8aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MzU5MT4u Ci0jaWYgUExBVEZPUk0oQ09DT0EpCisjaWYgUExBVEZPUk0oTUFDKQogICAgIHZvaWQgZHJhd0Zv Y3VzUmluZyhjb25zdCBQYXRoJiwgZG91YmxlIHRpbWVPZmZzZXQsIGJvb2wmIG5lZWRzUmVkcmF3 LCBjb25zdCBDb2xvciYpOwogICAgIHZvaWQgZHJhd0ZvY3VzUmluZyhjb25zdCBWZWN0b3I8Rmxv YXRSZWN0PiYsIGRvdWJsZSB0aW1lT2Zmc2V0LCBib29sJiBuZWVkc1JlZHJhdywgY29uc3QgQ29s b3ImKTsKICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY29jb2EvR3JhcGhpY3NDb250ZXh0Q29jb2EubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jb2NvYS9HcmFwaGljc0NvbnRleHRDb2NvYS5tbQppbmRleCA3MDJkNmM1M2E0 YThiMzgyZGU1MzA3YmU0MDdkNjhmYTU3YmJlODQ1Li5lYWI1NjRiMGUyNDI1NWEwMjFjOTQxMjBi ODYxZTdjNjkxNzgxNTA3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jb2NvYS9HcmFwaGljc0NvbnRleHRDb2NvYS5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9HcmFwaGljc0NvbnRleHRDb2NvYS5tbQpAQCAtOTUsNyAr OTUsNyBAQCBzdGF0aWMgYm9vbCBkcmF3Rm9jdXNSaW5nQXRUaW1lKENHQ29udGV4dFJlZiBjb250 ZXh0LCBOU1RpbWVJbnRlcnZhbCB0aW1lT2Zmc2V0LAogICAgIHJldHVybiBuZWVkc1JlcGFpbnQ7 CiB9CiAKLXN0YXRpYyB2b2lkIGRyYXdGb2N1c1JpbmcoQ0dDb250ZXh0UmVmIGNvbnRleHQsIGNv bnN0IENvbG9yJiBjb2xvcikKK2lubGluZSBzdGF0aWMgdm9pZCBkcmF3Rm9jdXNSaW5nKENHQ29u dGV4dFJlZiBjb250ZXh0LCBjb25zdCBDb2xvciYgY29sb3IpCiB7CiAgICAgZHJhd0ZvY3VzUmlu Z0F0VGltZShjb250ZXh0LCBzdGQ6Om51bWVyaWNfbGltaXRzPGRvdWJsZT46Om1heCgpLCBjb2xv cik7CiB9CkBAIC0xMDcsMTQgKzEwNyw2IEBAIHN0YXRpYyB2b2lkIGRyYXdGb2N1c1JpbmdUb0Nv bnRleHQoQ0dDb250ZXh0UmVmIGNvbnRleHQsIENHUGF0aFJlZiBmb2N1c1JpbmdQYXRoCiAgICAg ZHJhd0ZvY3VzUmluZyhjb250ZXh0LCBjb2xvcik7CiB9CiAKLXN0YXRpYyBib29sIGRyYXdGb2N1 c1JpbmdUb0NvbnRleHRBdFRpbWUoQ0dDb250ZXh0UmVmIGNvbnRleHQsIENHUGF0aFJlZiBmb2N1 c1JpbmdQYXRoLCBkb3VibGUgdGltZU9mZnNldCwgY29uc3QgQ29sb3ImIGNvbG9yKQotewotICAg IFVOVVNFRF9QQVJBTSh0aW1lT2Zmc2V0KTsKLSAgICBDR0NvbnRleHRCZWdpblBhdGgoY29udGV4 dCk7Ci0gICAgQ0dDb250ZXh0QWRkUGF0aChjb250ZXh0LCBmb2N1c1JpbmdQYXRoKTsKLSAgICBy ZXR1cm4gZHJhd0ZvY3VzUmluZ0F0VGltZShjb250ZXh0LCBzdGQ6Om51bWVyaWNfbGltaXRzPGRv dWJsZT46Om1heCgpLCBjb2xvcik7Ci19Ci0KICNlbmRpZiAvLyBFTkFCTEUoRlVMTF9LRVlCT0FS RF9BQ0NFU1MpCiAKIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpkcmF3Rm9jdXNSaW5nKGNvbnN0IFBh dGgmIHBhdGgsIGZsb2F0IHdpZHRoLCBmbG9hdCBvZmZzZXQsIGNvbnN0IENvbG9yJiBjb2xvcikK QEAgLTEzNyw4ICsxMjksMTUgQEAgdm9pZCBHcmFwaGljc0NvbnRleHQ6OmRyYXdGb2N1c1Jpbmco Y29uc3QgUGF0aCYgcGF0aCwgZmxvYXQgd2lkdGgsIGZsb2F0IG9mZnNldCwKICNlbmRpZgogfQog Ci0vLyBGSVhNRTogVGhlIGZvbGxvd2luZyBmdW5jdGlvbnMgc2hvdWxkIG9ubHkgYmUgY29tcGls ZWQgZm9yIE1hYy4gU2VlIDxodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTkzNTkxPi4KLSNpZiBFTkFCTEUoRlVMTF9LRVlCT0FSRF9BQ0NFU1MpCisjaWYgUExBVEZPUk0o TUFDKQorCitzdGF0aWMgYm9vbCBkcmF3Rm9jdXNSaW5nVG9Db250ZXh0QXRUaW1lKENHQ29udGV4 dFJlZiBjb250ZXh0LCBDR1BhdGhSZWYgZm9jdXNSaW5nUGF0aCwgZG91YmxlIHRpbWVPZmZzZXQs IGNvbnN0IENvbG9yJiBjb2xvcikKK3sKKyAgICBVTlVTRURfUEFSQU0odGltZU9mZnNldCk7Cisg ICAgQ0dDb250ZXh0QmVnaW5QYXRoKGNvbnRleHQpOworICAgIENHQ29udGV4dEFkZFBhdGgoY29u dGV4dCwgZm9jdXNSaW5nUGF0aCk7CisgICAgcmV0dXJuIGRyYXdGb2N1c1JpbmdBdFRpbWUoY29u dGV4dCwgc3RkOjpudW1lcmljX2xpbWl0czxkb3VibGU+OjptYXgoKSwgY29sb3IpOworfQogCiB2 b2lkIEdyYXBoaWNzQ29udGV4dDo6ZHJhd0ZvY3VzUmluZyhjb25zdCBQYXRoJiBwYXRoLCBkb3Vi bGUgdGltZU9mZnNldCwgYm9vbCYgbmVlZHNSZWRyYXcsIGNvbnN0IENvbG9yJiBjb2xvcikKIHsK QEAgLTE2Niw3ICsxNjUsNyBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6ZHJhd0ZvY3VzUmluZyhj b25zdCBWZWN0b3I8RmxvYXRSZWN0PiYgcmVjdHMsIGRvdWJsZSB0aW1lTwogICAgIG5lZWRzUmVk cmF3ID0gZHJhd0ZvY3VzUmluZ1RvQ29udGV4dEF0VGltZShwbGF0Zm9ybUNvbnRleHQoKSwgZm9j dXNSaW5nUGF0aC5nZXQoKSwgdGltZU9mZnNldCwgY29sb3IpOwogfQogCi0jZW5kaWYKKyNlbmRp ZiAvLyBQTEFURk9STShNQUMpCiAKIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpkcmF3Rm9jdXNSaW5n KGNvbnN0IFZlY3RvcjxGbG9hdFJlY3Q+JiByZWN0cywgZmxvYXQgd2lkdGgsIGZsb2F0IG9mZnNl dCwgY29uc3QgQ29sb3ImIGNvbG9yKQogewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckVsZW1lbnQuY3BwCmluZGV4IDJmMmYzYzFlOWMyMmU5ODlhY2FkMzQ5OWM1ZTk3MjVlMjVkOGMy ZDIuLjk2ZDRhM2MyYWJmYzE1NjJhYWYwMjNmMmQ0N2QwNWZhNjZlZjZhM2MgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5jcHAKQEAgLTE4MDksNiArMTgwOSw1MSBA QCB2b2lkIFJlbmRlckVsZW1lbnQ6OmRyYXdMaW5lRm9yQm94U2lkZShHcmFwaGljc0NvbnRleHQm IGdyYXBoaWNzQ29udGV4dCwgY29uc3QgRgogICAgIH0KIH0KIAorc3RhdGljIGJvb2wgdXNlUGxh dGZvcm1Gb2N1c1JpbmdDb2xvckZvck91dGxpbmVTdHlsZUF1dG8oKQoreworI2lmIFBMQVRGT1JN KENPQ09BKQorICAgIHJldHVybiB0cnVlOworI2Vsc2UKKyAgICByZXR1cm4gZmFsc2U7CisjZW5k aWYKK30KKworc3RhdGljIGJvb2wgdXNlU2hyaW5rV3JhcHBlZEZvY3VzUmluZ0Zvck91dGxpbmVT dHlsZUF1dG8oKQoreworI2lmIFBMQVRGT1JNKENPQ09BKQorICAgIHJldHVybiB0cnVlOworI2Vs c2UKKyAgICByZXR1cm4gZmFsc2U7CisjZW5kaWYKK30KKworc3RhdGljIGJvb2wgZHJhd0ZvY3Vz UmluZyhHcmFwaGljc0NvbnRleHQmIGNvbnRleHQsIFBhZ2UmIHBhZ2UsIGNvbnN0IFBhdGgmIHBh dGgsIGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZSwgQ29sb3IgZm9jdXNSaW5nQ29sb3IpCit7Cisg ICAgYm9vbCBuZWVkc1JlcGFpbnQgPSBmYWxzZTsKKyNpZiBQTEFURk9STShNQUMpCisgICAgY29u dGV4dC5kcmF3Rm9jdXNSaW5nKHBhdGgsIHBhZ2UuZm9jdXNDb250cm9sbGVyKCkudGltZVNpbmNl Rm9jdXNXYXNTZXQoKS5zZWNvbmRzKCksIG5lZWRzUmVwYWludCwgZm9jdXNSaW5nQ29sb3IpOwor ICAgIFVOVVNFRF9QQVJBTShzdHlsZSk7CisjZWxzZQorICAgIGNvbnRleHQuZHJhd0ZvY3VzUmlu ZyhwYXRoLCBzdHlsZS5vdXRsaW5lV2lkdGgoKSwgc3R5bGUub3V0bGluZU9mZnNldCgpLCBmb2N1 c1JpbmdDb2xvcik7CisgICAgVU5VU0VEX1BBUkFNKHBhZ2UpOworI2VuZGlmCisgICAgcmV0dXJu IG5lZWRzUmVwYWludDsKK30KKworc3RhdGljIGJvb2wgZHJhd0ZvY3VzUmluZyhHcmFwaGljc0Nv bnRleHQmIGNvbnRleHQsIFBhZ2UmIHBhZ2UsIFZlY3RvcjxGbG9hdFJlY3Q+IHJlY3RzLCBjb25z dCBSZW5kZXJTdHlsZSYgc3R5bGUsIENvbG9yIGZvY3VzUmluZ0NvbG9yKQoreworICAgIGJvb2wg bmVlZHNSZXBhaW50ID0gZmFsc2U7CisjaWYgUExBVEZPUk0oTUFDKQorICAgIGNvbnRleHQuZHJh d0ZvY3VzUmluZyhyZWN0cywgcGFnZS5mb2N1c0NvbnRyb2xsZXIoKS50aW1lU2luY2VGb2N1c1dh c1NldCgpLnNlY29uZHMoKSwgbmVlZHNSZXBhaW50LCBmb2N1c1JpbmdDb2xvcik7CisgICAgVU5V U0VEX1BBUkFNKHN0eWxlKTsKKyNlbHNlCisgICAgY29udGV4dC5kcmF3Rm9jdXNSaW5nKHJlY3Rz LCBzdHlsZS5vdXRsaW5lV2lkdGgoKSwgc3R5bGUub3V0bGluZU9mZnNldCgpLCBmb2N1c1JpbmdD b2xvcik7CisgICAgVU5VU0VEX1BBUkFNKHBhZ2UpOworI2VuZGlmCisgICAgcmV0dXJuIG5lZWRz UmVwYWludDsKK30KKworCiB2b2lkIFJlbmRlckVsZW1lbnQ6OnBhaW50Rm9jdXNSaW5nKFBhaW50 SW5mbyYgcGFpbnRJbmZvLCBjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGUsIGNvbnN0IFZlY3RvcjxM YXlvdXRSZWN0PiYgZm9jdXNSaW5nUmVjdHMpCiB7CiAgICAgQVNTRVJUKHN0eWxlLm91dGxpbmVT dHlsZUlzQXV0bygpID09IE91dGxpbmVJc0F1dG86Ok9uKTsKQEAgLTE4MTksMjQgKzE4NjQsMjAg QEAgdm9pZCBSZW5kZXJFbGVtZW50OjpwYWludEZvY3VzUmluZyhQYWludEluZm8mIHBhaW50SW5m bywgY29uc3QgUmVuZGVyU3R5bGUmIHN0eWwKICAgICAgICAgcmVjdC5pbmZsYXRlKG91dGxpbmVP ZmZzZXQpOwogICAgICAgICBwaXhlbFNuYXBwZWRGb2N1c1JpbmdSZWN0cy5hcHBlbmQoc25hcFJl Y3RUb0RldmljZVBpeGVscyhyZWN0LCBkZXZpY2VTY2FsZUZhY3RvcikpOwogICAgIH0KLSAgICAv LyBGSVhNRTogVGhlIGZvbGxvd2luZyBjb2RlIHNob3VsZCBvbmx5IGJlIGNvbXBpbGVkIGZvciBN YWMuIFNlZSA8aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MzU5MT4u Ci0jaWYgRU5BQkxFKEZVTExfS0VZQk9BUkRfQUNDRVNTKQorICAgIENvbG9yIGZvY3VzUmluZ0Nv bG9yID0gdXNlUGxhdGZvcm1Gb2N1c1JpbmdDb2xvckZvck91dGxpbmVTdHlsZUF1dG8oKSA/IFJl bmRlclRoZW1lOjpzaW5nbGV0b24oKS5mb2N1c1JpbmdDb2xvcihzdHlsZUNvbG9yT3B0aW9ucygp KSA6IHN0eWxlLnZpc2l0ZWREZXBlbmRlbnRDb2xvcldpdGhDb2xvckZpbHRlcihDU1NQcm9wZXJ0 eU91dGxpbmVDb2xvcik7CiAgICAgYm9vbCBuZWVkc1JlcGFpbnQ7Ci0gICAgaWYgKHN0eWxlLmhh c0JvcmRlclJhZGl1cygpKSB7CisgICAgaWYgKHVzZVNocmlua1dyYXBwZWRGb2N1c1JpbmdGb3JP dXRsaW5lU3R5bGVBdXRvKCkgJiYgc3R5bGUuaGFzQm9yZGVyUmFkaXVzKCkpIHsKICAgICAgICAg UGF0aCBwYXRoID0gUGF0aFV0aWxpdGllczo6cGF0aFdpdGhTaHJpbmtXcmFwcGVkUmVjdHNGb3JP dXRsaW5lKHBpeGVsU25hcHBlZEZvY3VzUmluZ1JlY3RzLCBzdHlsZS5ib3JkZXIoKSwgb3V0bGlu ZU9mZnNldCwgc3R5bGUuZGlyZWN0aW9uKCksIHN0eWxlLndyaXRpbmdNb2RlKCksCiAgICAgICAg ICAgICBkb2N1bWVudCgpLmRldmljZVNjYWxlRmFjdG9yKCkpOwogICAgICAgICBpZiAocGF0aC5p c0VtcHR5KCkpIHsKICAgICAgICAgICAgIGZvciAoYXV0byByZWN0IDogcGl4ZWxTbmFwcGVkRm9j dXNSaW5nUmVjdHMpCiAgICAgICAgICAgICAgICAgcGF0aC5hZGRSZWN0KHJlY3QpOwogICAgICAg ICB9Ci0gICAgICAgIHBhaW50SW5mby5jb250ZXh0KCkuZHJhd0ZvY3VzUmluZyhwYXRoLCBwYWdl KCkuZm9jdXNDb250cm9sbGVyKCkudGltZVNpbmNlRm9jdXNXYXNTZXQoKS5zZWNvbmRzKCksIG5l ZWRzUmVwYWludCwgUmVuZGVyVGhlbWU6OnNpbmdsZXRvbigpLmZvY3VzUmluZ0NvbG9yKHN0eWxl Q29sb3JPcHRpb25zKCkpKTsKKyAgICAgICAgbmVlZHNSZXBhaW50ID0gZHJhd0ZvY3VzUmluZyhw YWludEluZm8uY29udGV4dCgpLCBwYWdlKCksIHBhdGgsIHN0eWxlLCBmb2N1c1JpbmdDb2xvcik7 CiAgICAgfSBlbHNlCi0gICAgICAgIHBhaW50SW5mby5jb250ZXh0KCkuZHJhd0ZvY3VzUmluZyhw aXhlbFNuYXBwZWRGb2N1c1JpbmdSZWN0cywgcGFnZSgpLmZvY3VzQ29udHJvbGxlcigpLnRpbWVT aW5jZUZvY3VzV2FzU2V0KCkuc2Vjb25kcygpLCBuZWVkc1JlcGFpbnQsIFJlbmRlclRoZW1lOjpz aW5nbGV0b24oKS5mb2N1c1JpbmdDb2xvcihzdHlsZUNvbG9yT3B0aW9ucygpKSk7CisgICAgICAg IG5lZWRzUmVwYWludCA9IGRyYXdGb2N1c1JpbmcocGFpbnRJbmZvLmNvbnRleHQoKSwgcGFnZSgp LCBwaXhlbFNuYXBwZWRGb2N1c1JpbmdSZWN0cywgc3R5bGUsIGZvY3VzUmluZ0NvbG9yKTsKICAg ICBpZiAobmVlZHNSZXBhaW50KQogICAgICAgICBwYWdlKCkuZm9jdXNDb250cm9sbGVyKCkuc2V0 Rm9jdXNlZEVsZW1lbnROZWVkc1JlcGFpbnQoKTsKLSNlbHNlCi0gICAgcGFpbnRJbmZvLmNvbnRl eHQoKS5kcmF3Rm9jdXNSaW5nKHBpeGVsU25hcHBlZEZvY3VzUmluZ1JlY3RzLCBzdHlsZS5vdXRs aW5lV2lkdGgoKSwgc3R5bGUub3V0bGluZU9mZnNldCgpLCBzdHlsZS52aXNpdGVkRGVwZW5kZW50 Q29sb3JXaXRoQ29sb3JGaWx0ZXIoQ1NTUHJvcGVydHlPdXRsaW5lQ29sb3IpKTsKLSNlbmRpZgog fQogCiB2b2lkIFJlbmRlckVsZW1lbnQ6OnBhaW50T3V0bGluZShQYWludEluZm8mIHBhaW50SW5m bywgY29uc3QgTGF5b3V0UmVjdCYgcGFpbnRSZWN0KQo=