184070 2018-03-27 21:43:47 -0700 [LayoutReloaded] Start using window.collectTextRuns() to layout text lines in inline formatting context 2018-03-27 21:53:21 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan webkit-bug-importer oldest_to_newest 1409779 0 zalan 2018-03-27 21:43:47 -0700 ssia 1409780 1 336642 zalan 2018-03-27 21:45:05 -0700 Created attachment 336642 Patch 1409781 2 zalan 2018-03-27 21:53:00 -0700 Committed r230023: <https://trac.webkit.org/changeset/230023> 1409782 3 webkit-bug-importer 2018-03-27 21:53:21 -0700 <rdar://problem/38942800> 336642 2018-03-27 21:45:05 -0700 2018-03-27 21:45:05 -0700 Patch bug-184070-20180327214505.patch text/plain 9662 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjI5OTc1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNDk3NDMxNjQ0MzZmZTBmNGNlYTAxNmZkMmE5MGM4NTVl MjJlZjMwNC4uMTNlODM5NTU0YjYzMGU5NmM0OTc2MTY1Nzk0MWUyMzI0ZjBkZmNlOCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0 IEBACisyMDE4LTAzLTI3ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAg ICAgW0xheW91dFJlbG9hZGVkXSBTdGFydCB1c2luZyB3aW5kb3cuY29sbGVjdFRleHRSdW5zKCkg dG8gbGF5b3V0IHRleHQgbGluZXMgaW4gaW5saW5lIGZvcm1hdHRpbmcgY29udGV4dAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg0MDcwCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBMYXlvdXRSZWxvYWRl ZC9Gb3JtYXR0aW5nQ29udGV4dC9JbmxpbmVGb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250 ZXh0LmpzOgorICAgICAgICAoSW5saW5lRm9ybWF0dGluZ0NvbnRleHQucHJvdG90eXBlLl9oYW5k bGVUZXh0KToKKyAgICAgICAgKElubGluZUZvcm1hdHRpbmdDb250ZXh0LnByb3RvdHlwZS5fY29t bWl0TGluZSk6CisgICAgICAgICogTGF5b3V0UmVsb2FkZWQvRm9ybWF0dGluZ0NvbnRleHQvSW5s aW5lRm9ybWF0dGluZy9MaW5lLmpzOgorICAgICAgICAoTGluZS5wcm90b3R5cGUuYWRkVGV4dExp bmVCb3gpOgorICAgICAgICAoTGluZSk6CisgICAgICAgIChMaW5lLnByb3RvdHlwZS5hZGRMaW5l Qm94KTogRGVsZXRlZC4KKyAgICAgICAgKiBMYXlvdXRSZWxvYWRlZC9Gb3JtYXR0aW5nU3RhdGUv QmxvY2tGb3JtYXR0aW5nU3RhdGUuanM6CisgICAgICAgIChCbG9ja0Zvcm1hdHRpbmdTdGF0ZSk6 CisgICAgICAgICogTGF5b3V0UmVsb2FkZWQvRm9ybWF0dGluZ1N0YXRlL0Zvcm1hdHRpbmdTdGF0 ZS5qczoKKyAgICAgICAgKEZvcm1hdHRpbmdTdGF0ZS5wcm90b3R5cGUuZGlzcGxheUJveCk6Cisg ICAgICAgIChGb3JtYXR0aW5nU3RhdGUpOgorICAgICAgICAoRm9ybWF0dGluZ1N0YXRlLnByb3Rv dHlwZS5fc2V0Rm9ybWF0dGluZ0NvbnRleHQpOiBEZWxldGVkLgorICAgICAgICAqIExheW91dFJl bG9hZGVkL0Zvcm1hdHRpbmdTdGF0ZS9JbmxpbmVGb3JtYXR0aW5nU3RhdGUuanM6CisgICAgICAg IChJbmxpbmVGb3JtYXR0aW5nU3RhdGUpOgorICAgICAgICAqIExheW91dFJlbG9hZGVkL0xheW91 dFRyZWUvVGV4dC5qczoKKyAgICAgICAgKFRleHQucHJvdG90eXBlLmNvbnRlbnQpOgorICAgICAg ICAqIExheW91dFJlbG9hZGVkL1V0aWxzLmpzOgorICAgICAgICAoVXRpbHMudGV4dFJ1bnMpOgor ICAgICAgICAoVXRpbHMudGV4dFJ1bnNGb3JMaW5lKToKKyAgICAgICAgKFV0aWxzLl9kdW1wTGlu ZXMuKToKKyAgICAgICAgKFV0aWxzLl9kdW1wTGluZXMpOgorICAgICAgICAqIExheW91dFJlbG9h ZGVkL3Rlc3Qvc2ltcGxlLWlubGluZS10ZXh0Lmh0bWw6CisKIDIwMTgtMDMtMjYgIFphbGFuIEJ1 anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTGF5b3V0UmVsb2FkZWRdIEFkZCBJ bmxpbmVUZXh0IERPTSBpbnRlcmZhY2UgYW5kIGRlcGVuZGVuY2llcwpkaWZmIC0tZ2l0IGEvVG9v bHMvTGF5b3V0UmVsb2FkZWQvRm9ybWF0dGluZ0NvbnRleHQvSW5saW5lRm9ybWF0dGluZy9Jbmxp bmVGb3JtYXR0aW5nQ29udGV4dC5qcyBiL1Rvb2xzL0xheW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdD b250ZXh0L0lubGluZUZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuanMKaW5kZXgg MTVhZWY2NzM0NzJiODAzMjI2MmY5NzM3NjQ1MDE5YzZhODk4MTc2MC4uNWI4ZTE5NDM5OWUwNDg2 Yjg1MTgwZjRhZTBiMmM2OGI3ZWU1MmJjOSAxMDA2NDQKLS0tIGEvVG9vbHMvTGF5b3V0UmVsb2Fk ZWQvRm9ybWF0dGluZ0NvbnRleHQvSW5saW5lRm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29u dGV4dC5qcworKysgYi9Ub29scy9MYXlvdXRSZWxvYWRlZC9Gb3JtYXR0aW5nQ29udGV4dC9Jbmxp bmVGb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmpzCkBAIC03NiwyMCArNzYsMjEg QEAgY2xhc3MgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQgZXh0ZW5kcyBGb3JtYXR0aW5nQ29udGV4 dCB7CiAgICAgX2hhbmRsZVRleHQoaW5saW5lQm94KSB7CiAgICAgICAgIC8vIEZJWE1FOiBUaGlz IGlzIGEgZXh0cmVtZWx5IHNpbXBsZSBsaW5lIGJyZWFraW5nIGFsZ29yaXRobS4KICAgICAgICAg bGV0IGN1cnJlbnRQb3NpdGlvbiA9IDA7Ci0gICAgICAgIGxldCBlbmRQb3NpdGlvbiA9IGlubGlu ZUJveC50ZXh0KCkubGVuZ3RoKCkgLSAxOwotICAgICAgICB3aGlsZSAoY3VycmVudFBvc2l0aW9u IDwgZW5kUG9zaXRpb24pIHsKLSAgICAgICAgICAgIGxldCBicmVha2luZ1Bvc2l0aW9uID0gVXRp bHMubmV4dEJyZWFraW5nT3Bwb3J0dW5pdHkoaW5saW5lQm94LnRleHQoKSwgY3VycmVudFBvc2l0 aW9uKTsKLSAgICAgICAgICAgIGlmIChicmVha2luZ1Bvc2l0aW9uID09IGN1cnJlbnRQb3NpdGlv bikKLSAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgIGxldCBmcmFnbWVudFdpZHRo ID0gVXRpbHMubWVhc3VyZVRleHQoaW5saW5lQm94LnRleHQoKSwgY3VycmVudFBvc2l0aW9uLCBi cmVha2luZ1Bvc2l0aW9uKTsKLSAgICAgICAgICAgIGlmICh0aGlzLl9saW5lKCkuYXZhaWxhYmxl V2lkdGgoKSA8IGZyYWdtZW50V2lkdGggJiYgIXRoaXMuX2xpbmUoKS5pc0VtcHR5KCkpCi0gICAg ICAgICAgICAgICAgdGhpcy5fY29tbWl0TGluZSgpOwotICAgICAgICAgICAgdGhpcy5fbGluZSgp LmFkZExpbmVCb3goY3VycmVudFBvc2l0aW9uLCBicmVha2luZ1Bvc2l0aW9uLCBuZXcgTGF5b3V0 U2l6ZShmcmFnbWVudFdpZHRoLCBVdGlscy50ZXh0SGVpZ2h0KGlubGluZUJveCkpKTsKLSAgICAg ICAgICAgIGN1cnJlbnRQb3NpdGlvbiA9IGJyZWFraW5nUG9zaXRpb247CisgICAgICAgIGxldCB0 ZXh0ID0gaW5saW5lQm94LnRleHQoKS5jb250ZW50KCk7CisgICAgICAgIHdoaWxlIChjdXJyZW50 UG9zaXRpb24gPCB0ZXh0Lmxlbmd0aCAtIDEpIHsKKyAgICAgICAgICAgIGxldCB0ZXh0UnVucyA9 IFV0aWxzLnRleHRSdW5zRm9yTGluZSh0ZXh0LCB0aGlzLl9saW5lKCkuYXZhaWxhYmxlV2lkdGgo KSwgdGhpcy5mb3JtYXR0aW5nUm9vdCgpKTsKKyAgICAgICAgICAgIGZvciAobGV0IHJ1biBvZiB0 ZXh0UnVucykgeworICAgICAgICAgICAgICAgIHRoaXMuX2xpbmUoKS5hZGRUZXh0TGluZUJveChy dW4uc3RhcnRQb3NpdGlvbiwgcnVuLmVuZFBvc2l0aW9uLCBuZXcgTGF5b3V0U2l6ZShydW4ud2lk dGgsIFV0aWxzLnRleHRIZWlnaHQoaW5saW5lQm94KSkpOworICAgICAgICAgICAgICAgIGN1cnJl bnRQb3NpdGlvbiA9IHJ1bi5lbmRQb3NpdGlvbjsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAg IHRleHQgPSB0ZXh0LnNsaWNlKGN1cnJlbnRQb3NpdGlvbiwgdGV4dC5sZW5ndGggLSAxKTsKKyAg ICAgICAgICAgIHRoaXMuX2NvbW1pdExpbmUoKTsKICAgICAgICAgfQogICAgIH0KIAogICAgIF9j b21taXRMaW5lKCkgeworICAgICAgICBpZiAodGhpcy5fbGluZSgpLmlzRW1wdHkoKSkKKyAgICAg ICAgICAgIHJldHVybjsKICAgICAgICAgdGhpcy5mb3JtYXR0aW5nU3RhdGUoKS5hcHBlbmRMaW5l KHRoaXMuX2xpbmUoKSk7CiAgICAgICAgIHRoaXMubV9saW5lID0gdGhpcy5fY3JlYXRlTmV3TGlu ZSgpOwogICAgIH0KZGlmZiAtLWdpdCBhL1Rvb2xzL0xheW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdD b250ZXh0L0lubGluZUZvcm1hdHRpbmcvTGluZS5qcyBiL1Rvb2xzL0xheW91dFJlbG9hZGVkL0Zv cm1hdHRpbmdDb250ZXh0L0lubGluZUZvcm1hdHRpbmcvTGluZS5qcwppbmRleCAyNjk5MTM0YzZi ZGEwMDBiY2ZiOGM0NWEwZDhiYTFmYzA4ZWIxNzA2Li42N2UwMmRkZDUxZGFhODQ0MzRhYzI2MjNj ZjU4M2E1YTBlYTNhZTI2IDEwMDY0NAotLS0gYS9Ub29scy9MYXlvdXRSZWxvYWRlZC9Gb3JtYXR0 aW5nQ29udGV4dC9JbmxpbmVGb3JtYXR0aW5nL0xpbmUuanMKKysrIGIvVG9vbHMvTGF5b3V0UmVs b2FkZWQvRm9ybWF0dGluZ0NvbnRleHQvSW5saW5lRm9ybWF0dGluZy9MaW5lLmpzCkBAIC00Niwx MCArNDYsMTAgQEAgY2xhc3MgTGluZSB7CiAgICAgICAgIHJldHVybiB0aGlzLm1fbGluZUJveGVz OwogICAgIH0KIAotICAgIGFkZExpbmVCb3goc3RhcnRQb3NpdGlvbiwgZW5kUG9zaXRpb24sIHNp emUpIHsKKyAgICBhZGRUZXh0TGluZUJveChzdGFydFBvc2l0aW9uLCBlbmRQb3NpdGlvbiwgc2l6 ZSkgewogICAgICAgICB0aGlzLm1fYXZhaWxhYmxlV2lkdGggLT0gc2l6ZS53aWR0aCgpOwogICAg ICAgICAvLyBUT0RPOiB1c2UgdGhlIGFjdHVhbCBoZWlnaHQgaW5zdGVhZCBvZiB0aGUgbGluZSBo ZWlnaHQuCi0gICAgICAgIGxldCBsaW5lQm94UmVjdCA9IG5ldyBMYXlvdXRSZWN0KHRoaXMucmVj dCgpLnRvcExlZnQoKSwgbmV3IExheW91dFNpemUoc2l6ZS53aWR0aCgpLCB0aGlzLnJlY3QoKS5o ZWlnaHQoKSkpOworICAgICAgICBsZXQgbGluZUJveFJlY3QgPSBuZXcgTGF5b3V0UmVjdCh0aGlz LnJlY3QoKS50b3BSaWdodCgpLCBuZXcgTGF5b3V0U2l6ZShzaXplLndpZHRoKCksIHRoaXMucmVj dCgpLmhlaWdodCgpKSk7CiAgICAgICAgIHRoaXMubV9saW5lQm94ZXMucHVzaCh7c3RhcnRQb3Np dGlvbiwgZW5kUG9zaXRpb24sIGxpbmVCb3hSZWN0fSk7CiAgICAgICAgIHRoaXMubV9saW5lUmVj dC5ncm93QnkobmV3IExheW91dFNpemUoc2l6ZS53aWR0aCgpLCAwKSk7CiAgICAgfQpkaWZmIC0t Z2l0IGEvVG9vbHMvTGF5b3V0UmVsb2FkZWQvRm9ybWF0dGluZ1N0YXRlL0Jsb2NrRm9ybWF0dGlu Z1N0YXRlLmpzIGIvVG9vbHMvTGF5b3V0UmVsb2FkZWQvRm9ybWF0dGluZ1N0YXRlL0Jsb2NrRm9y bWF0dGluZ1N0YXRlLmpzCmluZGV4IDQ0N2ZmNWRkMjQ3YjhkMzc3NjQyZGI1MDI1ODVhMjJjNzhl Yzc5ZTAuLmU0ZmE1MzM5MmIyOTI2N2EwNGYxYmNiNjg3NmQyY2FmMDg0NjI2ZTYgMTAwNjQ0Ci0t LSBhL1Rvb2xzL0xheW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdTdGF0ZS9CbG9ja0Zvcm1hdHRpbmdT dGF0ZS5qcworKysgYi9Ub29scy9MYXlvdXRSZWxvYWRlZC9Gb3JtYXR0aW5nU3RhdGUvQmxvY2tG b3JtYXR0aW5nU3RhdGUuanMKQEAgLTI2LDYgKzI2LDYgQEAKIGNsYXNzIEJsb2NrRm9ybWF0dGlu Z1N0YXRlIGV4dGVuZHMgRm9ybWF0dGluZ1N0YXRlIHsKICAgICBjb25zdHJ1Y3Rvcihmb3JtYXR0 aW5nUm9vdCwgbGF5b3V0U3RhdGUpIHsKICAgICAgICAgc3VwZXIobGF5b3V0U3RhdGUsIGZvcm1h dHRpbmdSb290KTsKLSAgICAgICAgdGhpcy5fc2V0Rm9ybWF0dGluZ0NvbnRleHQobmV3IEJsb2Nr Rm9ybWF0dGluZ0NvbnRleHQodGhpcykpOworICAgICAgICB0aGlzLm1fZm9ybWF0dGluZ0NvbnRl eHQgPSBuZXcgQmxvY2tGb3JtYXR0aW5nQ29udGV4dCh0aGlzKTsKICAgICB9CiB9CmRpZmYgLS1n aXQgYS9Ub29scy9MYXlvdXRSZWxvYWRlZC9Gb3JtYXR0aW5nU3RhdGUvRm9ybWF0dGluZ1N0YXRl LmpzIGIvVG9vbHMvTGF5b3V0UmVsb2FkZWQvRm9ybWF0dGluZ1N0YXRlL0Zvcm1hdHRpbmdTdGF0 ZS5qcwppbmRleCBlZjIxOTRkNzA0ZDQwZGUyODE3ZmYyMjBhODUyNDk2ZDRhZWY3YWNhLi40MWI1 NjFhZDdkYWQ1NjJmNGE5MTllZTIzYzViZGQ3MjU5NDM4ZTQyIDEwMDY0NAotLS0gYS9Ub29scy9M YXlvdXRSZWxvYWRlZC9Gb3JtYXR0aW5nU3RhdGUvRm9ybWF0dGluZ1N0YXRlLmpzCisrKyBiL1Rv b2xzL0xheW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdTdGF0ZS9Gb3JtYXR0aW5nU3RhdGUuanMKQEAg LTczLDggKzczLDQgQEAgY2xhc3MgRm9ybWF0dGluZ1N0YXRlIHsKICAgICAgICAgQVNTRVJUKCFs YXlvdXRCb3gucGFyZW50KCkpOwogICAgICAgICByZXR1cm4gdGhpcy5sYXlvdXRTdGF0ZSgpLmlu aXRpYWxEaXNwbGF5Qm94KCk7CiAgICAgfQotCi0gICAgX3NldEZvcm1hdHRpbmdDb250ZXh0KGZv cm1hdHRpbmdDb250ZXh0KSB7Ci0gICAgICAgIHRoaXMubV9mb3JtYXR0aW5nQ29udGV4dCA9IGZv cm1hdHRpbmdDb250ZXh0OwotICAgIH0KIH0KZGlmZiAtLWdpdCBhL1Rvb2xzL0xheW91dFJlbG9h ZGVkL0Zvcm1hdHRpbmdTdGF0ZS9JbmxpbmVGb3JtYXR0aW5nU3RhdGUuanMgYi9Ub29scy9MYXlv dXRSZWxvYWRlZC9Gb3JtYXR0aW5nU3RhdGUvSW5saW5lRm9ybWF0dGluZ1N0YXRlLmpzCmluZGV4 IDgxNjliMDJiNDdhOThhMjU5NzQzNWM5ZmJmMmQ5YjFjNzIwYTVlZmQuLmIyMzY3MTlkY2M1YjQ1 NmRmMzM0NGZmMjJkZWQ5OGYzMTQ1YTk1ODQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0xheW91dFJlbG9h ZGVkL0Zvcm1hdHRpbmdTdGF0ZS9JbmxpbmVGb3JtYXR0aW5nU3RhdGUuanMKKysrIGIvVG9vbHMv TGF5b3V0UmVsb2FkZWQvRm9ybWF0dGluZ1N0YXRlL0lubGluZUZvcm1hdHRpbmdTdGF0ZS5qcwpA QCAtMjYsNyArMjYsNyBAQAogY2xhc3MgSW5saW5lRm9ybWF0dGluZ1N0YXRlIGV4dGVuZHMgRm9y bWF0dGluZ1N0YXRlIHsKICAgICBjb25zdHJ1Y3Rvcihmb3JtYXR0aW5nUm9vdCwgbGF5b3V0U3Rh dGUpIHsKICAgICAgICAgc3VwZXIobGF5b3V0U3RhdGUsIGZvcm1hdHRpbmdSb290KTsKLSAgICAg ICAgdGhpcy5fc2V0Rm9ybWF0dGluZ0NvbnRleHQobmV3IElubGluZUZvcm1hdHRpbmdDb250ZXh0 KHRoaXMpKTsKKyAgICAgICAgdGhpcy5tX2Zvcm1hdHRpbmdDb250ZXh0ID0gbmV3IElubGluZUZv cm1hdHRpbmdDb250ZXh0KHRoaXMpOwogICAgICAgICB0aGlzLm1fbGluZXMgPSBuZXcgQXJyYXko KTsKICAgICB9CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL0xheW91dFJlbG9hZGVkL0xheW91dFRyZWUv VGV4dC5qcyBiL1Rvb2xzL0xheW91dFJlbG9hZGVkL0xheW91dFRyZWUvVGV4dC5qcwppbmRleCAy YmQwNGMxYzFjNjE5MmNkNWQ3ZGUzZTQ3ODk3MmZlOTE0NDYxMTg1Li42ZTlmMGU1ODA3NDEwM2Ex MzE5OWYzZDRjMGNmOGQ5NTlkMTllNDM2IDEwMDY0NAotLS0gYS9Ub29scy9MYXlvdXRSZWxvYWRl ZC9MYXlvdXRUcmVlL1RleHQuanMKKysrIGIvVG9vbHMvTGF5b3V0UmVsb2FkZWQvTGF5b3V0VHJl ZS9UZXh0LmpzCkBAIC0zNSw3ICszNSw3IEBAIGNsYXNzIFRleHQgewogICAgIH0KIAogICAgIGNv bnRlbnQoKSB7Ci0gICAgICAgIHJldHVybiB0aGlzLm1fbm9kZS53aG9sZVRleHQ7CisgICAgICAg IHJldHVybiB0aGlzLm1fbm9kZS50ZXh0Q29udGVudDsKICAgICB9CiAKICAgICBsZW5ndGgoKSB7 CmRpZmYgLS1naXQgYS9Ub29scy9MYXlvdXRSZWxvYWRlZC9VdGlscy5qcyBiL1Rvb2xzL0xheW91 dFJlbG9hZGVkL1V0aWxzLmpzCmluZGV4IDdjNmYzYjA4NjZhNGIzMWJlZTA2NGRmZWZkZjE5NDdk ZTllYjU5ZjIuLjY1MzcwNjY2ODViMTBkOGFmZDBkNzUzNDViZmMzZWZlNDkzMDQwZmMgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL0xheW91dFJlbG9hZGVkL1V0aWxzLmpzCisrKyBiL1Rvb2xzL0xheW91dFJl bG9hZGVkL1V0aWxzLmpzCkBAIC00NzUsNiArNDc1LDE0IEBAIGNsYXNzIFV0aWxzIHsKICAgICAg ICAgcmV0dXJuIHdpbmRvdy5nZXRDb21wdXRlZFN0eWxlKG5vZGUpLmZsb2F0ID09ICJsZWZ0IjsK ICAgICB9CiAKKyAgICBzdGF0aWMgdGV4dFJ1bnModGV4dCwgY29udGFpbmVyKSB7CisgICAgICAg IHJldHVybiB3aW5kb3cuY29sbGVjdFRleHRSdW5zKHRleHQsIGNvbnRhaW5lci5ub2RlKCkpOwor ICAgIH0KKworICAgIHN0YXRpYyB0ZXh0UnVuc0ZvckxpbmUodGV4dCwgYXZhaWxhYmxlU3BhY2Us IGNvbnRhaW5lcikgeworICAgICAgICByZXR1cm4gd2luZG93LmNvbGxlY3RUZXh0UnVucyh0ZXh0 LCBjb250YWluZXIubm9kZSgpLCBhdmFpbGFibGVTcGFjZSk7CisgICAgfQorCiAgICAgc3RhdGlj IG5leHRCcmVha2luZ09wcG9ydHVuaXR5KHRleHRCb3gsIGN1cnJlbnRQb3NpdGlvbikKICAgICB7 CiAgICAgICAgIHJldHVybiB3aW5kb3cubmV4dEJyZWFraW5nT3Bwb3J0dW5pdHkodGV4dEJveC5j b250ZW50KCksIGN1cnJlbnRQb3NpdGlvbik7CkBAIC01MzEsNyArNTM5LDcgQEAgY2xhc3MgVXRp bHMgewogICAgICAgICAgICAgY29udGVudCArPSBpbmRlbnRhdGlvbiArICJSb290SW5saW5lQm94 IGF0ICgiICsgbGluZVJlY3QubGVmdCgpICsgIiwiICsgbGluZVJlY3QudG9wKCkgKyAiKSBzaXpl ICIgKyBVdGlscy5wcmVjaXNpb25Sb3VuZChsaW5lUmVjdC53aWR0aCgpLCAyKSArICJ4IiArIGxp bmVSZWN0LmhlaWdodCgpICsgIlxuIjsKICAgICAgICAgICAgIGxpbmUubGluZUJveGVzKCkuZm9y RWFjaChmdW5jdGlvbihsaW5lQm94KSB7CiAgICAgICAgICAgICAgICAgbGV0IGluZGVudGF0aW9u ID0gIiAiLnJlcGVhdChsZXZlbCArIDEpOwotICAgICAgICAgICAgICAgIGNvbnRlbnQgKz0gaW5k ZW50YXRpb24gKyAiSW5saW5lVGV4dEJveCBhdCAoIiArIGxpbmVCb3gubGluZUJveFJlY3QubGVm dCgpICsgIiwiICsgbGluZUJveC5saW5lQm94UmVjdC50b3AoKSArICIpIHNpemUgIiArIFV0aWxz LnByZWNpc2lvblJvdW5kKGxpbmVCb3gubGluZUJveFJlY3Qud2lkdGgoKSwgMikgKyAieCIgKyBs aW5lQm94LmxpbmVCb3hSZWN0LmhlaWdodCgpICsgIlxuIjsKKyAgICAgICAgICAgICAgICBjb250 ZW50ICs9IGluZGVudGF0aW9uICsgIklubGluZVRleHRCb3ggYXQgKCIgKyBVdGlscy5wcmVjaXNp b25Sb3VuZChsaW5lQm94LmxpbmVCb3hSZWN0LmxlZnQoKSwgMikgKyAiLCIgKyBVdGlscy5wcmVj aXNpb25Sb3VuZChsaW5lQm94LmxpbmVCb3hSZWN0LnRvcCgpLCAyKSArICIpIHNpemUgIiArIFV0 aWxzLnByZWNpc2lvblJvdW5kKGxpbmVCb3gubGluZUJveFJlY3Qud2lkdGgoKSwgMikgKyAieCIg KyBsaW5lQm94LmxpbmVCb3hSZWN0LmhlaWdodCgpICsgIlxuIjsKICAgICAgICAgICAgIH0pOwog ICAgICAgICB9KTsKICAgICAgICAgcmV0dXJuIGNvbnRlbnQ7CmRpZmYgLS1naXQgYS9Ub29scy9M YXlvdXRSZWxvYWRlZC90ZXN0L3NpbXBsZS1pbmxpbmUtdGV4dC5odG1sIGIvVG9vbHMvTGF5b3V0 UmVsb2FkZWQvdGVzdC9zaW1wbGUtaW5saW5lLXRleHQuaHRtbAppbmRleCA0N2E3MTI3MzBlZGE3 NjQ3Y2FiNTFlMjBmMWY5ZGEzZmI4NzM5YTYxLi5lMmIyZTdmNmY4MTU0YjAyYWQ1ZTZmMjJiNTky MDQ3Yjk2N2FiYTk0IDEwMDY0NAotLS0gYS9Ub29scy9MYXlvdXRSZWxvYWRlZC90ZXN0L3NpbXBs ZS1pbmxpbmUtdGV4dC5odG1sCisrKyBiL1Rvb2xzL0xheW91dFJlbG9hZGVkL3Rlc3Qvc2ltcGxl LWlubGluZS10ZXh0Lmh0bWwKQEAgLTEsNCArMSwxMiBAQAogPCFET0NUWVBFIGh0bWw+CiA8aHRt bD4KLTxib2R5PjxkaXY+Zm9vYmFyPC9kaXY+PC9ib2R5PgorPGJvZHk+Cis8ZGl2PmZvb2JhcmZv b2JhcjwvZGl2PgorPGRpdj5mb29iYXIgZm9vYmFyPC9kaXY+Cis8ZGl2PmZvb2JhciAgZm9vYmFy PC9kaXY+Cis8ZGl2PmZvb2JhciAgIGZvb2JhcjwvZGl2PgorPGRpdj5mb29iYXIgICAgZm9vYmFy PC9kaXY+Cis8ZGl2PmZvb2JhciAgICAgZm9vYmFyPC9kaXY+Cis8ZGl2PmZvb2JhciAgICAgIGZv b2JhcjwvZGl2PgorPC9ib2R5PgogPC9odG1sPgo=