184349 2018-04-05 19:08:15 -0700 [LayoutReloaded] Move floating box to the next line when needed 2018-04-05 19:13:27 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham simon.fraser webkit-bug-importer zalan oldest_to_newest 1412248 0 zalan 2018-04-05 19:08:15 -0700 ssia. 1412249 1 337328 zalan 2018-04-05 19:09:50 -0700 Created attachment 337328 Patch 1412252 2 zalan 2018-04-05 19:12:31 -0700 Committed r230318: <https://trac.webkit.org/changeset/230318> 1412254 3 webkit-bug-importer 2018-04-05 19:13:27 -0700 <rdar://problem/39228199> 337328 2018-04-05 19:09:50 -0700 2018-04-05 19:09:50 -0700 Patch bug-184349-20180405190949.patch text/plain 10606 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjMwMzE3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNjRlYTJiMjBmMmJmNWYyYmUxYjVmYzY3NjYxMTYzZTM3 ZWEyYmRkMC4uMTI4ZTNiMzFlZDU3ZWJlYWUxMjRkZmFkM2M1NTZiMDU5ZDVlZDY4ZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5 IEBACisyMDE4LTA0LTA1ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAg ICAgW0xheW91dFJlbG9hZGVkXSBNb3ZlIGZsb2F0aW5nIGJveCB0byB0aGUgbmV4dCBsaW5lIHdo ZW4gbmVlZGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xODQzNDkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIExheW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdDb250ZXh0L0lubGluZUZvcm1hdHRpbmcvSW5s aW5lRm9ybWF0dGluZ0NvbnRleHQuanM6CisgICAgICAgIChJbmxpbmVGb3JtYXR0aW5nQ29udGV4 dC5wcm90b3R5cGUubGF5b3V0KToKKyAgICAgICAgKElubGluZUZvcm1hdHRpbmdDb250ZXh0LnBy b3RvdHlwZS5faGFuZGxlQ29udGVudCk6CisgICAgICAgIChJbmxpbmVGb3JtYXR0aW5nQ29udGV4 dC5wcm90b3R5cGUuX2hhbmRsZVRleHQpOgorICAgICAgICAoSW5saW5lRm9ybWF0dGluZ0NvbnRl eHQucHJvdG90eXBlLl9oYW5kbGVGbG9hdGluZ0JveCk6CisgICAgICAgIChJbmxpbmVGb3JtYXR0 aW5nQ29udGV4dC5wcm90b3R5cGUuX21hcEZsb2F0aW5nSG9yaXpvbnRhbFBvc2l0aW9uKToKKyAg ICAgICAgKElubGluZUZvcm1hdHRpbmdDb250ZXh0KToKKyAgICAgICAgKElubGluZUZvcm1hdHRp bmdDb250ZXh0LnByb3RvdHlwZS5faGFuZGxlRmxvYXRpbmdCb3hlcyk6IERlbGV0ZWQuCisgICAg ICAgIChJbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5wcm90b3R5cGUuX2Zsb2F0aW5nQm94ZXMpOiBE ZWxldGVkLgorICAgICAgICAqIExheW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdDb250ZXh0L0lubGlu ZUZvcm1hdHRpbmcvTGluZS5qczoKKyAgICAgICAgKExpbmUucHJvdG90eXBlLmFkZFRleHRMaW5l Qm94KToKKyAgICAgICAgKExpbmUucHJvdG90eXBlLmFkZEZsb2F0aW5nQm94KToKKyAgICAgICAg KExpbmUpOgorICAgICAgICAqIExheW91dFJlbG9hZGVkL1V0aWxzLmpzOgorICAgICAgICAoTGF5 b3V0UmVjdC5wcm90b3R5cGUubW92ZUhvcml6b250YWxseSk6CisgICAgICAgIChMYXlvdXRSZWN0 LnByb3RvdHlwZS5tb3ZlVmVydGljYWxseSk6CisgICAgICAgICogTGF5b3V0UmVsb2FkZWQvdGVz dC9pbmRleC5odG1sOgorICAgICAgICAqIExheW91dFJlbG9hZGVkL3Rlc3QvaW5saW5lLXdpdGgt ZmxvYXRzLXdoZW4tdGhleS1kb250LWZpdC5odG1sOiBBZGRlZC4KKwogMjAxOC0wNC0wNSAgQnJh ZHkgRWlkc29uICA8YmVpZHNvbkBhcHBsZS5jb20+CiAKICAgICAgICAgUHJvY2VzcyBTd2FwIG9u IE5hdmlnYXRpb24gY2F1c2VzIG1hbnkgd2VicGFnZXMgdG8gaGFuZyBkdWUgdG8gYXR0ZW1wdGVk IHByb2Nlc3Mgc3dhcCBmb3IgaWZyYW1lIG5hdmlnYXRpb25zLgpkaWZmIC0tZ2l0IGEvVG9vbHMv TGF5b3V0UmVsb2FkZWQvRm9ybWF0dGluZ0NvbnRleHQvSW5saW5lRm9ybWF0dGluZy9JbmxpbmVG b3JtYXR0aW5nQ29udGV4dC5qcyBiL1Rvb2xzL0xheW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdDb250 ZXh0L0lubGluZUZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuanMKaW5kZXggMmEw MzRkMDMzYThmNTk2OGEyZTc2ZDNhMjczNDk5ZDFmZjgyZmZlZi4uYmQzZjYyMmJkMDRjZTZhYTUx ZWQzZGI1NmI4NGFhMTZlMjk2MDc3YiAxMDA2NDQKLS0tIGEvVG9vbHMvTGF5b3V0UmVsb2FkZWQv Rm9ybWF0dGluZ0NvbnRleHQvSW5saW5lRm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4 dC5qcworKysgYi9Ub29scy9MYXlvdXRSZWxvYWRlZC9Gb3JtYXR0aW5nQ29udGV4dC9JbmxpbmVG b3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmpzCkBAIC0zNywxMCArMzcsNyBAQCBj bGFzcyBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCBleHRlbmRzIEZvcm1hdHRpbmdDb250ZXh0IHsK ICAgICAgICAgLy8gVGhpcyBpcyBhIHBvc3Qtb3JkZXIgdHJlZSB0cmF2ZXJzYWwgbGF5b3V0Lgog ICAgICAgICAvLyBUaGUgcm9vdCBjb250YWluZXIgbGF5b3V0IGlzIGRvbmUgaW4gdGhlIGZvcm1h dHRpbmcgY29udGV4dCBpdCBsaXZlcyBpbiwgbm90IHRoYXQgb25lIGl0IGNyZWF0ZXMsIHNvIGxl dCdzIHN0YXJ0IHdpdGggdGhlIGZpcnN0IGNoaWxkLgogICAgICAgICB0aGlzLm1fbGluZSA9IHRo aXMuX2NyZWF0ZU5ld0xpbmUoKTsKLSAgICAgICAgLy8gQ29sbGVjdCBmbG9hdGluZyBib3hlcyBh bmQgbGF5b3V0IHRoZW0gZmlyc3QuCi0gICAgICAgIHRoaXMuX2hhbmRsZUZsb2F0aW5nQm94ZXMo KTsKLSAgICAgICAgLy8KLSAgICAgICAgdGhpcy5fYWRkVG9MYXlvdXRRdWV1ZSh0aGlzLmZvcm1h dHRpbmdSb290KCkuZmlyc3RJbkZsb3dDaGlsZCgpKTsKKyAgICAgICAgdGhpcy5fYWRkVG9MYXlv dXRRdWV1ZSh0aGlzLmZvcm1hdHRpbmdSb290KCkuZmlyc3RJbkZsb3dPckZsb2F0Q2hpbGQoKSk7 CiAgICAgICAgIHdoaWxlICh0aGlzLl9kZXNjZW5kYW50TmVlZHNMYXlvdXQoKSkgewogICAgICAg ICAgICAgLy8gVHJhdmVycyBkb3duIG9uIHRoZSBkZXNjZW5kYW50cyB1bnRpbCB3ZSBmaW5kIGEg bGVhZiBub2RlLgogICAgICAgICAgICAgd2hpbGUgKHRydWUpIHsKQEAgLTQ5LDE4ICs0NiwxNyBA QCBjbGFzcyBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCBleHRlbmRzIEZvcm1hdHRpbmdDb250ZXh0 IHsKICAgICAgICAgICAgICAgICAgICAgdGhpcy5sYXlvdXRTdGF0ZSgpLmxheW91dChsYXlvdXRC b3gpOwogICAgICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgICAgICB9Ci0gICAg ICAgICAgICAgICAgaWYgKCFsYXlvdXRCb3guaXNDb250YWluZXIoKSB8fCAhbGF5b3V0Qm94Lmhh c0NoaWxkKCkpCisgICAgICAgICAgICAgICAgaWYgKCFsYXlvdXRCb3guaXNDb250YWluZXIoKSB8 fCAhbGF5b3V0Qm94Lmhhc0luRmxvd09yRmxvYXRDaGlsZCgpKQogICAgICAgICAgICAgICAgICAg ICBicmVhazsKLSAgICAgICAgICAgICAgICB0aGlzLl9hZGRUb0xheW91dFF1ZXVlKGxheW91dEJv eC5maXJzdEluRmxvd0NoaWxkKCkpOworICAgICAgICAgICAgICAgIHRoaXMuX2FkZFRvTGF5b3V0 UXVldWUobGF5b3V0Qm94LmZpcnN0SW5GbG93T3JGbG9hdENoaWxkKCkpOwogICAgICAgICAgICAg fQogICAgICAgICAgICAgd2hpbGUgKHRoaXMuX2Rlc2NlbmRhbnROZWVkc0xheW91dCgpKSB7CiAg ICAgICAgICAgICAgICAgbGV0IGxheW91dEJveCA9IHRoaXMuX25leHRJbkxheW91dFF1ZXVlKCk7 Ci0gICAgICAgICAgICAgICAgaWYgKGxheW91dEJveCBpbnN0YW5jZW9mIExheW91dC5JbmxpbmVC b3gpCi0gICAgICAgICAgICAgICAgICAgIHRoaXMuX2hhbmRsZUlubGluZUJveChsYXlvdXRCb3gp OworICAgICAgICAgICAgICAgIHRoaXMuX2hhbmRsZUNvbnRlbnQobGF5b3V0Qm94KTsKICAgICAg ICAgICAgICAgICAvLyBXZSBhcmUgZG9uZSB3aXRoIGxheWluZyBvdXQgdGhpcyBib3guCiAgICAg ICAgICAgICAgICAgdGhpcy5fcmVtb3ZlRnJvbUxheW91dFF1ZXVlKGxheW91dEJveCk7Ci0gICAg ICAgICAgICAgICAgaWYgKGxheW91dEJveC5uZXh0SW5GbG93U2libGluZygpKSB7Ci0gICAgICAg ICAgICAgICAgICAgIHRoaXMuX2FkZFRvTGF5b3V0UXVldWUobGF5b3V0Qm94Lm5leHRJbkZsb3dT aWJsaW5nKCkpOworICAgICAgICAgICAgICAgIGlmIChsYXlvdXRCb3gubmV4dEluRmxvd09yRmxv YXRTaWJsaW5nKCkpIHsKKyAgICAgICAgICAgICAgICAgICAgdGhpcy5fYWRkVG9MYXlvdXRRdWV1 ZShsYXlvdXRCb3gubmV4dEluRmxvd09yRmxvYXRTaWJsaW5nKCkpOwogICAgICAgICAgICAgICAg ICAgICBicmVhazsKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9CkBAIC02OSw2ICs2 NSwxOCBAQCBjbGFzcyBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCBleHRlbmRzIEZvcm1hdHRpbmdD b250ZXh0IHsKICAgICAgICAgdGhpcy5fY29tbWl0TGluZSgpOwogICAgfQogCisgICAgX2hhbmRs ZUNvbnRlbnQobGF5b3V0Qm94KSB7CisgICAgICAgIGlmIChsYXlvdXRCb3ggaW5zdGFuY2VvZiBM YXlvdXQuSW5saW5lQm94KSB7CisgICAgICAgICAgICB0aGlzLl9oYW5kbGVJbmxpbmVCb3gobGF5 b3V0Qm94KTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQorICAgICAgICBpZiAobGF5 b3V0Qm94LmlzRmxvYXRpbmdQb3NpdGlvbmVkKCkpIHsKKyAgICAgICAgICAgIHRoaXMuX2hhbmRs ZUZsb2F0aW5nQm94KGxheW91dEJveCk7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0K KyAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgfQorCiAgICAgX2hhbmRsZUlubGlu ZUJveChpbmxpbmVCb3gpIHsKICAgICAgICAgaWYgKGlubGluZUJveC50ZXh0KCkpCiAgICAgICAg ICAgICByZXR1cm4gdGhpcy5faGFuZGxlVGV4dChpbmxpbmVCb3gpOwpAQCAtODUsMjUgKzkzLDIy IEBAIGNsYXNzIElubGluZUZvcm1hdHRpbmdDb250ZXh0IGV4dGVuZHMgRm9ybWF0dGluZ0NvbnRl eHQgewogICAgICAgICAgICAgZm9yIChsZXQgcnVuIG9mIHRleHRSdW5zKQogICAgICAgICAgICAg ICAgIHRoaXMuX2xpbmUoKS5hZGRUZXh0TGluZUJveChydW4uc3RhcnRQb3NpdGlvbiwgcnVuLmVu ZFBvc2l0aW9uLCBuZXcgTGF5b3V0U2l6ZShydW4ud2lkdGgsIFV0aWxzLnRleHRIZWlnaHQoaW5s aW5lQm94KSkpOwogICAgICAgICAgICAgdGV4dCA9IHRleHQuc2xpY2UodGV4dFJ1bnNbdGV4dFJ1 bnMubGVuZ3RoIC0gMV0uZW5kUG9zaXRpb24sIHRleHQubGVuZ3RoKTsKLSAgICAgICAgICAgIHRo aXMuX2NvbW1pdExpbmUoKTsKLSAgICAgICAgfQotICAgIH0KLQotICAgIF9oYW5kbGVGbG9hdGlu Z0JveGVzKCkgewotICAgICAgICBsZXQgZmxvYXRpbmdCb3hlcyA9IHRoaXMuX2Zsb2F0aW5nQm94 ZXMoKTsKLSAgICAgICAgZm9yIChsZXQgZmxvYXRpbmdCb3ggb2YgZmxvYXRpbmdCb3hlcykgewot ICAgICAgICAgICAgdGhpcy5fYWRkVG9MYXlvdXRRdWV1ZShmbG9hdGluZ0JveCk7Ci0gICAgICAg ICAgICB0aGlzLl9oYW5kbGVGbG9hdGluZ0JveChmbG9hdGluZ0JveCk7Ci0gICAgICAgICAgICB0 aGlzLl9yZW1vdmVGcm9tTGF5b3V0UXVldWUoZmxvYXRpbmdCb3gpOworICAgICAgICAgICAgLy8g Q29tbWl0IHRoZSBsaW5lIHVubGVzcyB3ZSBydW4gb3V0IG9mIGNvbnRlbnQuCisgICAgICAgICAg ICBpZiAodGV4dC5sZW5ndGgpCisgICAgICAgICAgICAgICAgdGhpcy5fY29tbWl0TGluZSgpOwog ICAgICAgICB9CiAgICAgfQogCiAgICAgX2hhbmRsZUZsb2F0aW5nQm94KGZsb2F0aW5nQm94KSB7 Ci0gICAgICAgIHRoaXMubGF5b3V0U3RhdGUoKS5sYXlvdXQoZmxvYXRpbmdCb3gpOwogICAgICAg ICB0aGlzLl9jb21wdXRlRmxvYXRpbmdXaWR0aChmbG9hdGluZ0JveCk7CiAgICAgICAgIHRoaXMu X2NvbXB1dGVGbG9hdGluZ0hlaWdodChmbG9hdGluZ0JveCk7CisgICAgICAgIGxldCBkaXNwbGF5 RmxvYXRpbmdCb3ggPSB0aGlzLmRpc3BsYXlCb3goZmxvYXRpbmdCb3gpOworICAgICAgICBpZiAo ZGlzcGxheUZsb2F0aW5nQm94LndpZHRoKCkgPiB0aGlzLl9saW5lKCkuYXZhaWxhYmxlV2lkdGgo KSkKKyAgICAgICAgICAgIHRoaXMuX2NvbW1pdExpbmUoKTsKKyAgICAgICAgLy8gUG9zaXRpb24g dGhpcyBmbG9hdCBzdGF0aWNhbGx5IGZpcnN0LCB0aGUgZmxvYXRpbmcgY29udGV4dCB3aWxsIGZp Z3VyZSBpdCBvdXQgdGhlIGZpbmFsIHBvc2l0aW9uLgorICAgICAgICBkaXNwbGF5RmxvYXRpbmdC b3guc2V0VG9wTGVmdCh0aGlzLl9saW5lKCkucmVjdCgpLnRvcExlZnQoKSk7CiAgICAgICAgIHRo aXMuZmxvYXRpbmdDb250ZXh0KCkuY29tcHV0ZVBvc2l0aW9uKGZsb2F0aW5nQm94KTsKLSAgICAg ICAgdGhpcy5fbGluZSgpLmFkZEZsb2F0aW5nQm94KHRoaXMuZGlzcGxheUJveChmbG9hdGluZ0Jv eCkuc2l6ZSgpKTsKKyAgICAgICAgdGhpcy5fbGluZSgpLmFkZEZsb2F0aW5nQm94KGRpc3BsYXlG bG9hdGluZ0JveC5zaXplKCkpOwogICAgIH0KIAogICAgIF9jb21taXRMaW5lKCkgewpAQCAtMTY0 LDMzICsxNjksNSBAQCBjbGFzcyBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCBleHRlbmRzIEZvcm1h dHRpbmdDb250ZXh0IHsKICAgICAgICAgICAgIHJldHVybiByb290LmNvbnRlbnRCb3goKS5sZWZ0 KCk7CiAgICAgICAgIHJldHVybiBob3Jpem9udGFsUG9zaXRpb24gLSByb290TGVmdDsKICAgICAg fQotCi0gICAgX2Zsb2F0aW5nQm94ZXMoKSB7Ci0gICAgICAgIEFTU0VSVCh0aGlzLmZvcm1hdHRp bmdSb290KCkuZmlyc3RDaGlsZCgpKTsKLSAgICAgICAgLy8gRklYTUU6IFRoaXMgaXMgaGlnaGx5 IGluZWZmaWNpZW50IGJ1dCB3aWxsIGRvIGZvciBub3cuCi0gICAgICAgIGxldCBmbG9hdGluZ0Jv eGVzID0gbmV3IEFycmF5KCk7Ci0gICAgICAgIGxldCBzdGFjayA9IG5ldyBBcnJheSgpOwotICAg ICAgICBzdGFjay5wdXNoKHRoaXMuZm9ybWF0dGluZ1Jvb3QoKS5maXJzdENoaWxkKCkpOwotICAg ICAgICB3aGlsZSAoc3RhY2subGVuZ3RoKSB7Ci0gICAgICAgICAgICB3aGlsZSAodHJ1ZSkgewot ICAgICAgICAgICAgICAgIGxldCBib3ggPSBzdGFja1tzdGFjay5sZW5ndGggLSAxXTsKLSAgICAg ICAgICAgICAgICBpZiAoYm94LmlzRmxvYXRpbmdQb3NpdGlvbmVkKCkpCi0gICAgICAgICAgICAg ICAgICAgIGZsb2F0aW5nQm94ZXMucHVzaChib3gpOwotICAgICAgICAgICAgICAgIGlmIChib3gu ZXN0YWJsaXNoZXNGb3JtYXR0aW5nQ29udGV4dCgpKQotICAgICAgICAgICAgICAgICAgICBicmVh azsKLSAgICAgICAgICAgICAgICBpZiAoIWJveC5pc0NvbnRhaW5lcigpIHx8ICFib3guaGFzQ2hp bGQoKSkKLSAgICAgICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICAgICAgc3RhY2su cHVzaChib3guZmlyc3RDaGlsZCgpKTsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICAgIHdoaWxl IChzdGFjay5sZW5ndGgpIHsKLSAgICAgICAgICAgICAgICBsZXQgYm94ID0gc3RhY2sucG9wKCk7 Ci0gICAgICAgICAgICAgICAgaWYgKGJveC5uZXh0U2libGluZygpKSB7Ci0gICAgICAgICAgICAg ICAgICAgIHN0YWNrLnB1c2goYm94Lm5leHRTaWJsaW5nKCkpOwotICAgICAgICAgICAgICAgICAg ICBicmVhazsKLSAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICB9Ci0gICAgICAgIH0KLSAg ICAgICAgcmV0dXJuIGZsb2F0aW5nQm94ZXM7Ci0gICAgfQogfQogCmRpZmYgLS1naXQgYS9Ub29s cy9MYXlvdXRSZWxvYWRlZC9Gb3JtYXR0aW5nQ29udGV4dC9JbmxpbmVGb3JtYXR0aW5nL0xpbmUu anMgYi9Ub29scy9MYXlvdXRSZWxvYWRlZC9Gb3JtYXR0aW5nQ29udGV4dC9JbmxpbmVGb3JtYXR0 aW5nL0xpbmUuanMKaW5kZXggMGIyNjM1NTFkZWFmMGZmYzVlYWMwMDgxMjNiYTdlMzI0YjY2M2M1 My4uNjA1NDExMzExMWI1N2JhZDdkMWFkOTlkNzQyZWZmZTkyNDk4MThlYiAxMDA2NDQKLS0tIGEv VG9vbHMvTGF5b3V0UmVsb2FkZWQvRm9ybWF0dGluZ0NvbnRleHQvSW5saW5lRm9ybWF0dGluZy9M aW5lLmpzCisrKyBiL1Rvb2xzL0xheW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdDb250ZXh0L0lubGlu ZUZvcm1hdHRpbmcvTGluZS5qcwpAQCAtNDcsNiArNDcsNyBAQCBjbGFzcyBMaW5lIHsKICAgICB9 CiAKICAgICBhZGRUZXh0TGluZUJveChzdGFydFBvc2l0aW9uLCBlbmRQb3NpdGlvbiwgc2l6ZSkg eworICAgICAgICBBU1NFUlQoc2l6ZS53aWR0aCgpIDw9IHRoaXMubV9hdmFpbGFibGVXaWR0aCk7 CiAgICAgICAgIHRoaXMubV9hdmFpbGFibGVXaWR0aCAtPSBzaXplLndpZHRoKCk7CiAgICAgICAg IC8vIFRPRE86IHVzZSB0aGUgYWN0dWFsIGhlaWdodCBpbnN0ZWFkIG9mIHRoZSBsaW5lIGhlaWdo dC4KICAgICAgICAgbGV0IGxpbmVCb3hSZWN0ID0gbmV3IExheW91dFJlY3QodGhpcy5yZWN0KCku dG9wUmlnaHQoKSwgbmV3IExheW91dFNpemUoc2l6ZS53aWR0aCgpLCB0aGlzLnJlY3QoKS5oZWln aHQoKSkpOwpAQCAtNTUsOCArNTYsMTEgQEAgY2xhc3MgTGluZSB7CiAgICAgfQogCiAgICAgYWRk RmxvYXRpbmdCb3goc2l6ZSkgewotICAgICAgICAvLyBUT0RPOiBBZGQgbWlzc2luZyBjYXNlcy4K KyAgICAgICAgQVNTRVJUKHNpemUud2lkdGgoKSA8PSB0aGlzLm1fYXZhaWxhYmxlV2lkdGgpOwor ICAgICAgICAvLyBQdXNoIG5vbi1mbG9hdGluZyBib3hlcyB0byB0aGUgcmlnaHQuCiAgICAgICAg IHRoaXMubV9hdmFpbGFibGVXaWR0aCAtPSBzaXplLndpZHRoKCk7Ci0gICAgICAgIHRoaXMubV9s aW5lUmVjdC5tb3ZlQnkobmV3IExheW91dFNpemUoc2l6ZS53aWR0aCgpLCAwKSk7CisgICAgICAg IGZvciAobGV0IGxpbmVCb3ggb2YgdGhpcy5tX2xpbmVCb3hlcykKKyAgICAgICAgICAgIGxpbmVC b3gubGluZUJveFJlY3QubW92ZUhvcml6b250YWxseShzaXplLndpZHRoKCkpOworICAgICAgICB0 aGlzLm1fbGluZVJlY3QubW92ZUhvcml6b250YWxseShzaXplLndpZHRoKCkpOwogICAgIH0KIH0K ZGlmZiAtLWdpdCBhL1Rvb2xzL0xheW91dFJlbG9hZGVkL1V0aWxzLmpzIGIvVG9vbHMvTGF5b3V0 UmVsb2FkZWQvVXRpbHMuanMKaW5kZXggYjY3YjM5OTgyOTM0NGNjMzc3YjUyNDVhOWM3MDBiZGI0 ZDY1MzdiMS4uYzA5YjBkNDNmMjA5ZDQzY2E1NDdkN2VhZDY4ZjBkZjA3MjkyZDAzMCAxMDA2NDQK LS0tIGEvVG9vbHMvTGF5b3V0UmVsb2FkZWQvVXRpbHMuanMKKysrIGIvVG9vbHMvTGF5b3V0UmVs b2FkZWQvVXRpbHMuanMKQEAgLTIwNyw3ICsyMDcsMTUgQEAgY2xhc3MgTGF5b3V0UmVjdCB7CiAg ICAgbW92ZUJ5KGRpc3RhbmNlKSB7CiAgICAgICAgIHRoaXMubV90b3BMZWZ0Lm1vdmVCeShkaXN0 YW5jZSk7CiAgICAgfQotICAgIAorCisgICAgbW92ZUhvcml6b250YWxseShkaXN0YW5jZSkgewor ICAgICAgICB0aGlzLm1fdG9wTGVmdC5zaGlmdExlZnQoZGlzdGFuY2UpOworICAgIH0KKworICAg IG1vdmVWZXJ0aWNhbGx5KGRpc3RhbmNlKSB7CisgICAgICAgIHRoaXMubV90b3BMZWZ0LnNoaWZ0 VG9wKGRpc3RhbmNlKTsKKyAgICB9CisKICAgICBpc0VtcHR5KCkgewogICAgICAgICByZXR1cm4g dGhpcy5tX3NpemUuaXNFbXB0eSgpOwogICAgIH0KZGlmZiAtLWdpdCBhL1Rvb2xzL0xheW91dFJl bG9hZGVkL3Rlc3QvaW5kZXguaHRtbCBiL1Rvb2xzL0xheW91dFJlbG9hZGVkL3Rlc3QvaW5kZXgu aHRtbAppbmRleCAyZjc0MDc5ZThkNjc4NmU1NzMzOTI2ZWU3ZWNlMWE3Mzk2MGJmM2IwLi44MzZk OTgxZjIzOTZkODk4YzAzMTg3NmMyYjUyMTBkNzRmOTM4MTMyIDEwMDY0NAotLS0gYS9Ub29scy9M YXlvdXRSZWxvYWRlZC90ZXN0L2luZGV4Lmh0bWwKKysrIGIvVG9vbHMvTGF5b3V0UmVsb2FkZWQv dGVzdC9pbmRleC5odG1sCkBAIC02OSw3ICs2OSw4IEBAIGxldCB0ZXN0RmlsZXMgPSBbCiAgICAg ImlubGluZS1mb3JtYXR0aW5nLWNvbnRleHQtd2l0aC1mbG9hdHMyLmh0bWwiLAogICAgICJmbG9h dC1pcy1pbnNpZGUtaW5saW5lLWZvcm1hdHRpbmctY29udGV4dC1zaW1wbGUuaHRtbCIsCiAgICAg Im11bHRpcGxlLWxlZnQtZmxvYXRzLW9uLWxpbmUtc2ltcGxlLmh0bWwiLAotICAgICJtdWx0aXBs ZS1sZWZ0LWZsb2F0cy1vbi1saW5lLWZyb20tcGFyZW50LWZvcm1hdHRpbmctY29udGV4dC5odG1s IgorICAgICJtdWx0aXBsZS1sZWZ0LWZsb2F0cy1vbi1saW5lLWZyb20tcGFyZW50LWZvcm1hdHRp bmctY29udGV4dC5odG1sIiwKKyAgICAiaW5saW5lLXdpdGgtZmxvYXRzLXdoZW4tdGhleS1kb250 LWZpdC5odG1sIgogXTsKIAogbGV0IGRlYnVnVGhpcyA9IFtdOwpkaWZmIC0tZ2l0IGEvVG9vbHMv TGF5b3V0UmVsb2FkZWQvdGVzdC9pbmxpbmUtd2l0aC1mbG9hdHMtd2hlbi10aGV5LWRvbnQtZml0 Lmh0bWwgYi9Ub29scy9MYXlvdXRSZWxvYWRlZC90ZXN0L2lubGluZS13aXRoLWZsb2F0cy13aGVu LXRoZXktZG9udC1maXQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4zYTJmYThjNTNhZDIzNTM4OTI1ZWM0Yjk5 MGRlMGY5MDlkOGE2NTQyCi0tLSAvZGV2L251bGwKKysrIGIvVG9vbHMvTGF5b3V0UmVsb2FkZWQv dGVzdC9pbmxpbmUtd2l0aC1mbG9hdHMtd2hlbi10aGV5LWRvbnQtZml0Lmh0bWwKQEAgLTAsMCAr MSw2IEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPGJvZHk+Cis8ZGl2IHN0eWxlPSJ3aWR0 aDogMTAwcHg7IGhlaWdodDogMTAwcHg7Ij5mb29iYXI8ZGl2IHN0eWxlPSJmbG9hdDogbGVmdDsg d2lkdGg6IDIwcHg7IGhlaWdodDogMjBweDsiPjwvZGl2PjxkaXYgc3R5bGU9ImZsb2F0OiBsZWZ0 OyB3aWR0aDogNjBweDsgaGVpZ2h0OiAyMHB4OyI+PC9kaXY+PC9kaXY+Cis8L2JvZHk+Cis8L2h0 bWw+Cg==