184409 2018-04-08 20:55:42 -0700 [LayoutReloaded] Adjust line with inline container's margin border and padding 2018-04-08 21:00:36 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan webkit-bug-importer oldest_to_newest 1412802 0 zalan 2018-04-08 20:55:42 -0700 ssia 1412803 1 337479 zalan 2018-04-08 20:57:03 -0700 Created attachment 337479 Patch 1412804 2 zalan 2018-04-08 20:59:17 -0700 Committed r230386: <https://trac.webkit.org/changeset/230386> 1412805 3 webkit-bug-importer 2018-04-08 21:00:36 -0700 <rdar://problem/39270673> 337479 2018-04-08 20:57:03 -0700 2018-04-08 20:57:03 -0700 Patch bug-184409-20180408205702.patch text/plain 10299 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjMwMzczCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNzQ3NDVlMTQ0NjhmYTllMDdiODNhNTE0YWI0ZTNmMmJk MGEzNTcyNi4uMTM1ZGRiYzdjYTQyZGYwYWI3MDU3OGViMDY3NDIxMjU4NDkwYzJhZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2 IEBACisyMDE4LTA0LTA4ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAg ICAgW0xheW91dFJlbG9hZGVkXSBBZGp1c3QgbGluZSB3aXRoIGlubGluZSBjb250YWluZXIncyBt YXJnaW4gYm9yZGVyIGFuZCBwYWRkaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xODQ0MDkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIExheW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdDb250ZXh0L0lubGlu ZUZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuanM6CisgICAgICAgIChJbmxpbmVG b3JtYXR0aW5nQ29udGV4dC5wcm90b3R5cGUubGF5b3V0KToKKyAgICAgICAgKElubGluZUZvcm1h dHRpbmdDb250ZXh0LnByb3RvdHlwZS5faGFuZGxlRmxvYXRpbmdCb3gpOgorICAgICAgICAoSW5s aW5lRm9ybWF0dGluZ0NvbnRleHQucHJvdG90eXBlLl9hZGp1c3RMaW5lRm9ySW5saW5lQ29udGFp bmVyU3RhcnQpOgorICAgICAgICAoSW5saW5lRm9ybWF0dGluZ0NvbnRleHQucHJvdG90eXBlLl9h ZGp1c3RMaW5lRm9ySW5saW5lQ29udGFpbmVyRW5kKToKKyAgICAgICAgKiBMYXlvdXRSZWxvYWRl ZC9Gb3JtYXR0aW5nQ29udGV4dC9JbmxpbmVGb3JtYXR0aW5nL0xpbmUuanM6CisgICAgICAgIChM aW5lLnByb3RvdHlwZS5zaHJpbmspOgorICAgICAgICAoTGluZS5wcm90b3R5cGUuYWRqdXN0V2l0 aE9mZnNldCk6CisgICAgICAgIChMaW5lLnByb3RvdHlwZS5tb3ZlQ29udGVudEhvcml6b250YWxs eSk6CisgICAgICAgIChMaW5lLnByb3RvdHlwZS5hZGRUZXh0TGluZUJveCk6CisgICAgICAgIChM aW5lKToKKyAgICAgICAgKExpbmUucHJvdG90eXBlLmFkZEZsb2F0aW5nQm94KTogRGVsZXRlZC4K KyAgICAgICAgKiBMYXlvdXRSZWxvYWRlZC9taXNjL0xheW91dFJlbG9hZGVkV2ViS2l0LnBhdGNo OgorICAgICAgICAqIExheW91dFJlbG9hZGVkL3Rlc3QvaW5kZXguaHRtbDoKKyAgICAgICAgKiBM YXlvdXRSZWxvYWRlZC90ZXN0L2lubGluZS13aXRoLXBhZGRpbmctYm9yZGVyLW1hcmdpbi1vZmZz ZXRzLmh0bWw6IEFkZGVkLgorCiAyMDE4LTA0LTA3ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBs ZS5jb20+CiAKICAgICAgICAgW0xheW91dFJlbG9hZGVkXSBBZGQgc3VwcG9ydCBmb3IgSW5saW5l Q29udGFpbmVyCmRpZmYgLS1naXQgYS9Ub29scy9MYXlvdXRSZWxvYWRlZC9Gb3JtYXR0aW5nQ29u dGV4dC9JbmxpbmVGb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmpzIGIvVG9vbHMv TGF5b3V0UmVsb2FkZWQvRm9ybWF0dGluZ0NvbnRleHQvSW5saW5lRm9ybWF0dGluZy9JbmxpbmVG b3JtYXR0aW5nQ29udGV4dC5qcwppbmRleCBiOGQxOTEyODk3NDE0YTNjODM5NzVmMGRhOTZjZDFh YTQxZmRlY2YxLi5mZTBhZTNkOTQzMjc4YjRlZDY4ZWY4ODQwMTlkNGIyYTY0M2Y2ODIzIDEwMDY0 NAotLS0gYS9Ub29scy9MYXlvdXRSZWxvYWRlZC9Gb3JtYXR0aW5nQ29udGV4dC9JbmxpbmVGb3Jt YXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmpzCisrKyBiL1Rvb2xzL0xheW91dFJlbG9h ZGVkL0Zvcm1hdHRpbmdDb250ZXh0L0lubGluZUZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0Nv bnRleHQuanMKQEAgLTQyLDE0ICs0MiwxNCBAQCBjbGFzcyBJbmxpbmVGb3JtYXR0aW5nQ29udGV4 dCBleHRlbmRzIEZvcm1hdHRpbmdDb250ZXh0IHsKICAgICAgICAgICAgIGlmIChsYXlvdXRCb3gu aXNJbmxpbmVDb250YWluZXIoKSkgewogICAgICAgICAgICAgICAgIGlmIChpbmxpbmVDb250YWlu ZXJTdGFjay5pbmRleE9mKGxheW91dEJveCkgPT0gLTEpIHsKICAgICAgICAgICAgICAgICAgICAg aW5saW5lQ29udGFpbmVyU3RhY2sucHVzaChsYXlvdXRCb3gpOwotICAgICAgICAgICAgICAgICAg ICB0aGlzLl9hZGp1c3RMaW5lRm9ySW5saW5lQ29udGFpbmVyU3RhcnQoKTsKKyAgICAgICAgICAg ICAgICAgICAgdGhpcy5fYWRqdXN0TGluZUZvcklubGluZUNvbnRhaW5lclN0YXJ0KGxheW91dEJv eCk7CiAgICAgICAgICAgICAgICAgICAgIGlmIChsYXlvdXRCb3guZXN0YWJsaXNoZXNGb3JtYXR0 aW5nQ29udGV4dCgpKQogICAgICAgICAgICAgICAgICAgICAgICAgdGhpcy5sYXlvdXRTdGF0ZSgp LmxheW91dChsYXlvdXRCb3gpOwogICAgICAgICAgICAgICAgICAgICBlbHNlCiAgICAgICAgICAg ICAgICAgICAgICAgICB0aGlzLl9hZGRUb0xheW91dFF1ZXVlKGxheW91dEJveC5maXJzdEluRmxv d09yRmxvYXRDaGlsZCgpKTsKICAgICAgICAgICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAg ICAgICAgICBpbmxpbmVDb250YWluZXJTdGFjay5wb3AobGF5b3V0Qm94KTsKLSAgICAgICAgICAg ICAgICAgICAgdGhpcy5fYWRqdXN0TGluZUZvcklubGluZUNvbnRhaW5lckVuZCgpOworICAgICAg ICAgICAgICAgICAgICB0aGlzLl9hZGp1c3RMaW5lRm9ySW5saW5lQ29udGFpbmVyRW5kKGxheW91 dEJveCk7CiAgICAgICAgICAgICAgICAgICAgIHRoaXMuX3JlbW92ZUZyb21MYXlvdXRRdWV1ZShs YXlvdXRCb3gpOwogICAgICAgICAgICAgICAgICAgICB0aGlzLl9hZGRUb0xheW91dFF1ZXVlKGxh eW91dEJveC5uZXh0SW5GbG93T3JGbG9hdFNpYmxpbmcoKSk7CiAgICAgICAgICAgICAgICAgICAg IC8vIFBsYWNlIHRoZSBpbmZsb3cgcG9zaXRpb25lZCBjaGlsZHJlbi4KQEAgLTExNiwxNSArMTE2 LDIwIEBAIGNsYXNzIElubGluZUZvcm1hdHRpbmdDb250ZXh0IGV4dGVuZHMgRm9ybWF0dGluZ0Nv bnRleHQgewogICAgICAgICAvLyBDaGVjayBpZiB0aGUgZmxvYXRpbmcgYm94IGlzIGFjdHVhbGx5 IG9uIHRoZSBjdXJyZW50IGxpbmUgb3IgZ290IHB1c2hlZCBmdXJ0aGVyIGRvd24uCiAgICAgICAg IGlmIChkaXNwbGF5Qm94LnRvcCgpID49IHRoaXMuX2xpbmUoKS5yZWN0KCkuYm90dG9tKCkpCiAg ICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIHRoaXMuX2xpbmUoKS5hZGRGbG9hdGluZ0JveChk aXNwbGF5Qm94LCBVdGlscy5pc0Zsb2F0aW5nTGVmdChmbG9hdGluZ0JveCkpOworICAgICAgICBs ZXQgZmxvYXRXaWR0aCA9IGRpc3BsYXlCb3gud2lkdGgoKTsKKyAgICAgICAgdGhpcy5fbGluZSgp LnNocmluayhmbG9hdFdpZHRoKTsKKyAgICAgICAgaWYgKFV0aWxzLmlzRmxvYXRpbmdMZWZ0KGZs b2F0aW5nQm94KSkKKyAgICAgICAgICAgIHRoaXMuX2xpbmUoKS5tb3ZlQ29udGVudEhvcml6b250 YWxseShmbG9hdFdpZHRoKTsKICAgICB9CiAKICAgICBfYWRqdXN0TGluZUZvcklubGluZUNvbnRh aW5lclN0YXJ0KGlubGluZUNvbnRhaW5lcikgewotCisgICAgICAgIGxldCBvZmZzZXQgPSB0aGlz Lm1hcmdpbkxlZnQoaW5saW5lQ29udGFpbmVyKSArIFV0aWxzLmNvbXB1dGVkQm9yZGVyQW5kUGFk ZGluZ0xlZnQoaW5saW5lQ29udGFpbmVyLm5vZGUoKSk7CisgICAgICAgIHRoaXMuX2xpbmUoKS5h ZGp1c3RXaXRoT2Zmc2V0KG9mZnNldCk7CiAgICAgfQogCiAgICAgX2FkanVzdExpbmVGb3JJbmxp bmVDb250YWluZXJFbmQoaW5saW5lQ29udGFpbmVyKSB7Ci0KKyAgICAgICAgbGV0IG9mZnNldCA9 IHRoaXMubWFyZ2luUmlnaHQoaW5saW5lQ29udGFpbmVyKSArIFV0aWxzLmNvbXB1dGVkQm9yZGVy QW5kUGFkZGluZ1JpZ2h0KGlubGluZUNvbnRhaW5lci5ub2RlKCkpOworICAgICAgICB0aGlzLl9s aW5lKCkuYWRqdXN0V2l0aE9mZnNldChvZmZzZXQpOwogICAgIH0KIAogICAgIF9wbGFjZUluRmxv d1Bvc2l0aW9uZWRDaGlsZHJlbihjb250YWluZXIpIHsKZGlmZiAtLWdpdCBhL1Rvb2xzL0xheW91 dFJlbG9hZGVkL0Zvcm1hdHRpbmdDb250ZXh0L0lubGluZUZvcm1hdHRpbmcvTGluZS5qcyBiL1Rv b2xzL0xheW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdDb250ZXh0L0lubGluZUZvcm1hdHRpbmcvTGlu ZS5qcwppbmRleCAwMjg4N2E1NDU3ODgwNTU1MTY5MzRjOGQ3MjMwZjM2MzFjN2JkY2U3Li40ZDli OTJhZmZiMzMxMjIwMTRmYThjODU2OTc4ZDk3YTkyMWNlMjNhIDEwMDY0NAotLS0gYS9Ub29scy9M YXlvdXRSZWxvYWRlZC9Gb3JtYXR0aW5nQ29udGV4dC9JbmxpbmVGb3JtYXR0aW5nL0xpbmUuanMK KysrIGIvVG9vbHMvTGF5b3V0UmVsb2FkZWQvRm9ybWF0dGluZ0NvbnRleHQvSW5saW5lRm9ybWF0 dGluZy9MaW5lLmpzCkBAIC00Niw2ICs0NiwyMiBAQCBjbGFzcyBMaW5lIHsKICAgICAgICAgcmV0 dXJuIHRoaXMubV9saW5lQm94ZXM7CiAgICAgfQogCisgICAgc2hyaW5rKHdpZHRoKSB7CisgICAg ICAgIHRoaXMubV9hdmFpbGFibGVXaWR0aCAtPSB3aWR0aDsKKyAgICB9CisKKyAgICBhZGp1c3RX aXRoT2Zmc2V0KG9mZnNldCkgeworICAgICAgICB0aGlzLm1fYXZhaWxhYmxlV2lkdGggLT0gb2Zm c2V0OworICAgICAgICB0aGlzLm1fbGluZVJlY3QuZ3Jvd0J5KG5ldyBMYXlvdXRTaXplKG9mZnNl dCwgMCkpOworICAgIH0KKworICAgIG1vdmVDb250ZW50SG9yaXpvbnRhbGx5KG9mZnNldCkgewor ICAgICAgICAvLyBQdXNoIG5vbi1mbG9hdGluZyBib3hlcyB0byB0aGUgcmlnaHQuCisgICAgICAg IGZvciAobGV0IGxpbmVCb3ggb2YgdGhpcy5tX2xpbmVCb3hlcykKKyAgICAgICAgICAgIGxpbmVC b3gubGluZUJveFJlY3QubW92ZUhvcml6b250YWxseShvZmZzZXQpOworICAgICAgICB0aGlzLm1f bGluZVJlY3QubW92ZUhvcml6b250YWxseShvZmZzZXQpOworICAgIH0KKwogICAgIGFkZFRleHRM aW5lQm94KHN0YXJ0UG9zaXRpb24sIGVuZFBvc2l0aW9uLCBzaXplKSB7CiAgICAgICAgIEFTU0VS VChzaXplLndpZHRoKCkgPD0gdGhpcy5tX2F2YWlsYWJsZVdpZHRoKTsKICAgICAgICAgdGhpcy5t X2F2YWlsYWJsZVdpZHRoIC09IHNpemUud2lkdGgoKTsKQEAgLTU0LDE2ICs3MCw0IEBAIGNsYXNz IExpbmUgewogICAgICAgICB0aGlzLm1fbGluZUJveGVzLnB1c2goe3N0YXJ0UG9zaXRpb24sIGVu ZFBvc2l0aW9uLCBsaW5lQm94UmVjdH0pOwogICAgICAgICB0aGlzLm1fbGluZVJlY3QuZ3Jvd0J5 KG5ldyBMYXlvdXRTaXplKHNpemUud2lkdGgoKSwgMCkpOwogICAgIH0KLQotICAgIGFkZEZsb2F0 aW5nQm94KGZsb2F0aW5nRGlzcGxheUJveCwgaXNGbG9hdGluZ0xlZnQpIHsKLSAgICAgICAgbGV0 IHdpZHRoID0gZmxvYXRpbmdEaXNwbGF5Qm94LndpZHRoKCk7Ci0gICAgICAgIEFTU0VSVCh3aWR0 aCA8PSB0aGlzLm1fYXZhaWxhYmxlV2lkdGgpOwotICAgICAgICB0aGlzLm1fYXZhaWxhYmxlV2lk dGggLT0gd2lkdGg7Ci0gICAgICAgIGlmICghaXNGbG9hdGluZ0xlZnQpCi0gICAgICAgICAgICBy ZXR1cm47Ci0gICAgICAgIC8vIFB1c2ggbm9uLWZsb2F0aW5nIGJveGVzIHRvIHRoZSByaWdodC4K LSAgICAgICAgZm9yIChsZXQgbGluZUJveCBvZiB0aGlzLm1fbGluZUJveGVzKQotICAgICAgICAg ICAgbGluZUJveC5saW5lQm94UmVjdC5tb3ZlSG9yaXpvbnRhbGx5KHdpZHRoKTsKLSAgICAgICAg dGhpcy5tX2xpbmVSZWN0Lm1vdmVIb3Jpem9udGFsbHkod2lkdGgpOwotICAgIH0KIH0KZGlmZiAt LWdpdCBhL1Rvb2xzL0xheW91dFJlbG9hZGVkL21pc2MvTGF5b3V0UmVsb2FkZWRXZWJLaXQucGF0 Y2ggYi9Ub29scy9MYXlvdXRSZWxvYWRlZC9taXNjL0xheW91dFJlbG9hZGVkV2ViS2l0LnBhdGNo CmluZGV4IDU4NWQ3YmIxZWY3ZWExYjViMDU1NjBkZmJkMTRkM2I5NDVhZDQ0ZDcuLjdlMmQxZDJm MjQ4MWZkYzIwNzYxZGFkZjY3NTQ3YWIwMmRlN2FmMDMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0xheW91 dFJlbG9hZGVkL21pc2MvTGF5b3V0UmVsb2FkZWRXZWJLaXQucGF0Y2gKKysrIGIvVG9vbHMvTGF5 b3V0UmVsb2FkZWQvbWlzYy9MYXlvdXRSZWxvYWRlZFdlYktpdC5wYXRjaApAQCAtMzgsNyArMzgs NyBAQCBpbmRleCBmZjk0MmIzNmE0NC4uNWJjMzBmOTE0YWYgMTAwNjQ0CiAgcmVuZGVyaW5nL0xh eW91dFJlcGFpbnRlci5jcHAKICByZW5kZXJpbmcvTGF5b3V0U3RhdGUuY3BwCiBkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qIGIvU291 cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCi1pbmRleCA2OTBi OWU5NDFiZC4uM2ZmYzQ0MDY5MDcgMTAwNjQ0CitpbmRleCAyYWUwYzhhMjJkNS4uZWRjZDgyYWE5 NWEgMTAwNjQ0CiAtLS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0 LnBieHByb2oKICsrKyBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3Qu cGJ4cHJvagogQEAgLTM5Niw2ICszOTYsMTAgQEAKQEAgLTU3OCwxNSArNTc4LDE4IEBAIGluZGV4 IGFhMDMwYzU0NjE3Li43NDU3ODYxZTE0MiAxMDA2NDQKICB9CiAgCiBkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZUJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvSW5saW5lQm94LmNwcAotaW5kZXggY2QyM2FlMGI5N2MuLmRhMDcyZWZkZmE5IDEwMDY0 NAoraW5kZXggY2QyM2FlMGI5N2MuLjdjZmQ0YmIyZDQyIDEwMDY0NAogLS0tIGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL0lubGluZUJveC5jcHAKICsrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9JbmxpbmVCb3guY3BwCi1AQCAtMTIzLDYgKzEyMywxNSBAQCB2b2lkIElubGluZUJveDo6 b3V0cHV0TGluZUJveChUZXh0U3RyZWFtJiBzdHJlYW0sIGJvb2wgbWFyaywgaW50IGRlcHRoKSBj b25zdAorQEAgLTEyMyw2ICsxMjMsMTggQEAgdm9pZCBJbmxpbmVCb3g6Om91dHB1dExpbmVCb3go VGV4dFN0cmVhbSYgc3RyZWFtLCBib29sIG1hcmssIGludCBkZXB0aCkgY29uc3QKICAgICAgc3Ry ZWFtLm5leHRMaW5lKCk7CiAgfQogIAogK3ZvaWQgSW5saW5lQm94OjpvdXRwdXRTaW1wbGlmaWVk TGluZVRyZWUoVGV4dFN0cmVhbSYgc3RyZWFtLCBpbnQgZGVwdGgpIGNvbnN0CiAreworKyAgICAv LyBJZ25vcmUgaW5saW5lIGZsb3dzIGZvciBub3cuIExheW91dFJlbG9hZGVkIGRvZXMgbm90IGhh dmUgdGhlIGNvbmNlcHQgb2YgZmxvdyBib3hlcy4KKysgICAgaWYgKGlzPElubGluZUZsb3dCb3g+ KCp0aGlzKSAmJiAhaXM8Um9vdElubGluZUJveD4oKnRoaXMpKQorKyAgICAgICAgcmV0dXJuOwog KyAgICBpbnQgcHJpbnRlZENoYXJhY3RlcnMgPSAwOwogKyAgICB3aGlsZSAoKytwcmludGVkQ2hh cmFjdGVycyA8PSBkZXB0aCkKICsgICAgICAgIHN0cmVhbSA8PCAiICI7CkBAIC02MTAsMTggKzYx MywyMyBAQCBpbmRleCA3ZjFkZDZjYmJhNC4uZWRkYjA0ODQ0MGEgMTAwNjQ0CiAgICAgIHZpcnR1 YWwgY29uc3QgY2hhciogYm94TmFtZSgpIGNvbnN0OwogICNlbmRpZgogZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVGbG93Qm94LmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9JbmxpbmVGbG93Qm94LmNwcAotaW5kZXggMDYzZjNiNjQxODkuLjU0OTRhYWJl NTQ2IDEwMDY0NAoraW5kZXggMDYzZjNiNjQxODkuLmVlMzJiOTgxMzcxIDEwMDY0NAogLS0tIGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZUZsb3dCb3guY3BwCiArKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lRmxvd0JveC5jcHAKLUBAIC0xNzIwLDYgKzE3MjAsMTMg QEAgdm9pZCBJbmxpbmVGbG93Qm94OjpvdXRwdXRMaW5lVHJlZUFuZE1hcmsoV1RGOjpUZXh0U3Ry ZWFtJiBzdHJlYW0sIGNvbnN0IElubGluZUIKK0BAIC0xNzIwLDYgKzE3MjAsMTggQEAgdm9pZCBJ bmxpbmVGbG93Qm94OjpvdXRwdXRMaW5lVHJlZUFuZE1hcmsoV1RGOjpUZXh0U3RyZWFtJiBzdHJl YW0sIGNvbnN0IElubGluZUIKICAgICAgICAgIGJveC0+b3V0cHV0TGluZVRyZWVBbmRNYXJrKHN0 cmVhbSwgbWFya2VkQm94LCBkZXB0aCArIDEpOwogIH0KICAKICt2b2lkIElubGluZUZsb3dCb3g6 Om91dHB1dFNpbXBsaWZpZWRMaW5lVHJlZShXVEY6OlRleHRTdHJlYW0mIHN0cmVhbSwgaW50IGRl cHRoKSBjb25zdAogK3sKICsgICAgSW5saW5lQm94OjpvdXRwdXRTaW1wbGlmaWVkTGluZVRyZWUo c3RyZWFtLCBkZXB0aCk7Ci0rICAgIGZvciAoYXV0byogYm94ID0gZmlyc3RDaGlsZCgpOyBib3g7 IGJveCA9IGJveC0+bmV4dE9uTGluZSgpKQotKyAgICAgICAgYm94LT5vdXRwdXRTaW1wbGlmaWVk TGluZVRyZWUoc3RyZWFtLCBkZXB0aCArIDEpOworKyAgICBmb3IgKGF1dG8qIGJveCA9IGZpcnN0 Q2hpbGQoKTsgYm94OyBib3ggPSBib3gtPm5leHRPbkxpbmUoKSkgeworKyAgICAgICAgLy8gRE8g bm90IGluY3JlbWVudCBkZXB0aCBmb3IgZmxvdyBib3hlcy4gTGF5b3V0UmVsb2FkZWQgZG9lcyBu b3QgaGF2ZSB0aGUgY29uY2VwdCBvZiB0aGVtLgorKyAgICAgICAgaWYgKGlzPElubGluZUZsb3dC b3g+KCpib3gpICYmICFpczxSb290SW5saW5lQm94PigqYm94KSkKKysgICAgICAgICAgICBib3gt Pm91dHB1dFNpbXBsaWZpZWRMaW5lVHJlZShzdHJlYW0sIGRlcHRoKTsKKysgICAgICAgIGVsc2UK KysgICAgICAgICAgICBib3gtPm91dHB1dFNpbXBsaWZpZWRMaW5lVHJlZShzdHJlYW0sIGRlcHRo ICsgMSk7CisrICAgIH0KICt9CiArCiAgI2VuZGlmCmRpZmYgLS1naXQgYS9Ub29scy9MYXlvdXRS ZWxvYWRlZC90ZXN0L2luZGV4Lmh0bWwgYi9Ub29scy9MYXlvdXRSZWxvYWRlZC90ZXN0L2luZGV4 Lmh0bWwKaW5kZXggZjUxNmRlMzVjZDYyNDRiZTNlNjJiNDMxMTBlZDY3MTJiOGU3MDQyNS4uNWY2 NGY2OWYwNTAyM2JmNTFiYTBhYTEwZGIzNWM1YzNjYTkwNjYwOSAxMDA2NDQKLS0tIGEvVG9vbHMv TGF5b3V0UmVsb2FkZWQvdGVzdC9pbmRleC5odG1sCisrKyBiL1Rvb2xzL0xheW91dFJlbG9hZGVk L3Rlc3QvaW5kZXguaHRtbApAQCAtNzcsNyArNzcsOCBAQCBsZXQgdGVzdEZpbGVzID0gWwogICAg ICJpbmxpbmUtY29udGVudC1zaW1wbGUyLmh0bWwiLAogICAgICJpbmxpbmUtZmxvYXRpbmcxLmh0 bWwiLAogICAgICJpbmxpbmUtZm9ybWF0dGluZy1jb250ZXh0LWZsb2F0czEuaHRtbCIsCi0gICAg ImlubGluZS1mb3JtYXR0aW5nLWNvbnRleHQtZmxvYXRzMi5odG1sIgorICAgICJpbmxpbmUtZm9y bWF0dGluZy1jb250ZXh0LWZsb2F0czIuaHRtbCIsCisgICAgImlubGluZS13aXRoLXBhZGRpbmct Ym9yZGVyLW1hcmdpbi1vZmZzZXRzLmh0bWwiCiBdOwogCiBsZXQgZGVidWdUaGlzID0gW107CmRp ZmYgLS1naXQgYS9Ub29scy9MYXlvdXRSZWxvYWRlZC90ZXN0L2lubGluZS13aXRoLXBhZGRpbmct Ym9yZGVyLW1hcmdpbi1vZmZzZXRzLmh0bWwgYi9Ub29scy9MYXlvdXRSZWxvYWRlZC90ZXN0L2lu bGluZS13aXRoLXBhZGRpbmctYm9yZGVyLW1hcmdpbi1vZmZzZXRzLmh0bWwKbmV3IGZpbGUgbW9k ZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4u M2UxNzkwMGU4ZjVhZDljYjNlN2I0ZWQ3YWU0NDEyOGJhZWJhODFkZQotLS0gL2Rldi9udWxsCisr KyBiL1Rvb2xzL0xheW91dFJlbG9hZGVkL3Rlc3QvaW5saW5lLXdpdGgtcGFkZGluZy1ib3JkZXIt bWFyZ2luLW9mZnNldHMuaHRtbApAQCAtMCwwICsxLDggQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0 bWw+Cis8Ym9keT4KKzxkaXY+PHNwYW4gc3R5bGU9InBhZGRpbmctbGVmdDogMXB4OyBib3JkZXIt bGVmdDogMXB4IHNvbGlkIGdyZWVuOyI+Zm9vYmFyPC9zcGFuPjxzcGFuIHN0eWxlPSJtYXJnaW4t bGVmdDogMTBweDsgcGFkZGluZy1sZWZ0OiAxcHgiPmZvb2Jhcjwvc3Bhbj48L2Rpdj4KKzxkaXY+ PHNwYW4gc3R5bGU9InBhZGRpbmctcmlnaHQ6IDFweDsgYm9yZGVyLXJpZ2h0OiAxcHggc29saWQg Z3JlZW47Ij5mb29iYXI8L3NwYW4+PHNwYW4gc3R5bGU9Im1hcmdpbi1yaWdodDogMTBweDsgcGFk ZGluZy1yaWdodDogMXB4Ij5mb29iYXI8L3NwYW4+PC9kaXY+Cis8ZGl2IHN0eWxlPSJtYXJnaW46 IDUwcHg7Ij48c3BhbiBzdHlsZT0icGFkZGluZzogMXB4OyBib3JkZXI6IDFweCBzb2xpZCBncmVl bjsiPmZvb2Jhcjwvc3Bhbj48c3BhbiBzdHlsZT0ibWFyZ2luOiAxMHB4OyBwYWRkaW5nOiAxcHgi PmZvb2Jhcjwvc3Bhbj48L2Rpdj4KKzwvYm9keT4KKzwvaHRtbD4K