184223 2018-03-31 22:28:15 -0700 [LayoutReloaded] Floating box reduces line with in inline formatting context 2018-03-31 22:38:17 -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 1410933 0 zalan 2018-03-31 22:28:15 -0700 ssia 1410934 1 336952 zalan 2018-03-31 22:35:03 -0700 Created attachment 336952 Patch 1410936 2 zalan 2018-03-31 22:37:25 -0700 Committed r230141: <https://trac.webkit.org/changeset/230141> 1410937 3 webkit-bug-importer 2018-03-31 22:38:17 -0700 <rdar://problem/39081230> 336952 2018-03-31 22:35:03 -0700 2018-03-31 22:35:03 -0700 Patch bug-184223-20180331223502.patch text/plain 11186 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjMwMTQwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNTI1NzBhOGU4M2I4Nzg4MTFlMGYxOWQzODBmYTBjZDZm ZjEwM2IxNy4uMzVmMGRjY2NjMDI1NWNjYzdiNzVlZTFiZjA0NTJhMGUzMGIyOWVmMSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5 IEBACisyMDE4LTAzLTMxICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAg ICAgW0xheW91dFJlbG9hZGVkXSBGbG9hdGluZyBib3ggcmVkdWNlcyBsaW5lIHdpdGggaW4gaW5s aW5lIGZvcm1hdHRpbmcgY29udGV4dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTg0MjIzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBMYXlvdXRSZWxvYWRlZC9Gb3JtYXR0aW5nQ29udGV4dC9GbG9hdGlu Z0NvbnRleHQuanM6CisgICAgICAgIChGbG9hdGluZ0NvbnRleHQucHJvdG90eXBlLmxlZnQpOgor ICAgICAgICAoRmxvYXRpbmdDb250ZXh0LnByb3RvdHlwZS5yaWdodCk6CisgICAgICAgIChGbG9h dGluZ0NvbnRleHQucHJvdG90eXBlLl9tYXBEaXNwbGF5TWFyZ2luQm94VG9Gb3JtYXR0aW5nUm9v dCk6CisgICAgICAgIChGbG9hdGluZ0NvbnRleHQucHJvdG90eXBlLl9tYXBCb3JkZXJCb3hUb0Zv cm1hdHRpbmdSb290KToKKyAgICAgICAgKEZsb2F0aW5nQ29udGV4dC5wcm90b3R5cGUuX21hcENv bnRlbnRCb3hUb0Zvcm1hdHRpbmdSb290KToKKyAgICAgICAgKEZsb2F0aW5nQ29udGV4dC5wcm90 b3R5cGUuZm9ybWF0dGluZ1Jvb3QpOgorICAgICAgICAoRmxvYXRpbmdDb250ZXh0LnByb3RvdHlw ZS5fZmxvYXRpbmdTdGF0ZSk6CisgICAgICAgIChGbG9hdGluZ0NvbnRleHQucHJvdG90eXBlLl9m b3JtYXR0aW5nUm9vdCk6IERlbGV0ZWQuCisgICAgICAgICogTGF5b3V0UmVsb2FkZWQvRm9ybWF0 dGluZ0NvbnRleHQvSW5saW5lRm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5qczoK KyAgICAgICAgKElubGluZUZvcm1hdHRpbmdDb250ZXh0LnByb3RvdHlwZS5fY3JlYXRlTmV3TGlu ZSk6CisgICAgICAgIChJbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5wcm90b3R5cGUuX21hcEZsb2F0 aW5nUG9zaXRpb24pOgorICAgICAgICAoSW5saW5lRm9ybWF0dGluZ0NvbnRleHQpOgorICAgICAg ICAqIExheW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdTdGF0ZS9Gb3JtYXR0aW5nU3RhdGUuanM6Cisg ICAgICAgIChGb3JtYXR0aW5nU3RhdGUucHJvdG90eXBlLmRpc3BsYXlCb3gpOgorICAgICAgICAo Rm9ybWF0dGluZ1N0YXRlKToKKyAgICAgICAgKiBMYXlvdXRSZWxvYWRlZC90ZXN0L2luZGV4Lmh0 bWw6CisgICAgICAgICogTGF5b3V0UmVsb2FkZWQvdGVzdC9pbmxpbmUtZm9ybWF0dGluZy1jb250 ZXh0LXdpdGgtZmxvYXRzLmh0bWw6IEFkZGVkLgorCiAyMDE4LTAzLTMxICBaYWxhbiBCdWp0YXMg IDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xheW91dFJlbG9hZGVkXSBJbmxpbmVGb3Jt YXR0aW5nU3RhdGUgc2hvdWxkIGluaGVyaXQgdGhlIGZsb2F0aW5nIHN0YXRlIGZyb20gaXRzIHBh cmVudCBmb3JtYXR0aW5nIHN0YXRlCmRpZmYgLS1naXQgYS9Ub29scy9MYXlvdXRSZWxvYWRlZC9G b3JtYXR0aW5nQ29udGV4dC9GbG9hdGluZ0NvbnRleHQuanMgYi9Ub29scy9MYXlvdXRSZWxvYWRl ZC9Gb3JtYXR0aW5nQ29udGV4dC9GbG9hdGluZ0NvbnRleHQuanMKaW5kZXggY2ZhOTdlZTc0MWNm Y2Q0MDgzMGNiNDAzMjYxMTYwMTBhY2U0MjJiNS4uMDFmYTg1MDNjM2M3NjFjZjFkMTYxODU1N2Vh ODg0NmM1YmRhOTM1MSAxMDA2NDQKLS0tIGEvVG9vbHMvTGF5b3V0UmVsb2FkZWQvRm9ybWF0dGlu Z0NvbnRleHQvRmxvYXRpbmdDb250ZXh0LmpzCisrKyBiL1Rvb2xzL0xheW91dFJlbG9hZGVkL0Zv cm1hdHRpbmdDb250ZXh0L0Zsb2F0aW5nQ29udGV4dC5qcwpAQCAtNDQsOSArNDQsMjUgQEAgY2xh c3MgRmxvYXRpbmdDb250ZXh0IHsKICAgICAgICAgZGlzcGxheUJveC5zZXRUb3BMZWZ0KHRoaXMu X2NvbXB1dGVQb3NpdGlvblRvQXZvaWRJbnRydWRpbmdGbG9hdHMobGF5b3V0Qm94KSk7CiAgICAg fQogCisgICAgbGVmdCh2ZXJ0aWNhbFBvc2l0aW9uKSB7CisgICAgICAgIC8vIFJlbGF0aXZlIHRv IHRoZSBmb3JtYXR0aW5nIGNvbnRleHQncyByb290LgorICAgICAgICBsZXQgbGVmdEZsb2F0aW5n cyA9IHRoaXMuX2xlZnRGbG9hdGluZ3MoKTsKKyAgICAgICAgaWYgKCFsZWZ0RmxvYXRpbmdzLmxl bmd0aCkKKyAgICAgICAgICAgIHJldHVybiBOdW1iZXIuTmFOOworICAgICAgICByZXR1cm4gdGhp cy5fbWFwRGlzcGxheU1hcmdpbkJveFRvRm9ybWF0dGluZ1Jvb3QobGVmdEZsb2F0aW5nc1tsZWZ0 RmxvYXRpbmdzLmxlbmd0aCAtIDFdKS5yaWdodCgpOworICAgIH0KKworICAgIHJpZ2h0KHZlcnRp Y2FsUG9zaXRpb24pIHsKKyAgICAgICAgLy8gUmVsYXRpdmUgdG8gdGhlIGZvcm1hdHRpbmcgY29u dGV4dCdzIHJvb3QuCisgICAgICAgIGxldCByaWdodEZsb2F0aW5ncyA9IHRoaXMuX3JpZ2h0Rmxv YXRpbmdzKCk7CisgICAgICAgIGlmICghcmlnaHRGbG9hdGluZ3MubGVuZ3RoKQorICAgICAgICAg ICAgcmV0dXJuIE51bWJlci5OYU47CisgICAgICAgIHJldHVybiB0aGlzLl9tYXBEaXNwbGF5TWFy Z2luQm94VG9Gb3JtYXR0aW5nUm9vdChyaWdodEZsb2F0aW5nc1tyaWdodEZsb2F0aW5ncy5sZW5n dGggLSAxXSkubGVmdCgpOworICAgIH0KKwogICAgIGJvdHRvbSgpIHsKLSAgICAgICAgbGV0IGxl ZnRCb3R0b20gPSB0aGlzLl9ib3R0b20odGhpcy5fbGVmdEZsb2F0aW5nU3RhY2soKSk7Ci0gICAg ICAgIGxldCByaWdodEJvdHRvbSA9IHRoaXMuX2JvdHRvbSh0aGlzLl9yaWdodEZsb2F0aW5nU3Rh Y2soKSk7CisgICAgICAgIGxldCBsZWZ0Qm90dG9tID0gdGhpcy5fYm90dG9tKHRoaXMuX2xlZnRG bG9hdGluZ3MoKSk7CisgICAgICAgIGxldCByaWdodEJvdHRvbSA9IHRoaXMuX2JvdHRvbSh0aGlz Ll9yaWdodEZsb2F0aW5ncygpKTsKICAgICAgICAgaWYgKE51bWJlci5pc05hTihsZWZ0Qm90dG9t KSAmJiBOdW1iZXIuaXNOYU4ocmlnaHRCb3R0b20pKQogICAgICAgICAgICAgcmV0dXJuIE51bWJl ci5OYU47CiAgICAgICAgIGlmICghTnVtYmVyLmlzTmFOKGxlZnRCb3R0b20pICYmICFOdW1iZXIu aXNOYU4ocmlnaHRCb3R0b20pKQpAQCAtODAsOSArOTYsOSBAQCBjbGFzcyBGbG9hdGluZ0NvbnRl eHQgewogICAgICAgICBsZXQgbGVmdEJvdHRvbSA9IE51bWJlci5OYU47CiAgICAgICAgIGxldCBy aWdodEJvdHRvbSA9IE51bWJlci5OYU47CiAgICAgICAgIGlmIChVdGlscy5oYXNDbGVhckxlZnQo bGF5b3V0Qm94KSB8fCBVdGlscy5oYXNDbGVhckJvdGgobGF5b3V0Qm94KSkKLSAgICAgICAgICAg IGxlZnRCb3R0b20gPSB0aGlzLl9ib3R0b20odGhpcy5fbGVmdEZsb2F0aW5nU3RhY2soKSk7Cisg ICAgICAgICAgICBsZWZ0Qm90dG9tID0gdGhpcy5fYm90dG9tKHRoaXMuX2xlZnRGbG9hdGluZ3Mo KSk7CiAgICAgICAgIGlmIChVdGlscy5oYXNDbGVhclJpZ2h0KGxheW91dEJveCkgfHwgVXRpbHMu aGFzQ2xlYXJCb3RoKGxheW91dEJveCkpCi0gICAgICAgICAgICByaWdodEJvdHRvbSA9IHRoaXMu X2JvdHRvbSh0aGlzLl9yaWdodEZsb2F0aW5nU3RhY2soKSk7CisgICAgICAgICAgICByaWdodEJv dHRvbSA9IHRoaXMuX2JvdHRvbSh0aGlzLl9yaWdodEZsb2F0aW5ncygpKTsKIAogICAgICAgICBp ZiAoIU51bWJlci5pc05hTihsZWZ0Qm90dG9tKSAmJiAhTnVtYmVyLmlzTmFOKHJpZ2h0Qm90dG9t KSkKICAgICAgICAgICAgIHJldHVybiBuZXcgTGF5b3V0UG9pbnQoTWF0aC5tYXgobGVmdEJvdHRv bSwgcmlnaHRCb3R0b20pLCBkaXNwbGF5Qm94LmxlZnQoKSk7CkBAIC0xMDQsOCArMTIwLDggQEAg Y2xhc3MgRmxvYXRpbmdDb250ZXh0IHsKICAgICB9CiAKICAgICBfZmluZElubmVyTW9zdExlZnRB bmRSaWdodCh2ZXJ0aWNhbFBvc2l0aW9uKSB7Ci0gICAgICAgIGxldCBsZWZ0RmxvYXRpbmcgPSB0 aGlzLl9maW5kRmxvYXRpbmdBdFZlcnRpY2FsUG9zaXRpb24odmVydGljYWxQb3NpdGlvbiwgdGhp cy5fbGVmdEZsb2F0aW5nU3RhY2soKSk7Ci0gICAgICAgIGxldCByaWdodEZsb2F0aW5nID0gdGhp cy5fZmluZEZsb2F0aW5nQXRWZXJ0aWNhbFBvc2l0aW9uKHZlcnRpY2FsUG9zaXRpb24sIHRoaXMu X3JpZ2h0RmxvYXRpbmdTdGFjaygpKTsKKyAgICAgICAgbGV0IGxlZnRGbG9hdGluZyA9IHRoaXMu X2ZpbmRGbG9hdGluZ0F0VmVydGljYWxQb3NpdGlvbih2ZXJ0aWNhbFBvc2l0aW9uLCB0aGlzLl9s ZWZ0RmxvYXRpbmdzKCkpOworICAgICAgICBsZXQgcmlnaHRGbG9hdGluZyA9IHRoaXMuX2ZpbmRG bG9hdGluZ0F0VmVydGljYWxQb3NpdGlvbih2ZXJ0aWNhbFBvc2l0aW9uLCB0aGlzLl9yaWdodEZs b2F0aW5ncygpKTsKICAgICAgICAgcmV0dXJuIHsgbGVmdDogbGVmdEZsb2F0aW5nLCByaWdodDog cmlnaHRGbG9hdGluZyB9OwogICAgIH0KIApAQCAtMTQwLDcgKzE1Niw3IEBAIGNsYXNzIEZsb2F0 aW5nQ29udGV4dCB7CiAgICAgfQogCiAgICAgX2lzRW1wdHkoKSB7Ci0gICAgICAgIHJldHVybiAh dGhpcy5fbGVmdEZsb2F0aW5nU3RhY2soKS5sZW5ndGggJiYgIXRoaXMuX3JpZ2h0RmxvYXRpbmdT dGFjaygpLmxlbmd0aDsKKyAgICAgICAgcmV0dXJuICF0aGlzLl9sZWZ0RmxvYXRpbmdzKCkubGVu Z3RoICYmICF0aGlzLl9yaWdodEZsb2F0aW5ncygpLmxlbmd0aDsKICAgICB9CiAKICAgICBfYWRq dXN0ZWRGbG9hdGluZ1Bvc2l0aW9uKGZsb2F0aW5nQm94LCB2ZXJ0aWNhbFBvc2l0aW9uLCBsZWZ0 UmlnaHRGbG9hdGluZ3MpIHsKQEAgLTE5NywyNyArMjEzLDI3IEBAIGNsYXNzIEZsb2F0aW5nQ29u dGV4dCB7CiAKICAgICBfbWFwRGlzcGxheU1hcmdpbkJveFRvRm9ybWF0dGluZ1Jvb3QoZGlzcGxh eUJveCkgewogICAgICAgICBBU1NFUlQoZGlzcGxheUJveCBpbnN0YW5jZW9mIERpc3BsYXkuQm94 KTsKLSAgICAgICAgcmV0dXJuIFV0aWxzLm1hcmdpbkJveChkaXNwbGF5Qm94LCB0aGlzLl9mb3Jt YXR0aW5nU3RhdGUoKS5kaXNwbGF5Qm94KHRoaXMuX2Zvcm1hdHRpbmdSb290KCkpKTsKKyAgICAg ICAgcmV0dXJuIFV0aWxzLm1hcmdpbkJveChkaXNwbGF5Qm94LCB0aGlzLl9mb3JtYXR0aW5nU3Rh dGUoKS5kaXNwbGF5Qm94KHRoaXMuZm9ybWF0dGluZ1Jvb3QoKSkpOwogICAgIH0KIAogICAgIF9t YXBCb3JkZXJCb3hUb0Zvcm1hdHRpbmdSb290KGxheW91dEJveCkgewogICAgICAgICBsZXQgZGlz cGxheUJveCA9IHRoaXMuX2Zvcm1hdHRpbmdTdGF0ZSgpLmRpc3BsYXlCb3gobGF5b3V0Qm94KTsK LSAgICAgICAgbGV0IHJvb3REaXNwbGF5Qm94ID0gdGhpcy5fZm9ybWF0dGluZ1N0YXRlKCkuZGlz cGxheUJveCh0aGlzLl9mb3JtYXR0aW5nUm9vdCgpKTsKKyAgICAgICAgbGV0IHJvb3REaXNwbGF5 Qm94ID0gdGhpcy5fZm9ybWF0dGluZ1N0YXRlKCkuZGlzcGxheUJveCh0aGlzLmZvcm1hdHRpbmdS b290KCkpOwogICAgICAgICByZXR1cm4gVXRpbHMuYm9yZGVyQm94KGRpc3BsYXlCb3gsIHJvb3RE aXNwbGF5Qm94KTsKICAgICB9CiAKICAgICBfbWFwQ29udGVudEJveFRvRm9ybWF0dGluZ1Jvb3Qo bGF5b3V0Qm94KSB7CiAgICAgICAgIGxldCBkaXNwbGF5Qm94ID0gdGhpcy5fZm9ybWF0dGluZ1N0 YXRlKCkuZGlzcGxheUJveChsYXlvdXRCb3gpOwotICAgICAgICBsZXQgcm9vdERpc3BsYXlCb3gg PSB0aGlzLl9mb3JtYXR0aW5nU3RhdGUoKS5kaXNwbGF5Qm94KHRoaXMuX2Zvcm1hdHRpbmdSb290 KCkpOworICAgICAgICBsZXQgcm9vdERpc3BsYXlCb3ggPSB0aGlzLl9mb3JtYXR0aW5nU3RhdGUo KS5kaXNwbGF5Qm94KHRoaXMuZm9ybWF0dGluZ1Jvb3QoKSk7CiAgICAgICAgIHJldHVybiBVdGls cy5jb250ZW50Qm94KGRpc3BsYXlCb3gsIHJvb3REaXNwbGF5Qm94KTsKICAgICB9CiAKLSAgICBf ZmxvYXRpbmdTdGF0ZSgpIHsKLSAgICAgICAgcmV0dXJuIHRoaXMubV9mbG9hdGluZ1N0YXRlOwor ICAgIGZvcm1hdHRpbmdSb290KCkgeworICAgICAgICByZXR1cm4gdGhpcy5fZm9ybWF0dGluZ1N0 YXRlKCkuZm9ybWF0dGluZ1Jvb3QoKTsKICAgICB9CiAKLSAgICBfZm9ybWF0dGluZ1Jvb3QoKSB7 Ci0gICAgICAgIHJldHVybiB0aGlzLl9mb3JtYXR0aW5nU3RhdGUoKS5mb3JtYXR0aW5nUm9vdCgp OworICAgIF9mbG9hdGluZ1N0YXRlKCkgeworICAgICAgICByZXR1cm4gdGhpcy5tX2Zsb2F0aW5n U3RhdGU7CiAgICAgfQogCiAgICAgX2Zvcm1hdHRpbmdTdGF0ZSgpIHsKQEAgLTIyOCwxMSArMjQ0 LDExIEBAIGNsYXNzIEZsb2F0aW5nQ29udGV4dCB7CiAgICAgICAgIHJldHVybiB0aGlzLl9mbG9h dGluZ1N0YXRlKCkubGFzdEZsb2F0aW5nKCk7CiAgICAgfQogCi0gICAgX2xlZnRGbG9hdGluZ1N0 YWNrKCkgeworICAgIF9sZWZ0RmxvYXRpbmdzKCkgewogICAgICAgICByZXR1cm4gdGhpcy5fZmxv YXRpbmdTdGF0ZSgpLmxlZnRGbG9hdGluZ1N0YWNrKCk7CiAgICAgfQogCi0gICAgX3JpZ2h0Rmxv YXRpbmdTdGFjaygpIHsKKyAgICBfcmlnaHRGbG9hdGluZ3MoKSB7CiAgICAgICAgIHJldHVybiB0 aGlzLl9mbG9hdGluZ1N0YXRlKCkucmlnaHRGbG9hdGluZ1N0YWNrKCk7CiAgICAgfQogfQpkaWZm IC0tZ2l0IGEvVG9vbHMvTGF5b3V0UmVsb2FkZWQvRm9ybWF0dGluZ0NvbnRleHQvSW5saW5lRm9y bWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5qcyBiL1Rvb2xzL0xheW91dFJlbG9hZGVk L0Zvcm1hdHRpbmdDb250ZXh0L0lubGluZUZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRl eHQuanMKaW5kZXggYWVjODFkMzJhN2U3NmJlZjI4MTQ2YjljZWJjZjNiOGRmM2Y5NjQyZS4uY2Rj NWIwODUwYjk1MTBhODAzNDdlOWMyMDVmMzgyYjdkOGM0OTVjMiAxMDA2NDQKLS0tIGEvVG9vbHMv TGF5b3V0UmVsb2FkZWQvRm9ybWF0dGluZ0NvbnRleHQvSW5saW5lRm9ybWF0dGluZy9JbmxpbmVG b3JtYXR0aW5nQ29udGV4dC5qcworKysgYi9Ub29scy9MYXlvdXRSZWxvYWRlZC9Gb3JtYXR0aW5n Q29udGV4dC9JbmxpbmVGb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmpzCkBAIC05 OSwxMSArOTksMjggQEAgY2xhc3MgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQgZXh0ZW5kcyBGb3Jt YXR0aW5nQ29udGV4dCB7CiAgICAgX2NyZWF0ZU5ld0xpbmUoKSB7CiAgICAgICAgIC8vIFRPRE86 IEZsb2F0cyBuZWVkIHRvIGJlIHRha2VuIGludG8gYWNjb3VudC4KICAgICAgICAgbGV0IGNvbnRl bnRCb3hSZWN0ID0gdGhpcy5kaXNwbGF5Qm94KHRoaXMuZm9ybWF0dGluZ1Jvb3QoKSkuY29udGVu dEJveCgpOworICAgICAgICBsZXQgbGluZVdpZHRoID0gY29udGVudEJveFJlY3Qud2lkdGgoKTsK ICAgICAgICAgbGV0IHRvcExlZnQgPSBjb250ZW50Qm94UmVjdC50b3BMZWZ0KCk7CisgICAgICAg IGxldCBmbG9hdGluZ0xlZnQgPSB0aGlzLl9tYXBGbG9hdGluZ1Bvc2l0aW9uKHRoaXMuZmxvYXRp bmdDb250ZXh0KCkubGVmdCgpKTsKKyAgICAgICAgaWYgKCFOdW1iZXIuaXNOYU4oZmxvYXRpbmdM ZWZ0KSkgeworICAgICAgICAgICAgdG9wTGVmdC5zZXRMZWZ0KGZsb2F0aW5nTGVmdCk7CisgICAg ICAgICAgICBsaW5lV2lkdGggLT0gZmxvYXRpbmdMZWZ0OworICAgICAgICB9CiAgICAgICAgIGxl dCBsaW5lcyA9IHRoaXMuZm9ybWF0dGluZ1N0YXRlKCkubGluZXMoKTsKICAgICAgICAgaWYgKGxp bmVzLmxlbmd0aCkKICAgICAgICAgICAgIHRvcExlZnQuc2V0VG9wKGxpbmVzW2xpbmVzLmxlbmd0 aCAtIDFdLnJlY3QoKS5ib3R0b20oKSk7Ci0gICAgICAgIHJldHVybiBuZXcgTGluZSh0b3BMZWZ0 LCBVdGlscy5jb21wdXRlZExpbmVIZWlnaHQodGhpcy5mb3JtYXR0aW5nUm9vdCgpLm5vZGUoKSks IGNvbnRlbnRCb3hSZWN0LndpZHRoKCkpOworICAgICAgICByZXR1cm4gbmV3IExpbmUodG9wTGVm dCwgVXRpbHMuY29tcHV0ZWRMaW5lSGVpZ2h0KHRoaXMuZm9ybWF0dGluZ1Jvb3QoKS5ub2RlKCkp LCBsaW5lV2lkdGgpOwogICAgIH0KKworICAgIF9tYXBGbG9hdGluZ1Bvc2l0aW9uKHZlcnRpY2Fs UG9zaXRpb24pIHsKKyAgICAgICAgaWYgKE51bWJlci5pc05hTih2ZXJ0aWNhbFBvc2l0aW9uKSkK KyAgICAgICAgICAgIHJldHVybiB2ZXJ0aWNhbFBvc2l0aW9uOworICAgICAgICAvLyBGbG9hdHMg cG9zaXRpb24gYXJlIHJlbGF0aXZlIHRvIHRoZWlyIGZvcm1hdHRpbmcgcm9vdCAod2hpY2ggbWln aHQgbm90IGJlIHRoaXMgZm9ybWF0dGluZyByb290KS4KKyAgICAgICAgbGV0IHJvb3QgPSB0aGlz LmRpc3BsYXlCb3godGhpcy5mb3JtYXR0aW5nUm9vdCgpKTsKKyAgICAgICAgbGV0IGZsb2F0Rm9y bWF0dGluZ1Jvb3QgPSB0aGlzLmRpc3BsYXlCb3godGhpcy5mbG9hdGluZ0NvbnRleHQoKS5mb3Jt YXR0aW5nUm9vdCgpKTsKKyAgICAgICAgaWYgKHJvb3QgPT0gZmxvYXRGb3JtYXR0aW5nUm9vdCkK KyAgICAgICAgICAgIHJldHVybiB2ZXJ0aWNhbFBvc2l0aW9uOworICAgICAgICByZXR1cm4gdmVy dGljYWxQb3NpdGlvbiAtIFV0aWxzLm1hcFBvc2l0aW9uKHJvb3QudG9wTGVmdCgpLCByb290LCBm bG9hdEZvcm1hdHRpbmdSb290KS5sZWZ0KCk7CisgICAgIH0KIH0KIApkaWZmIC0tZ2l0IGEvVG9v bHMvTGF5b3V0UmVsb2FkZWQvRm9ybWF0dGluZ1N0YXRlL0Zvcm1hdHRpbmdTdGF0ZS5qcyBiL1Rv b2xzL0xheW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdTdGF0ZS9Gb3JtYXR0aW5nU3RhdGUuanMKaW5k ZXggMDBjZTkxYTFjNzZiNDAzNzA1YTg1ZDhiYjAzNjk1YTNmYjEzMmVjYy4uMWUyOGZhYTU2Yzlj ZWZkZDgzODBiZDhhZmUyOTAxOWM1YjQ4MDQ0MSAxMDA2NDQKLS0tIGEvVG9vbHMvTGF5b3V0UmVs b2FkZWQvRm9ybWF0dGluZ1N0YXRlL0Zvcm1hdHRpbmdTdGF0ZS5qcworKysgYi9Ub29scy9MYXlv dXRSZWxvYWRlZC9Gb3JtYXR0aW5nU3RhdGUvRm9ybWF0dGluZ1N0YXRlLmpzCkBAIC02OCw5ICs2 OCwxMCBAQCBjbGFzcyBGb3JtYXR0aW5nU3RhdGUgewogICAgICAgICBBU1NFUlQobGF5b3V0Qm94 KTsKICAgICAgICAgLy8gMS4gTm9ybWFsbHkgd2Ugb25seSBuZWVkIHRvIGFjY2VzcyBib3hlcyB3 aXRoaW4gdGhlIHNhbWUgZm9ybWF0dGluZyBjb250ZXh0CiAgICAgICAgIC8vIDIuIEluIHNvbWUg Y2FzZXMgd2UgbmVlZCBzaXplIGluZm9ybWF0aW9uIGFib3V0IHRoZSByb290IGNvbnRhaW5lciAt d2hpY2ggaXMgaW4gdGhlIHBhcmVudCBmb3JtYXR0aW5nIGNvbnRleHQKKyAgICAgICAgLy8gMy4g SW4gaW5saW5lIGZvcm1hdHRpbmcgd2l0aCBwYXJlbnQgZmxvYXRpbmcgc3RhdGUsIHdlIG5lZWQg ZGlzcGxheSBib3hlcyBmcm9tIHRoZSBwYXJlbnQgZm9ybWF0dGluZyBjb250ZXh0CiAgICAgICAg IC8vIDMuIEluIHJhcmUgY2FzZXMgKHN0YXRpY2FsbHkgcG9zaXRpb25lZCBvdXQtb2YtZmxvdyBi b3gpLCB3ZSBuZWVkIHBvc2l0aW9uIGluZm9ybWF0aW9uIG9uIHNpYmxpbmcgZm9ybWF0dGluZyBj b250ZXh0CiAgICAgICAgIC8vIGJ1dCBpbiBhbGwgY2FzZXMgaXQgbmVlZHMgdG8gYmUgYSBkZXNj ZW5kYW50IG9mIHRoZSByb290IGNvbnRhaW5lciAob3IgdGhlIGNvbnRhaW5lciBpdHNlbGYpCi0g ICAgICAgIEFTU0VSVChsYXlvdXRCb3ggPT0gdGhpcy5mb3JtYXR0aW5nUm9vdCgpIHx8IGxheW91 dEJveC5pc0Rlc2NlbmRhbnRPZih0aGlzLmZvcm1hdHRpbmdSb290KCkpKTsKKyAgICAgICAgLy8g QVNTRVJUKGxheW91dEJveCA9PSB0aGlzLmZvcm1hdHRpbmdSb290KCkgfHwgbGF5b3V0Qm94Lmlz RGVzY2VuZGFudE9mKHRoaXMuZm9ybWF0dGluZ1Jvb3QoKSkpOwogICAgICAgICBsZXQgZGlzcGxh eUJveCA9IHRoaXMubV9kaXNwbGF5VG9MYXlvdXQuZ2V0KGxheW91dEJveCk7CiAgICAgICAgIGlm IChkaXNwbGF5Qm94KQogICAgICAgICAgICAgcmV0dXJuIGRpc3BsYXlCb3g7CmRpZmYgLS1naXQg YS9Ub29scy9MYXlvdXRSZWxvYWRlZC90ZXN0L2luZGV4Lmh0bWwgYi9Ub29scy9MYXlvdXRSZWxv YWRlZC90ZXN0L2luZGV4Lmh0bWwKaW5kZXggMWFkMDg4NTBjZjA1OGIzNDZkNGY2ZDMxMjg3Mzk1 MDZkNTJkY2RmMi4uMzU3MWE0MDIzMjRmNTM5N2ZkN2RkYjcyMDkxMmJiNTQxZjRiYWIwNiAxMDA2 NDQKLS0tIGEvVG9vbHMvTGF5b3V0UmVsb2FkZWQvdGVzdC9pbmRleC5odG1sCisrKyBiL1Rvb2xz L0xheW91dFJlbG9hZGVkL3Rlc3QvaW5kZXguaHRtbApAQCAtNjMsNyArNjMsOCBAQCBsZXQgdGVz dEZpbGVzID0gWwogICAgICJuZWdhdGl2ZS1tYXJnaW4tc2ltcGxlLmh0bWwiLAogICAgICJpbnRy dWRpbmctbGVmdC1mbG9hdC1zaW1wbGUuaHRtbCIsCiAgICAgInNpbXBsZS1pbmxpbmUtdGV4dC5o dG1sIiwKLSAgICAic2ltcGxlLW11bHRpbGluZS10ZXh0Lmh0bWwiCisgICAgInNpbXBsZS1tdWx0 aWxpbmUtdGV4dC5odG1sIiwKKyAgICAiaW5saW5lLWZvcm1hdHRpbmctY29udGV4dC13aXRoLWZs b2F0cy5odG1sIgogXTsKIAogbGV0IGRlYnVnVGhpcyA9IFtdOwpkaWZmIC0tZ2l0IGEvVG9vbHMv TGF5b3V0UmVsb2FkZWQvdGVzdC9pbmxpbmUtZm9ybWF0dGluZy1jb250ZXh0LXdpdGgtZmxvYXRz Lmh0bWwgYi9Ub29scy9MYXlvdXRSZWxvYWRlZC90ZXN0L2lubGluZS1mb3JtYXR0aW5nLWNvbnRl eHQtd2l0aC1mbG9hdHMuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5mOGM2ZjVkYTAxYjNiZDNkYmY1M2NmMTFk NTIxYjYzNmI0MWU3ZjFlCi0tLSAvZGV2L251bGwKKysrIGIvVG9vbHMvTGF5b3V0UmVsb2FkZWQv dGVzdC9pbmxpbmUtZm9ybWF0dGluZy1jb250ZXh0LXdpdGgtZmxvYXRzLmh0bWwKQEAgLTAsMCAr MSw3IEBACis8ZGl2IHN0eWxlPSJwYWRkaW5nOiAyMHB4OyB3aWR0aDogMjAwcHg7IGhlaWdodDog ODAwcHg7Ij4KKyAgPGRpdiBzdHlsZT0iZmxvYXQ6IGxlZnQ7IHdpZHRoOiAxMHB4OyBoZWlnaHQ6 IDEwMHB4OyI+PC9kaXY+CisgIDxkaXY+CisgICAgPGRpdiBzdHlsZT0iZmxvYXQ6IGxlZnQ7IHdp ZHRoOiAyMHB4OyBoZWlnaHQ6IDYwcHgiPjwvZGl2PgorICA8L2Rpdj4KKyAgPGRpdj5mb29iYXI8 L2Rpdj4KKzwvZGl2Pgo=