217418 2020-10-06 19:26:59 -0700 [LFC][IFC] Add initial support for inline content to clear intrusive floats 2020-10-07 07:39:15 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1695436 0 zalan 2020-10-06 19:26:59 -0700 ssia 1695448 1 410729 zalan 2020-10-06 20:31:55 -0700 Created attachment 410729 Patch 1695532 2 ews-feeder 2020-10-07 07:38:56 -0700 Committed r268122: <https://trac.webkit.org/changeset/268122> All reviewed patches have been landed. Closing bug and clearing flags on attachment 410729. 1695533 3 webkit-bug-importer 2020-10-07 07:39:15 -0700 <rdar://problem/70047063> 410729 2020-10-06 20:31:55 -0700 2020-10-07 07:38:57 -0700 Patch bug-217418-20201006203154.patch text/plain 21408 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3OTczCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTU2ZTZjMTA0OTc4YmM5 OGM0MDc0ZjY4MDY4YmIwZjY4ZGY1NTcyZi4uNzdhZjFhODRmZTFjOGQxMDdmYTRjYTJlZDJjMWEy ZjA1M2M5N2JhZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDIwLTEwLTA2ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBBZGQgaW5p dGlhbCBzdXBwb3J0IGZvciBpbmxpbmUgY29udGVudCB0byBjbGVhciBpbnRydXNpdmUgZmxvYXRz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTc0MTgK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbiB0aGlz IHBhdGNoIHdlIGludHJvZHVjZSB0aGUgY29uY2VwdCBvZiBnYXBzIGJldHdlZW4gbGluZXMuIFRo ZXNlIGdhcHMgYXJlIHJlcXVpcmVkCisgICAgICAgIHRvIGNsZWFyIGludHJ1c2l2ZSBmbG9hdHMg d2hlbiB0aGUgaW5saW5lIGNvbnRlbnQgaGFzIHRoZSBjbGVhciBwcm9wZXJ0eSBzZXQuCisgICAg ICAgIChUaGlzIGJlaGF2aW9yIGNoYW5nZWQgaW4gQ1NTMi4gTm93IHRoZSBjbGVhciBwcm9wZXJ0 eSBvbmx5IGFwcGxpZXMgdG8gYmxvY2stbGV2ZWwgZWxlbWVudHMuKQorCisgICAgICAgIEFkanVz dCB0aGUgbG9naWMgaW4gRmxvYXRpbmdDb250ZXh0Ojp2ZXJ0aWNhbFBvc2l0aW9uV2l0aENsZWFy YW5jZSBzbyB0aGF0IGl0IGNhbiB0YWtlIGFuIGlubGluZSBsZXZlbCBib3gKKyAgICAgICAgYW5k IG1ha2Ugc3VyZSB0aGF0IHRoZSBuZXh0IGxpbmUgZG9lcyBub3Qgc3RhcnQgYWJvdmUgdGhlIGNs ZWFyYW5jZSBwb3NpdGlvbi4KKworICAgICAgICBUZXN0OiBmYXN0L2xheW91dGZvcm1hdHRpbmdj b250ZXh0L2Zsb2F0LWF2b2lkaW5nLWJyLXNpbXBsZS5odG1sCisKKyAgICAgICAgKiBsYXlvdXQv Rm9ybWF0dGluZ0NvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpGb3JtYXR0 aW5nQ29udGV4dDo6Z2VvbWV0cnlGb3JCb3ggY29uc3QpOgorICAgICAgICAqIGxheW91dC9Gb3Jt YXR0aW5nQ29udGV4dC5oOgorICAgICAgICAqIGxheW91dC9mbG9hdHMvRmxvYXRpbmdDb250ZXh0 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6RmxvYXRpbmdDb250ZXh0OjphYnNvbHV0 ZUNvb3JkaW5hdGVzIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6RmxvYXRpbmdD b250ZXh0OjptYXBUb3BMZWZ0VG9GbG9hdGluZ1N0YXRlUm9vdCBjb25zdCk6CisgICAgICAgIChX ZWJDb3JlOjpMYXlvdXQ6OkZsb2F0aW5nQ29udGV4dDo6bWFwUG9pbnRGcm9tRm9ybWF0dGluZ0Nv bnRleHRSb290VG9GbG9hdGluZ1N0YXRlUm9vdCBjb25zdCk6CisgICAgICAgICogbGF5b3V0L2lu bGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6bGluZUxheW91dCk6CisgICAg ICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuaDoK KyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4 dEdlb21ldHJ5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRm9ybWF0dGlu Z0NvbnRleHQ6Okdlb21ldHJ5Ojpsb2dpY2FsVG9wRm9yTmV4dExpbmUgY29uc3QpOgorCiAyMDIw LTEwLTA2ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11b RmxvYXRpbmddIE1vdmUgRmxvYXRpbmdTdGF0ZTo6dG9wL2JvdHRvbSBmdW5jdGlvbnMgb3ZlciB0 byBGbG9hdGluZ0NvbnRleHQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3Jt YXR0aW5nQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRl eHQuY3BwCmluZGV4IDJlNTg4YzczYTJhMjdiNWM0NmM1OTZhMzBlY2FiODJhN2FjYmQyMWEuLmQ5 N2MwOGRiMTEzMDk0N2VkYmI1MDZmYzBhNmRiZmVjMGZhN2NkNzkgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0LmNwcApAQCAtMjEwLDcgKzIxMCw3IEBAIGNvbnN0 IEJveEdlb21ldHJ5JiBGb3JtYXR0aW5nQ29udGV4dDo6Z2VvbWV0cnlGb3JCb3goY29uc3QgQm94 JiBsYXlvdXRCb3gsIE9wdGlvCiAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgICAgfQog Ci0gICAgICAgIGlmICgqZXNjYXBlUmVhc29uID09IEVzY2FwZVJlYXNvbjo6RmxvYXRCb3hOZWVk c1RvQmVJbkFic29sdXRlQ29vcmRpbmF0ZXMpIHsKKyAgICAgICAgaWYgKCplc2NhcGVSZWFzb24g PT0gRXNjYXBlUmVhc29uOjpGbG9hdEJveElzQWx3YXlzUmVsYXRpdmVUb0Zsb2F0U3RhdGVSb290 KSB7CiAgICAgICAgICAgICAvLyBGbG9hdCBib3ggdG9wL2xlZnQgdmFsdWVzIGFyZSBtYXBwZWQg cmVsYXRpdmUgdG8gdGhlIEZsb2F0U3RhdGUncyByb290LiBJbmxpbmUgZm9ybWF0dGluZyBjb250 ZXh0cyhBKSBpbmhlcml0IGZsb2F0cyBmcm9tIHBhcmVudAogICAgICAgICAgICAgLy8gYmxvY2sg Zm9ybWF0dGluZyBjb250ZXh0cyhCKS4gRmxvYXRzIGluIHRoZXNlIGlubGluZSBmb3JtYXR0aW5n IGNvbnRleHRzKEEpIG5lZWQgdG8gYmUgbWFwcGVkIHRvIHRoZSBwYXJlbnQsIGJsb2NrIGZvcm1h dHRpbmcgY29udGV4dChCKS4KICAgICAgICAgICAgIGF1dG8mIGZvcm1hdHRpbmdDb250ZXh0Um9v dCA9IGxheW91dEJveC5mb3JtYXR0aW5nQ29udGV4dFJvb3QoKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dC5oIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L0Zvcm1hdHRpbmdDb250ZXh0LmgKaW5kZXggYmM4ZTg0MjExYjBmNmViOTVkODQ5YTA2YTgx MTFkNTIwMmQxOTI4Zi4uOGUxNWZkYzkyMWIwMmY1M2VlNThiOThjOTc3NWNiNzM1OGU2NGVlYyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0LmgKKysr IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0LmgKQEAgLTk3LDcgKzk3 LDcgQEAgcHVibGljOgogICAgIGVudW0gY2xhc3MgRXNjYXBlUmVhc29uIHsKICAgICAgICAgTmVl ZHNHZW9tZXRyeUZyb21Fc3RhYmxpc2hlZEZvcm1hdHRpbmdDb250ZXh0LAogICAgICAgICBPdXRP ZkZsb3dCb3hOZWVkc0luRmxvd0dlb21ldHJ5LAotICAgICAgICBGbG9hdEJveE5lZWRzVG9CZUlu QWJzb2x1dGVDb29yZGluYXRlcywKKyAgICAgICAgRmxvYXRCb3hJc0Fsd2F5c1JlbGF0aXZlVG9G bG9hdFN0YXRlUm9vdCwKICAgICAgICAgRmluZEZpeGVkSGVpZ2h0QW5jZXN0b3JRdWlyaywKICAg ICAgICAgRG9jdW1lbnRCb3hTdHJldGNoZXNUb1ZpZXdwb3J0UXVpcmssCiAgICAgICAgIEJvZHlT dHJldGNoZXNUb1ZpZXdwb3J0UXVpcmssCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmNwcApp bmRleCA1MTExNDQ2MGRjNjYyZDIzMzU5ODFjZGE5ZDUzMzY2OTFiY2RmZTcyLi41NWE4M2JmZTI2 Y2FlZmFlMTMwODdlOGZhMWM1ZjE2MzU3MjI1ODM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29u dGV4dC5jcHAKQEAgLTMwNCwxNSArMzA0LDEzIEBAIHZvaWQgQmxvY2tGb3JtYXR0aW5nQ29udGV4 dDo6Y29tcHV0ZVZlcnRpY2FsUG9zaXRpb25Gb3JGbG9hdENsZWFyKGNvbnN0IEZsb2F0aW5nCiAg ICAgaWYgKGZsb2F0aW5nQ29udGV4dC5pc0VtcHR5KCkpCiAgICAgICAgIHJldHVybjsKICAgICBh dXRvIHZlcnRpY2FsUG9zaXRpb25BbmRDbGVhcmFuY2UgPSBmbG9hdGluZ0NvbnRleHQudmVydGlj YWxQb3NpdGlvbldpdGhDbGVhcmFuY2UobGF5b3V0Qm94KTsKLSAgICBpZiAoIXZlcnRpY2FsUG9z aXRpb25BbmRDbGVhcmFuY2UucG9zaXRpb24pIHsKLSAgICAgICAgQVNTRVJUKCF2ZXJ0aWNhbFBv c2l0aW9uQW5kQ2xlYXJhbmNlLmNsZWFyYW5jZSk7CisgICAgaWYgKCF2ZXJ0aWNhbFBvc2l0aW9u QW5kQ2xlYXJhbmNlKQogICAgICAgICByZXR1cm47Ci0gICAgfQogCiAgICAgYXV0byYgYm94R2Vv bWV0cnkgPSBmb3JtYXR0aW5nU3RhdGUoKS5ib3hHZW9tZXRyeShsYXlvdXRCb3gpOwotICAgIEFT U0VSVCgqdmVydGljYWxQb3NpdGlvbkFuZENsZWFyYW5jZS5wb3NpdGlvbiA+PSBib3hHZW9tZXRy eS5sb2dpY2FsVG9wKCkpOwotICAgIGJveEdlb21ldHJ5LnNldExvZ2ljYWxUb3AoKnZlcnRpY2Fs UG9zaXRpb25BbmRDbGVhcmFuY2UucG9zaXRpb24pOwotICAgIGlmICh2ZXJ0aWNhbFBvc2l0aW9u QW5kQ2xlYXJhbmNlLmNsZWFyYW5jZSkKKyAgICBBU1NFUlQodmVydGljYWxQb3NpdGlvbkFuZENs ZWFyYW5jZS0+cG9zaXRpb24gPj0gYm94R2VvbWV0cnkubG9naWNhbFRvcCgpKTsKKyAgICBib3hH ZW9tZXRyeS5zZXRMb2dpY2FsVG9wKHZlcnRpY2FsUG9zaXRpb25BbmRDbGVhcmFuY2UtPnBvc2l0 aW9uKTsKKyAgICBpZiAodmVydGljYWxQb3NpdGlvbkFuZENsZWFyYW5jZS0+Y2xlYXJhbmNlKQog ICAgICAgICBmb3JtYXR0aW5nU3RhdGUoKS5zZXRIYXNDbGVhcmFuY2UobGF5b3V0Qm94KTsKICAg ICAvLyBGSVhNRTogUmVzZXQgdGhlIG1hcmdpbiB2YWx1ZXMgb24gdGhlIGFuY2VzdG9ycy9wcmV2 aW91cyBzaWJsaW5ncyBub3cgdGhhdCB0aGUgZmxvYXQgYXZvaWRlciB3aXRoIGNsZWFyYW5jZSBk b2VzIG5vdCBtYXJnaW4gY29sbGFwc2UgYW55bW9yZS4KIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9mbG9hdHMvRmxvYXRpbmdDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9mbG9hdHMvRmxvYXRpbmdDb250ZXh0LmNwcAppbmRleCBiZmM1Yjc3Yzc0NDFlYjg5 OTljMzY3ZGU4MGYxOGE1ZDZjMWYwMzBmLi5lMTI0OThkMjc4M2RmNDAyYzIzMzkxM2YxZmQ2YTdm YjEzYTliZGNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZmxvYXRzL0Zsb2F0 aW5nQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zsb2F0cy9GbG9hdGlu Z0NvbnRleHQuY3BwCkBAIC0yOTcsNTYgKzI5Nyw1NSBAQCBMYXlvdXRQb2ludCBGbG9hdGluZ0Nv bnRleHQ6OnBvc2l0aW9uRm9yTm9uRmxvYXRpbmdGbG9hdEF2b2lkZXIoY29uc3QgQm94JiBsYXlv dQogICAgIHJldHVybiB7IGZsb2F0QXZvaWRlci5sZWZ0KCkgLSBjb250YWluaW5nQmxvY2tUb3BM ZWZ0LngoKSwgZmxvYXRBdm9pZGVyLnRvcCgpIC0gY29udGFpbmluZ0Jsb2NrVG9wTGVmdC55KCkg fTsKIH0KIAotRmxvYXRpbmdDb250ZXh0OjpDbGVhcmFuY2VQb3NpdGlvbiBGbG9hdGluZ0NvbnRl eHQ6OnZlcnRpY2FsUG9zaXRpb25XaXRoQ2xlYXJhbmNlKGNvbnN0IEJveCYgbGF5b3V0Qm94KSBj b25zdAorT3B0aW9uYWw8RmxvYXRpbmdDb250ZXh0OjpQb3NpdGlvbldpdGhDbGVhcmFuY2U+IEZs b2F0aW5nQ29udGV4dDo6dmVydGljYWxQb3NpdGlvbldpdGhDbGVhcmFuY2UoY29uc3QgQm94JiBs YXlvdXRCb3gpIGNvbnN0CiB7CiAgICAgQVNTRVJUKGxheW91dEJveC5oYXNGbG9hdENsZWFyKCkp OwotICAgIEFTU0VSVChsYXlvdXRCb3guaXNCbG9ja0xldmVsQm94KCkpOwogICAgIEFTU0VSVChh cmVGbG9hdHNIb3Jpem9udGFsbHlTb3J0ZWQobV9mbG9hdGluZ1N0YXRlKSk7CiAKICAgICBpZiAo aXNFbXB0eSgpKQogICAgICAgICByZXR1cm4geyB9OwogCi0gICAgYXV0byBib3R0b20gPSBbJl0o T3B0aW9uYWw8TGF5b3V0VW5pdD4gZmxvYXRCb3R0b20pIC0+IENsZWFyYW5jZVBvc2l0aW9uIHsK LSAgICAgICAgLy8gJ2JvdHRvbScgaXMgaW4gdGhlIGZvcm1hdHRpbmcgcm9vdCdzIGNvb3JkaW5h dGUgc3lzdGVtLgorICAgIGF1dG8gYm90dG9tID0gWyZdKGF1dG8gZmxvYXRCb3R0b20pIC0+IE9w dGlvbmFsPFBvc2l0aW9uV2l0aENsZWFyYW5jZT4gewogICAgICAgICBpZiAoIWZsb2F0Qm90dG9t KQogICAgICAgICAgICAgcmV0dXJuIHsgfTsKLQogICAgICAgICAvLyA5LjUuMiBDb250cm9sbGlu ZyBmbG93IG5leHQgdG8gZmxvYXRzOiB0aGUgJ2NsZWFyJyBwcm9wZXJ0eQogICAgICAgICAvLyBU aGVuIHRoZSBhbW91bnQgb2YgY2xlYXJhbmNlIGlzIHNldCB0byB0aGUgZ3JlYXRlciBvZjoKICAg ICAgICAgLy8KICAgICAgICAgLy8gMS4gVGhlIGFtb3VudCBuZWNlc3NhcnkgdG8gcGxhY2UgdGhl IGJvcmRlciBlZGdlIG9mIHRoZSBibG9jayBldmVuIHdpdGggdGhlIGJvdHRvbSBvdXRlciBlZGdl IG9mIHRoZSBsb3dlc3QgZmxvYXQgdGhhdCBpcyB0byBiZSBjbGVhcmVkLgogICAgICAgICAvLyAy LiBUaGUgYW1vdW50IG5lY2Vzc2FyeSB0byBwbGFjZSB0aGUgdG9wIGJvcmRlciBlZGdlIG9mIHRo ZSBibG9jayBhdCBpdHMgaHlwb3RoZXRpY2FsIHBvc2l0aW9uLgotICAgICAgICBhdXRvIHJvb3RS ZWxhdGl2ZVRvcCA9IG1hcFRvcExlZnRUb0Zsb2F0aW5nU3RhdGVSb290KGxheW91dEJveCkueSgp OwotICAgICAgICBhdXRvIGNsZWFyYW5jZSA9ICpmbG9hdEJvdHRvbSAtIHJvb3RSZWxhdGl2ZVRv cDsKKyAgICAgICAgYXV0byBsb2dpY2FsVG9wUmVsYXRpdmVUb0Zsb2F0aW5nU3RhdGVSb290ID0g bWFwVG9wTGVmdFRvRmxvYXRpbmdTdGF0ZVJvb3QobGF5b3V0Qm94KS55KCk7CisgICAgICAgIGF1 dG8gY2xlYXJhbmNlID0gKmZsb2F0Qm90dG9tIC0gbG9naWNhbFRvcFJlbGF0aXZlVG9GbG9hdGlu Z1N0YXRlUm9vdDsKICAgICAgICAgaWYgKGNsZWFyYW5jZSA8PSAwKQogICAgICAgICAgICAgcmV0 dXJuIHsgfTsKIAotICAgICAgICAvLyBDbGVhcmFuY2UgaW5oaWJpdHMgbWFyZ2luIGNvbGxhcHNp bmcuCi0gICAgICAgIGlmIChhdXRvKiBwcmV2aW91c0luRmxvd1NpYmxpbmcgPSBsYXlvdXRCb3gu cHJldmlvdXNJbkZsb3dTaWJsaW5nKCkpIHsKLSAgICAgICAgICAgIC8vIERvZXMgdGhpcyBib3gg d2l0aCBjbGVhcmFuY2UgYWN0dWFsbHkgY29sbGFwc2UgaXRzIG1hcmdpbiBiZWZvcmUgd2l0aCB0 aGUgcHJldmlvdXMgaW5mbG93IGJveCdzIG1hcmdpbiBhZnRlcj8KLSAgICAgICAgICAgIGF1dG8m IGZvcm1hdHRpbmdTdGF0ZSA9IGRvd25jYXN0PEJsb2NrRm9ybWF0dGluZ1N0YXRlPihsYXlvdXRT dGF0ZSgpLmZvcm1hdHRpbmdTdGF0ZUZvckJveChsYXlvdXRCb3gpKTsKLSAgICAgICAgICAgIGF1 dG8gdmVydGljYWxNYXJnaW4gPSBmb3JtYXR0aW5nU3RhdGUudXNlZFZlcnRpY2FsTWFyZ2luKGxh eW91dEJveCk7Ci0gICAgICAgICAgICBpZiAodmVydGljYWxNYXJnaW4uY29sbGFwc2VkVmFsdWVz LmJlZm9yZSkgewotICAgICAgICAgICAgICAgIGF1dG8gcHJldmlvdXNWZXJ0aWNhbE1hcmdpbkFm dGVyID0gZm9ybWF0dGluZ0NvbnRleHQoKS5nZW9tZXRyeUZvckJveCgqcHJldmlvdXNJbkZsb3dT aWJsaW5nKS5tYXJnaW5BZnRlcigpOwotICAgICAgICAgICAgICAgIGF1dG8gY29sbGFwc2VkTWFy Z2luID0gKnZlcnRpY2FsTWFyZ2luLmNvbGxhcHNlZFZhbHVlcy5iZWZvcmU7Ci0gICAgICAgICAg ICAgICAgYXV0byBub25Db2xsYXBzZWRNYXJnaW4gPSBwcmV2aW91c1ZlcnRpY2FsTWFyZ2luQWZ0 ZXIgKyBtYXJnaW5CZWZvcmUodmVydGljYWxNYXJnaW4pOwotICAgICAgICAgICAgICAgIGF1dG8g bWFyZ2luRGlmZmVyZW5jZSA9IG5vbkNvbGxhcHNlZE1hcmdpbiAtIGNvbGxhcHNlZE1hcmdpbjsK LSAgICAgICAgICAgICAgICAvLyBNb3ZlIHRoZSBib3ggdG8gdGhlIHBvc2l0aW9uIHdoZXJlIGl0 IHdvdWxkIGJlIHdpdGggbm9uLWNvbGxhcHNlZCBtYXJnaW5zLgotICAgICAgICAgICAgICAgIHJv b3RSZWxhdGl2ZVRvcCArPSBtYXJnaW5EaWZmZXJlbmNlOwotICAgICAgICAgICAgICAgIC8vIEhh dmluZyBuZWdhdGl2ZSBjbGVhcmFuY2UgaXMgYWxzbyBub3JtYWwuIEl0IGp1c3QgbWVhbnMgdGhh dCB0aGUgYm94IHdpdGggdGhlIG5vbi1jb2xsYXBzZWQgbWFyZ2lucyBpcyBub3cgbG93ZXIgdGhh biBpdCBuZWVkcyB0byBiZS4KLSAgICAgICAgICAgICAgICBjbGVhcmFuY2UgLT0gbWFyZ2luRGlm ZmVyZW5jZTsKKyAgICAgICAgaWYgKGxheW91dEJveC5pc0Jsb2NrTGV2ZWxCb3goKSkgeworICAg ICAgICAgICAgLy8gQ2xlYXJhbmNlIGluaGliaXRzIG1hcmdpbiBjb2xsYXBzaW5nIGluIGJsb2Nr IGZvcm1hdHRpbmcgY29udGV4dC4KKyAgICAgICAgICAgIGlmIChhdXRvKiBwcmV2aW91c0luRmxv d1NpYmxpbmcgPSBsYXlvdXRCb3gucHJldmlvdXNJbkZsb3dTaWJsaW5nKCkpIHsKKyAgICAgICAg ICAgICAgICAvLyBEb2VzIHRoaXMgYm94IHdpdGggY2xlYXJhbmNlIGFjdHVhbGx5IGNvbGxhcHNl IGl0cyBtYXJnaW4gYmVmb3JlIHdpdGggdGhlIHByZXZpb3VzIGluZmxvdyBib3gncyBtYXJnaW4g YWZ0ZXI/CisgICAgICAgICAgICAgICAgYXV0byYgZm9ybWF0dGluZ1N0YXRlID0gZG93bmNhc3Q8 QmxvY2tGb3JtYXR0aW5nU3RhdGU+KGxheW91dFN0YXRlKCkuZm9ybWF0dGluZ1N0YXRlRm9yQm94 KGxheW91dEJveCkpOworICAgICAgICAgICAgICAgIGF1dG8gdmVydGljYWxNYXJnaW4gPSBmb3Jt YXR0aW5nU3RhdGUudXNlZFZlcnRpY2FsTWFyZ2luKGxheW91dEJveCk7CisgICAgICAgICAgICAg ICAgaWYgKHZlcnRpY2FsTWFyZ2luLmNvbGxhcHNlZFZhbHVlcy5iZWZvcmUpIHsKKyAgICAgICAg ICAgICAgICAgICAgYXV0byBwcmV2aW91c1ZlcnRpY2FsTWFyZ2luQWZ0ZXIgPSBmb3JtYXR0aW5n Q29udGV4dCgpLmdlb21ldHJ5Rm9yQm94KCpwcmV2aW91c0luRmxvd1NpYmxpbmcpLm1hcmdpbkFm dGVyKCk7CisgICAgICAgICAgICAgICAgICAgIGF1dG8gY29sbGFwc2VkTWFyZ2luID0gKnZlcnRp Y2FsTWFyZ2luLmNvbGxhcHNlZFZhbHVlcy5iZWZvcmU7CisgICAgICAgICAgICAgICAgICAgIGF1 dG8gbm9uQ29sbGFwc2VkTWFyZ2luID0gcHJldmlvdXNWZXJ0aWNhbE1hcmdpbkFmdGVyICsgbWFy Z2luQmVmb3JlKHZlcnRpY2FsTWFyZ2luKTsKKyAgICAgICAgICAgICAgICAgICAgYXV0byBtYXJn aW5EaWZmZXJlbmNlID0gbm9uQ29sbGFwc2VkTWFyZ2luIC0gY29sbGFwc2VkTWFyZ2luOworICAg ICAgICAgICAgICAgICAgICAvLyBNb3ZlIHRoZSBib3ggdG8gdGhlIHBvc2l0aW9uIHdoZXJlIGl0 IHdvdWxkIGJlIHdpdGggbm9uLWNvbGxhcHNlZCBtYXJnaW5zLgorICAgICAgICAgICAgICAgICAg ICBsb2dpY2FsVG9wUmVsYXRpdmVUb0Zsb2F0aW5nU3RhdGVSb290ICs9IG1hcmdpbkRpZmZlcmVu Y2U7CisgICAgICAgICAgICAgICAgICAgIC8vIEhhdmluZyBuZWdhdGl2ZSBjbGVhcmFuY2UgaXMg YWxzbyBub3JtYWwuIEl0IGp1c3QgbWVhbnMgdGhhdCB0aGUgYm94IHdpdGggdGhlIG5vbi1jb2xs YXBzZWQgbWFyZ2lucyBpcyBub3cgbG93ZXIgdGhhbiBpdCBuZWVkcyB0byBiZS4KKyAgICAgICAg ICAgICAgICAgICAgY2xlYXJhbmNlIC09IG1hcmdpbkRpZmZlcmVuY2U7CisgICAgICAgICAgICAg ICAgfQogICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgICAgIC8vIE5vdyBhZGp1c3QgdGhl IGJveCdzIHBvc2l0aW9uIHdpdGggdGhlIGNsZWFyYW5jZS4KLSAgICAgICAgcm9vdFJlbGF0aXZl VG9wICs9IGNsZWFyYW5jZTsKLSAgICAgICAgQVNTRVJUKCpmbG9hdEJvdHRvbSA9PSByb290UmVs YXRpdmVUb3ApOworICAgICAgICBsb2dpY2FsVG9wUmVsYXRpdmVUb0Zsb2F0aW5nU3RhdGVSb290 ICs9IGNsZWFyYW5jZTsKKyAgICAgICAgQVNTRVJUKCpmbG9hdEJvdHRvbSA9PSBsb2dpY2FsVG9w UmVsYXRpdmVUb0Zsb2F0aW5nU3RhdGVSb290KTsKIAotICAgICAgICAvLyBUaGUgcmV0dXJuIHZl cnRpY2FsIHBvc2l0aW9uIGlzIGluIHRoZSBjb250YWluaW5nIGJsb2NrJ3MgY29vcmRpbmF0ZSBz eXN0ZW0uIENvbnZlcnQgaXQgdG8gdGhlIGZvcm1hdHRpbmcgcm9vdCdzIGNvb3JkaW5hdGUgc3lz dGVtIGlmIG5lZWRlZC4KKyAgICAgICAgLy8gVGhlIHJldHVybiB2ZXJ0aWNhbCBwb3NpdGlvbiBu ZWVkcyB0byBiZSBpbiB0aGUgY29udGFpbmluZyBibG9jaydzIGNvb3JkaW5hdGUgc3lzdGVtLgog ICAgICAgICBpZiAoJmxheW91dEJveC5jb250YWluaW5nQmxvY2soKSA9PSAmbV9mbG9hdGluZ1N0 YXRlLnJvb3QoKSkKLSAgICAgICAgICAgIHJldHVybiB7IFBvc2l0aW9uIHsgcm9vdFJlbGF0aXZl VG9wIH0sIGNsZWFyYW5jZSB9OworICAgICAgICAgICAgcmV0dXJuIFBvc2l0aW9uV2l0aENsZWFy YW5jZSB7IGxvZ2ljYWxUb3BSZWxhdGl2ZVRvRmxvYXRpbmdTdGF0ZVJvb3QsIGNsZWFyYW5jZSB9 OwogCiAgICAgICAgIGF1dG8gY29udGFpbmluZ0Jsb2NrUm9vdFJlbGF0aXZlVG9wID0gbWFwVG9w TGVmdFRvRmxvYXRpbmdTdGF0ZVJvb3QobGF5b3V0Qm94LmNvbnRhaW5pbmdCbG9jaygpKS55KCk7 Ci0gICAgICAgIHJldHVybiB7IFBvc2l0aW9uIHsgcm9vdFJlbGF0aXZlVG9wIC0gY29udGFpbmlu Z0Jsb2NrUm9vdFJlbGF0aXZlVG9wIH0sIGNsZWFyYW5jZSB9OworICAgICAgICByZXR1cm4gUG9z aXRpb25XaXRoQ2xlYXJhbmNlIHsgbG9naWNhbFRvcFJlbGF0aXZlVG9GbG9hdGluZ1N0YXRlUm9v dCAtIGNvbnRhaW5pbmdCbG9ja1Jvb3RSZWxhdGl2ZVRvcCwgY2xlYXJhbmNlIH07CiAgICAgfTsK IAogICAgIGF1dG8gY2xlYXIgPSBsYXlvdXRCb3guc3R5bGUoKS5jbGVhcigpOwpAQCAtNDk4LDcg KzQ5Nyw3IEBAIHZvaWQgRmxvYXRpbmdDb250ZXh0OjpmaW5kUG9zaXRpb25Gb3JGb3JtYXR0aW5n Q29udGV4dFJvb3QoRmxvYXRBdm9pZGVyJiBmbG9hdEF2CiBGbG9hdGluZ0NvbnRleHQ6OkFic29s dXRlQ29vcmRpbmF0ZVZhbHVlc0ZvckZsb2F0QXZvaWRlciBGbG9hdGluZ0NvbnRleHQ6OmFic29s dXRlQ29vcmRpbmF0ZXMoY29uc3QgQm94JiBmbG9hdEF2b2lkZXIpIGNvbnN0CiB7CiAgICAgYXV0 byYgY29udGFpbmluZ0Jsb2NrID0gZmxvYXRBdm9pZGVyLmNvbnRhaW5pbmdCbG9jaygpOwotICAg IGF1dG8mIGNvbnRhaW5pbmdCbG9ja0dlb21ldHJ5ID0gZm9ybWF0dGluZ0NvbnRleHQoKS5nZW9t ZXRyeUZvckJveChjb250YWluaW5nQmxvY2ssIEZvcm1hdHRpbmdDb250ZXh0OjpFc2NhcGVSZWFz b246OkZsb2F0Qm94TmVlZHNUb0JlSW5BYnNvbHV0ZUNvb3JkaW5hdGVzKTsKKyAgICBhdXRvJiBj b250YWluaW5nQmxvY2tHZW9tZXRyeSA9IGZvcm1hdHRpbmdDb250ZXh0KCkuZ2VvbWV0cnlGb3JC b3goY29udGFpbmluZ0Jsb2NrLCBGb3JtYXR0aW5nQ29udGV4dDo6RXNjYXBlUmVhc29uOjpGbG9h dEJveElzQWx3YXlzUmVsYXRpdmVUb0Zsb2F0U3RhdGVSb290KTsKICAgICBhdXRvIGFic29sdXRl VG9wTGVmdCA9IG1hcFRvcExlZnRUb0Zsb2F0aW5nU3RhdGVSb290KGZsb2F0QXZvaWRlcik7CiAK ICAgICBpZiAoJmNvbnRhaW5pbmdCbG9jayA9PSAmZmxvYXRpbmdTdGF0ZSgpLnJvb3QoKSkKQEAg LTUxMSw5ICs1MTAsOSBAQCBGbG9hdGluZ0NvbnRleHQ6OkFic29sdXRlQ29vcmRpbmF0ZVZhbHVl c0ZvckZsb2F0QXZvaWRlciBGbG9hdGluZ0NvbnRleHQ6OmFic29sdQogTGF5b3V0UG9pbnQgRmxv YXRpbmdDb250ZXh0OjptYXBUb3BMZWZ0VG9GbG9hdGluZ1N0YXRlUm9vdChjb25zdCBCb3gmIGZs b2F0Qm94KSBjb25zdAogewogICAgIGF1dG8mIGZsb2F0aW5nU3RhdGVSb290ID0gZmxvYXRpbmdT dGF0ZSgpLnJvb3QoKTsKLSAgICBhdXRvIHRvcExlZnQgPSBmb3JtYXR0aW5nQ29udGV4dCgpLmdl b21ldHJ5Rm9yQm94KGZsb2F0Qm94LCBGb3JtYXR0aW5nQ29udGV4dDo6RXNjYXBlUmVhc29uOjpG bG9hdEJveE5lZWRzVG9CZUluQWJzb2x1dGVDb29yZGluYXRlcykubG9naWNhbFRvcExlZnQoKTsK KyAgICBhdXRvIHRvcExlZnQgPSBmb3JtYXR0aW5nQ29udGV4dCgpLmdlb21ldHJ5Rm9yQm94KGZs b2F0Qm94LCBGb3JtYXR0aW5nQ29udGV4dDo6RXNjYXBlUmVhc29uOjpGbG9hdEJveElzQWx3YXlz UmVsYXRpdmVUb0Zsb2F0U3RhdGVSb290KS5sb2dpY2FsVG9wTGVmdCgpOwogICAgIGZvciAoYXV0 byogY29udGFpbmluZ0Jsb2NrID0gJmZsb2F0Qm94LmNvbnRhaW5pbmdCbG9jaygpOyBjb250YWlu aW5nQmxvY2sgIT0gJmZsb2F0aW5nU3RhdGVSb290OyBjb250YWluaW5nQmxvY2sgPSAmY29udGFp bmluZ0Jsb2NrLT5jb250YWluaW5nQmxvY2soKSkKLSAgICAgICAgdG9wTGVmdC5tb3ZlQnkoZm9y bWF0dGluZ0NvbnRleHQoKS5nZW9tZXRyeUZvckJveCgqY29udGFpbmluZ0Jsb2NrLCBGb3JtYXR0 aW5nQ29udGV4dDo6RXNjYXBlUmVhc29uOjpGbG9hdEJveE5lZWRzVG9CZUluQWJzb2x1dGVDb29y ZGluYXRlcykubG9naWNhbFRvcExlZnQoKSk7CisgICAgICAgIHRvcExlZnQubW92ZUJ5KGZvcm1h dHRpbmdDb250ZXh0KCkuZ2VvbWV0cnlGb3JCb3goKmNvbnRhaW5pbmdCbG9jaywgRm9ybWF0dGlu Z0NvbnRleHQ6OkVzY2FwZVJlYXNvbjo6RmxvYXRCb3hJc0Fsd2F5c1JlbGF0aXZlVG9GbG9hdFN0 YXRlUm9vdCkubG9naWNhbFRvcExlZnQoKSk7CiAgICAgcmV0dXJuIHRvcExlZnQ7CiB9CiAKQEAg LTUyNSw3ICs1MjQsNyBAQCBQb2ludCBGbG9hdGluZ0NvbnRleHQ6Om1hcFBvaW50RnJvbUZvcm1h dHRpbmdDb250ZXh0Um9vdFRvRmxvYXRpbmdTdGF0ZVJvb3QoUG9pbgogICAgICAgICByZXR1cm4g cG9zaXRpb247CiAgICAgYXV0byBtYXBwZWRQb3NpdGlvbiA9IHBvc2l0aW9uOwogICAgIGZvciAo YXV0byogY29udGFpbmluZ0Jsb2NrID0gJmZyb207IGNvbnRhaW5pbmdCbG9jayAhPSAmdG87IGNv bnRhaW5pbmdCbG9jayA9ICZjb250YWluaW5nQmxvY2stPmNvbnRhaW5pbmdCbG9jaygpKQotICAg ICAgICBtYXBwZWRQb3NpdGlvbi5tb3ZlQnkoZm9ybWF0dGluZ0NvbnRleHQoKS5nZW9tZXRyeUZv ckJveCgqY29udGFpbmluZ0Jsb2NrLCBGb3JtYXR0aW5nQ29udGV4dDo6RXNjYXBlUmVhc29uOjpG bG9hdEJveE5lZWRzVG9CZUluQWJzb2x1dGVDb29yZGluYXRlcykubG9naWNhbFRvcExlZnQoKSk7 CisgICAgICAgIG1hcHBlZFBvc2l0aW9uLm1vdmVCeShmb3JtYXR0aW5nQ29udGV4dCgpLmdlb21l dHJ5Rm9yQm94KCpjb250YWluaW5nQmxvY2ssIEZvcm1hdHRpbmdDb250ZXh0OjpFc2NhcGVSZWFz b246OkZsb2F0Qm94SXNBbHdheXNSZWxhdGl2ZVRvRmxvYXRTdGF0ZVJvb3QpLmxvZ2ljYWxUb3BM ZWZ0KCkpOwogICAgIHJldHVybiBtYXBwZWRQb3NpdGlvbjsKIH0KIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2Zsb2F0cy9GbG9hdGluZ0NvbnRleHQuaCBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9mbG9hdHMvRmxvYXRpbmdDb250ZXh0LmgKaW5kZXggZWEzYTJhNjhlMGFiYTE3 ZTljN2ZiOWYyZjYxZGNkMWYzMTI2ODdkMS4uZjJjMzc1ZTViMGM4Mzg3MmU1MWM4MGRlYmRkZmQ4 ODYzNTI2MzUxNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zsb2F0cy9GbG9h dGluZ0NvbnRleHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZmxvYXRzL0Zsb2F0aW5n Q29udGV4dC5oCkBAIC01MSwxMSArNTEsMTEgQEAgcHVibGljOgogICAgIExheW91dFBvaW50IHBv c2l0aW9uRm9yRmxvYXQoY29uc3QgQm94JiwgY29uc3QgSG9yaXpvbnRhbENvbnN0cmFpbnRzJikg Y29uc3Q7CiAgICAgTGF5b3V0UG9pbnQgcG9zaXRpb25Gb3JOb25GbG9hdGluZ0Zsb2F0QXZvaWRl cihjb25zdCBCb3gmLCBjb25zdCBIb3Jpem9udGFsQ29uc3RyYWludHMmKSBjb25zdDsKIAotICAg IHN0cnVjdCBDbGVhcmFuY2VQb3NpdGlvbiB7Ci0gICAgICAgIE9wdGlvbmFsPFBvc2l0aW9uPiBw b3NpdGlvbjsKKyAgICBzdHJ1Y3QgUG9zaXRpb25XaXRoQ2xlYXJhbmNlIHsKKyAgICAgICAgTGF5 b3V0VW5pdCBwb3NpdGlvbjsKICAgICAgICAgT3B0aW9uYWw8TGF5b3V0VW5pdD4gY2xlYXJhbmNl OwogICAgIH07Ci0gICAgQ2xlYXJhbmNlUG9zaXRpb24gdmVydGljYWxQb3NpdGlvbldpdGhDbGVh cmFuY2UoY29uc3QgQm94JikgY29uc3Q7CisgICAgT3B0aW9uYWw8UG9zaXRpb25XaXRoQ2xlYXJh bmNlPiB2ZXJ0aWNhbFBvc2l0aW9uV2l0aENsZWFyYW5jZShjb25zdCBCb3gmKSBjb25zdDsKIAog ICAgIE9wdGlvbmFsPExheW91dFVuaXQ+IHRvcCgpIGNvbnN0OwogICAgIE9wdGlvbmFsPExheW91 dFVuaXQ+IGxlZnRCb3R0b20oKSBjb25zdCB7IHJldHVybiBib3R0b20oQ2xlYXI6OkxlZnQpOyB9 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9Jbmxp bmVGb3JtYXR0aW5nQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9y bWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKaW5kZXggM2M2NzRlZDJlOTFmYmEz Y2UzNjY0NzA0MjU5MDg1MGQ0N2RjMDRlYy4uMzc4YWViYjI0MzVjMmUzYTRhOGJlZTRjMGY0ZjJh NzI3MWRiN2UxNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1h dHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcApAQCAtMTY1 LDcgKzE2NSw3IEBAIHZvaWQgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmxpbmVMYXlvdXQoSW5s aW5lSXRlbXMmIGlubGluZUl0ZW1zLCBMaW5lQnVpbGRlcjo6CiAgICAgICAgIGlmICghbGluZUNv bnRlbnRSYW5nZS5pc0VtcHR5KCkpIHsKICAgICAgICAgICAgIEFTU0VSVChuZWVkc0xheW91dFJh bmdlLnN0YXJ0IDwgbGluZUNvbnRlbnRSYW5nZS5lbmQpOwogICAgICAgICAgICAgaXNGaXJzdExp bmUgPSBmYWxzZTsKLSAgICAgICAgICAgIGxpbmVMb2dpY2FsVG9wID0gbGluZUxvZ2ljYWxSZWN0 LmJvdHRvbSgpOworICAgICAgICAgICAgbGluZUxvZ2ljYWxUb3AgPSBnZW9tZXRyeSgpLmxvZ2lj YWxUb3BGb3JOZXh0TGluZShsaW5lQ29udGVudCwgbGluZUxvZ2ljYWxSZWN0LmJvdHRvbSgpLCBm bG9hdGluZ0NvbnRleHQpOwogICAgICAgICAgICAgLy8gV2hlbiB0aGUgdHJhaWxpbmcgY29udGVu dCBpcyBwYXJ0aWFsLCB3ZSBuZWVkIHRvIHJldXNlIHRoZSBsYXN0IElubGluZVRleHRJdGVtLgog ICAgICAgICAgICAgYXV0byBsYXN0SW5saW5lSXRlbU5lZWRzUGFydGlhbExheW91dCA9IGxpbmVD b250ZW50LnBhcnRpYWxUcmFpbGluZ0NvbnRlbnRMZW5ndGg7CiAgICAgICAgICAgICBpZiAobGFz dElubGluZUl0ZW1OZWVkc1BhcnRpYWxMYXlvdXQpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmggYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29u dGV4dC5oCmluZGV4IGEyNDBiMzkwYWQxNGU1MTY3NzNlZmJjYzQ5MDlhNTBjNTMyMzMwYjAuLjU1 YjAyY2M1MTkzMGY4MDM3NjcxMmUzYzkxMWRjMzliMjUxMjE4MGEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0 LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9y bWF0dGluZ0NvbnRleHQuaApAQCAtNzAsNiArNzAsNyBAQCBwcml2YXRlOgogICAgICAgICAgICAg SW5saW5lUmVjdCBsb2dpY2FsUmVjdDsKICAgICAgICAgfTsKICAgICAgICAgTGluZVJlY3RBbmRM aW5lQm94T2Zmc2V0IGNvbXB1dGVkTGluZUxvZ2ljYWxSZWN0KGNvbnN0IExpbmVCb3gmLCBjb25z dCBSZW5kZXJTdHlsZSYgcm9vdFN0eWxlLCBjb25zdCBMaW5lQnVpbGRlcjo6TGluZUNvbnRlbnQm KSBjb25zdDsKKyAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsVG9wRm9yTmV4dExpbmUo Y29uc3QgTGluZUJ1aWxkZXI6OkxpbmVDb250ZW50JiwgSW5saW5lTGF5b3V0VW5pdCBwcmV2aW91 c0xpbmVMb2dpY2FsQm90dG9tLCBjb25zdCBGbG9hdGluZ0NvbnRleHQmKSBjb25zdDsKIAogICAg ICAgICBDb250ZW50SGVpZ2h0QW5kTWFyZ2luIGlubGluZUJsb2NrSGVpZ2h0QW5kTWFyZ2luKGNv bnN0IEJveCYsIGNvbnN0IEhvcml6b250YWxDb25zdHJhaW50cyYsIGNvbnN0IE92ZXJyaWRlVmVy dGljYWxWYWx1ZXMmKSBjb25zdDsKICAgICAgICAgQ29udGVudFdpZHRoQW5kTWFyZ2luIGlubGlu ZUJsb2NrV2lkdGhBbmRNYXJnaW4oY29uc3QgQm94JiwgY29uc3QgSG9yaXpvbnRhbENvbnN0cmFp bnRzJiwgY29uc3QgT3ZlcnJpZGVIb3Jpem9udGFsVmFsdWVzJik7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4 dEdlb21ldHJ5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lu bGluZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCmluZGV4IDU1NjdjY2E3OTc4MDg4OTMy MWFhZmRhYzU2YzZkYWM1N2E2MmY3ODEuLmY1NjlkZmM4MzY4MDc4Mzk0NmVhYmQ3NWI3NDc2NDcx MjRlOTdiZDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0 aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0 cnkuY3BwCkBAIC00NjMsNiArNDYzLDIxIEBAIElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpHZW9t ZXRyeTo6TGluZVJlY3RBbmRMaW5lQm94T2Zmc2V0IElubGluZUZvcm1hdHRpbmdDb250CiAgICAg cmV0dXJuIHsgbGluZUJveE9mZnNldCwgbG9naWNhbFJlY3QgfTsKIH0KIAorSW5saW5lTGF5b3V0 VW5pdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmxvZ2ljYWxUb3BGb3JOZXh0 TGluZShjb25zdCBMaW5lQnVpbGRlcjo6TGluZUNvbnRlbnQmIGxpbmVDb250ZW50LCBJbmxpbmVM YXlvdXRVbml0IHByZXZpb3VzTGluZUxvZ2ljYWxCb3R0b20sIGNvbnN0IEZsb2F0aW5nQ29udGV4 dCYgZmxvYXRpbmdDb250ZXh0KSBjb25zdAoreworICAgIC8vIE5vcm1hbGx5IHRoZSBuZXh0IGxp bmUncyBsb2dpY2FsIHRvcCBpcyB0aGUgcHJldmlvdXMgbGluZSdzIGxvZ2ljYWwgYm90dG9tLCBi dXQgd2hlbiB0aGUgbGluZSBlbmRzCisgICAgLy8gd2l0aCB0aGUgY2xlYXIgcHJvcGVydHkgc2V0 LCB0aGUgbmV4dCBsaW5lIG5lZWRzIHRvIGNsZWFyIHRoZSBleGlzdGluZyBmbG9hdHMuCisgICAg aWYgKGxpbmVDb250ZW50LnJ1bnMuaXNFbXB0eSgpKQorICAgICAgICByZXR1cm4gcHJldmlvdXNM aW5lTG9naWNhbEJvdHRvbTsKKyAgICBhdXRvJiBsYXN0UnVuTGF5b3V0Qm94ID0gbGluZUNvbnRl bnQucnVucy5sYXN0KCkubGF5b3V0Qm94KCk7IAorICAgIGlmIChsYXN0UnVuTGF5b3V0Qm94LnN0 eWxlKCkuY2xlYXIoKSA9PSBDbGVhcjo6Tm9uZSkKKyAgICAgICAgcmV0dXJuIHByZXZpb3VzTGlu ZUxvZ2ljYWxCb3R0b207CisgICAgYXV0byBwb3NpdGlvbldpdGhDbGVhcmFuY2UgPSBmbG9hdGlu Z0NvbnRleHQudmVydGljYWxQb3NpdGlvbldpdGhDbGVhcmFuY2UobGFzdFJ1bkxheW91dEJveCk7 CisgICAgaWYgKCFwb3NpdGlvbldpdGhDbGVhcmFuY2UpCisgICAgICAgIHJldHVybiBwcmV2aW91 c0xpbmVMb2dpY2FsQm90dG9tOworICAgIHJldHVybiBzdGQ6Om1heChwcmV2aW91c0xpbmVMb2dp Y2FsQm90dG9tLCBJbmxpbmVMYXlvdXRVbml0KHBvc2l0aW9uV2l0aENsZWFyYW5jZS0+cG9zaXRp b24pKTsKK30KKwogQ29udGVudFdpZHRoQW5kTWFyZ2luIElubGluZUZvcm1hdHRpbmdDb250ZXh0 OjpHZW9tZXRyeTo6aW5saW5lQmxvY2tXaWR0aEFuZE1hcmdpbihjb25zdCBCb3gmIGZvcm1hdHRp bmdDb250ZXh0Um9vdCwgY29uc3QgSG9yaXpvbnRhbENvbnN0cmFpbnRzJiBob3Jpem9udGFsQ29u c3RyYWludHMsIGNvbnN0IE92ZXJyaWRlSG9yaXpvbnRhbFZhbHVlcyYgb3ZlcnJpZGVIb3Jpem9u dGFsVmFsdWVzKQogewogICAgIEFTU0VSVChmb3JtYXR0aW5nQ29udGV4dFJvb3QuaXNJbkZsb3co KSk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cKaW5kZXggYThlZmE3MjA3MjQyNTFjZTExMjZhMDIwODgzYWUxY2YxNTJmY2FlZS4uMmM1 MzcxMDBkNjYzYjIxOWU2NDYzY2I1YTU5M2I4NjVjNzdlZTZmMSAxMDA2NDQKLS0tIGEvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEz IEBACisyMDIwLTEwLTA2ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAg ICAgW0xGQ11bSUZDXSBBZGQgaW5pdGlhbCBzdXBwb3J0IGZvciBpbmxpbmUgY29udGVudCB0byBj bGVhciBpbnRydXNpdmUgZmxvYXRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMTc0MTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIGZhc3QvbGF5b3V0Zm9ybWF0dGluZ2NvbnRleHQvZmxvYXQtYXZvaWRp bmctYnItc2ltcGxlLWV4cGVjdGVkLmh0bWw6IEFkZGVkLgorICAgICAgICAqIGZhc3QvbGF5b3V0 Zm9ybWF0dGluZ2NvbnRleHQvZmxvYXQtYXZvaWRpbmctYnItc2ltcGxlLmh0bWw6IEFkZGVkLgor CiAyMDIwLTEwLTA1ICBKb2huIFdpbGFuZGVyICA8d2lsYW5kZXJAYXBwbGUuY29tPgogCiAgICAg ICAgIFN0b3JhZ2UgQWNjZXNzIEFQSTogRW5hYmxlIHBlci1wYWdlIHN0b3JhZ2UgYWNjZXNzIHNj b3BlIGFuZCBhbGlnbiB0ZXN0IGNhc2VzCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2xh eW91dGZvcm1hdHRpbmdjb250ZXh0L2Zsb2F0LWF2b2lkaW5nLWJyLXNpbXBsZS1leHBlY3RlZC5o dG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9sYXlvdXRmb3JtYXR0aW5nY29udGV4dC9mbG9hdC1hdm9p ZGluZy1ici1zaW1wbGUtZXhwZWN0ZWQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi40OTEzODZhOTgwOGYwZWY5 MWViNzQ0NDliMWI0ZTJjY2I4ZTM1OGQ5Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMv ZmFzdC9sYXlvdXRmb3JtYXR0aW5nY29udGV4dC9mbG9hdC1hdm9pZGluZy1ici1zaW1wbGUtZXhw ZWN0ZWQuaHRtbApAQCAtMCwwICsxLDE0IEBACis8IURPQ1RZUEUgaHRtbD4gPCEtLSB3ZWJraXQt dGVzdC1ydW5uZXIgWyBpbnRlcm5hbDpMYXlvdXRGb3JtYXR0aW5nQ29udGV4dEVuYWJsZWQ9dHJ1 ZSBpbnRlcm5hbDpMYXlvdXRGb3JtYXR0aW5nQ29udGV4dEludGVncmF0aW9uRW5hYmxlZD1mYWxz ZSBdIC0tPgorPHN0eWxlPgorLmZsb2F0X2xpa2UgeworICBwb3NpdGlvbjogYWJzb2x1dGU7Cisg IGJhY2tncm91bmQtY29sb3I6IGJsdWU7CisgIHdpZHRoOiA1MHB4OworICBoZWlnaHQ6IDUwcHg7 Cit9Cis8L3N0eWxlPgorPGRpdiBzdHlsZT0id2lkdGg6IDMwMHB4OyBoZWlnaHQ6IDIwMHB4OyBi YWNrZ3JvdW5kLWNvbG9yOiBncmVlbjsiPjwvZGl2PgorPGRpdiBjbGFzcz1mbG9hdF9saWtlIHN0 eWxlPSJ0b3A6IDhweDsgbGVmdDogOHB4OyI+PC9kaXY+Cis8ZGl2IGNsYXNzPWZsb2F0X2xpa2Ug c3R5bGU9InRvcDogNjhweDsgbGVmdDogMjU4cHg7IGhlaWdodDogNjBweDsiPjwvZGl2PgorPGRp diBjbGFzcz1mbG9hdF9saWtlIHN0eWxlPSJ0b3A6IDEzOHB4OyBsZWZ0OiAyNThweDsgaGVpZ2h0 OiA2MHB4Ij48L2Rpdj4KKzxkaXYgY2xhc3M9ZmxvYXRfbGlrZSBzdHlsZT0idG9wOiAxMzhweDsg bGVmdDogOHB4OyI+PC9kaXY+ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvZmFzdC9sYXlvdXRmb3JtYXR0aW5nY29udGV4dC9mbG9hdC1hdm9pZGlu Zy1ici1zaW1wbGUuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvbGF5b3V0Zm9ybWF0dGluZ2NvbnRl eHQvZmxvYXQtYXZvaWRpbmctYnItc2ltcGxlLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5k ZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uOTQ1ODgxNzhhODk4 NGNkNWRmMTU2NWIyZGNjZGRhNzYyYWMzZmZjNAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRl c3RzL2Zhc3QvbGF5b3V0Zm9ybWF0dGluZ2NvbnRleHQvZmxvYXQtYXZvaWRpbmctYnItc2ltcGxl Lmh0bWwKQEAgLTAsMCArMSwyNyBAQAorPCFET0NUWVBFIGh0bWw+IDwhLS0gd2Via2l0LXRlc3Qt cnVubmVyIFsgaW50ZXJuYWw6TGF5b3V0Rm9ybWF0dGluZ0NvbnRleHRFbmFibGVkPXRydWUgaW50 ZXJuYWw6TGF5b3V0Rm9ybWF0dGluZ0NvbnRleHRJbnRlZ3JhdGlvbkVuYWJsZWQ9ZmFsc2UgXSAt LT4KKzxzdHlsZT4KKy5mbG9hdCB7CisgIGZsb2F0OiBsZWZ0OyAKKyAgd2lkdGg6IDUwcHg7Cisg IGhlaWdodDogNTBweDsKKyAgYmFja2dyb3VuZC1jb2xvcjogYmx1ZTsKK30KKy5jb250YWluZXIg eworICBmb250LWZhbWlseTogQWhlbTsKKyAgZm9udC1zaXplOiAxMHB4OworICBjb2xvcjogZ3Jl ZW47CisgIGJhY2tncm91bmQtY29sb3I6IGdyZWVuOworICB3aWR0aDogMzAwcHg7Cit9Cis8L3N0 eWxlPgorPGRpdiBzdHlsZT0id2lkdGg6IDMwMHB4OyI+Cis8ZGl2IGNsYXNzPSJmbG9hdCI+PC9k aXY+Cis8ZGl2IGNsYXNzPWNvbnRhaW5lcj5mb288YnIgc3R5bGU9ImNsZWFyOiBsZWZ0Ij5iYXI8 L2Rpdj4KKworPGRpdiBjbGFzcz0iZmxvYXQiIHN0eWxlPSJmbG9hdDogcmlnaHQ7IGhlaWdodDog NjBweDsiPjwvZGl2PgorPGRpdiBjbGFzcz1jb250YWluZXI+Zm9vPGJyIHN0eWxlPSJjbGVhcjog cmlnaHQiPmJhcjwvZGl2PgorCis8ZGl2IGNsYXNzPSJmbG9hdCI+PC9kaXY+Cis8ZGl2IGNsYXNz PSJmbG9hdCIgc3R5bGU9ImZsb2F0OiByaWdodDsgaGVpZ2h0OiA2MHB4OyI+PC9kaXY+Cis8ZGl2 IGNsYXNzPWNvbnRhaW5lcj5mb288YnIgc3R5bGU9ImNsZWFyOiBib3RoIj5iYXI8L2Rpdj4KKzwv ZGl2PgpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUK