198528 2019-06-04 07:37:57 -0700 [LFC][IFC] Decouple float placement and line shrinking 2019-06-04 08:52:30 -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 1541560 0 zalan 2019-06-04 07:37:57 -0700 Line shrinking is part of placeInlineItems() while placement is createDisplayRuns 1541561 1 webkit-bug-importer 2019-06-04 07:38:26 -0700 <rdar://problem/51397638> 1541564 2 371280 zalan 2019-06-04 07:45:53 -0700 Created attachment 371280 Patch 1541593 3 zalan 2019-06-04 08:52:30 -0700 Committed r246067: <https://trac.webkit.org/changeset/246067> 371280 2019-06-04 07:45:53 -0700 2019-06-04 07:51:36 -0700 Patch bug-198528-20190604074552.patch text/plain 9079 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2MDI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDFmNzFjZDRiZDBlZWQ4 ZTg1NTZkZjY3YTJlOTg3YmRlOTFjZGJjNS4uYmM0OGFjNjFlZTYyZTFlYjA2Yzk0ZDdkM2RlMWMw Mzg2MDMxYzUxZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE5LTA2LTA0ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBEZWNvdXBs ZSBmbG9hdCBwbGFjZW1lbnQgYW5kIGxpbmUgc2hyaW5raW5nCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTg1MjgKKyAgICAgICAgPHJkYXI6Ly9wcm9i bGVtLzUxMzk3NjM4PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIEluIExpbmVMYXlvdXQ6OnBsYWNlSW5saW5lSXRlbXMoKSBmbG9hdCBoYW5kbGluZyBz aG91bGQgYmUgb25seSBhYm91dCBzaHJpbmtpbmcgdGhlIGN1cnJlbnQgbGluZSwgdGhlIGFjdHVh bAorICAgICAgICBmbG9hdCBwbGFjZW1lbnQgc2hvdWxkIGhhcHBlbiBsYXRlciB3aGVuIHdlIGNv bnN0cnVjdCB0aGUgdGhlIGRpc3BsYXkgYm94ZXMvcnVucy4gSXQgZW5hYmxlcyB0aGUgcHJlZmVy cmVkIHdpZHRoCisgICAgICAgIGNvbXB1dGF0aW9uIHRvIGNhbGwgcGxhY2VJbmxpbmVJdGVtcygp IHRvIGdhdGhlciBsaW5lIHdpZHRocyB3aXRob3V0IGFjY2lkZW50YWxseSBtdXRhdGluZyB0aGUg bGF5b3V0IGNvbnRleHQuIAorCisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5s aW5lRm9ybWF0dGluZ0NvbnRleHQuaDoKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGlu Zy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dExpbmVMYXlvdXQuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6TGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6TGluZUxheW91dDo6cGxhY2VJbmxp bmVJdGVtcyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUZvcm1hdHRp bmdDb250ZXh0OjpMaW5lTGF5b3V0OjpsYXlvdXQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6 TGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6TGluZUxheW91dDo6Y3JlYXRlRGlzcGxh eVJ1bnMgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5n Q29udGV4dDo6TGluZUxheW91dDo6aGFuZGxlRmxvYXQgY29uc3QpOiBEZWxldGVkLgorICAgICAg ICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUl0ZW0uaDoKKwogMjAxOS0wNi0wMyAg WmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10gQWRk IGhhcmQgbGluZSBicmVhayBoYW5kbGluZyB0byBMaW5lQnJlYWtlcgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRl eHQuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1h dHRpbmdDb250ZXh0LmgKaW5kZXggMjhmYmFkMzQ5ODRiMDY3YTM2NTM5YTY5MzIyODJlNjM1M2U1 ZmRlOC4uYWM3NjFmNjczM2RjZWRhNjBjYmEzOGVjNGU4MzRmYTQ5ZjEwZTQwNyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGlu Z0NvbnRleHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9J bmxpbmVGb3JtYXR0aW5nQ29udGV4dC5oCkBAIC02MSw2ICs2MSw3IEBAIHByaXZhdGU6CiAKICAg ICAgICAgc3RydWN0IExpbmVDb250ZW50IHsKICAgICAgICAgICAgIE9wdGlvbmFsPHVuc2lnbmVk PiBsYXN0SW5saW5lSXRlbUluZGV4OworICAgICAgICAgICAgVmVjdG9yPFdlYWtQdHI8SW5saW5l SXRlbT4+IGZsb2F0czsKICAgICAgICAgICAgIHN0ZDo6dW5pcXVlX3B0cjxMaW5lOjpDb250ZW50 PiBydW5zOwogICAgICAgICB9OwogCkBAIC03Myw4ICs3NCw3IEBAIHByaXZhdGU6CiAgICAgICAg ICAgICBjb25zdCBJbmxpbmVJdGVtcyYgaW5saW5lSXRlbXM7CiAgICAgICAgIH07CiAgICAgICAg IExpbmVDb250ZW50IHBsYWNlSW5saW5lSXRlbXMoY29uc3QgTGluZUlucHV0JikgY29uc3Q7Ci0g ICAgICAgIHZvaWQgY3JlYXRlRGlzcGxheVJ1bnMoY29uc3QgTGluZTo6Q29udGVudCYsIExheW91 dFVuaXQgd2lkdGhDb25zdHJhaW50KSBjb25zdDsKLSAgICAgICAgdm9pZCBoYW5kbGVGbG9hdChM aW5lJiwgY29uc3QgRmxvYXRpbmdDb250ZXh0JiwgY29uc3QgSW5saW5lSXRlbSYgZmxvYXRCb3gp IGNvbnN0OworICAgICAgICB2b2lkIGNyZWF0ZURpc3BsYXlSdW5zKGNvbnN0IExpbmU6OkNvbnRl bnQmLCBjb25zdCBWZWN0b3I8V2Vha1B0cjxJbmxpbmVJdGVtPj4mIGZsb2F0cywgTGF5b3V0VW5p dCB3aWR0aENvbnN0cmFpbnQpIGNvbnN0OwogICAgICAgICB2b2lkIGFsaWduUnVucyhUZXh0QWxp Z25Nb2RlLCB1bnNpZ25lZCBmaXJzdFJ1bkluZGV4LCBMYXlvdXRVbml0IGF2YWlsYWJsZVdpZHRo KSBjb25zdDsKIAogICAgIHByaXZhdGU6CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dExpbmVMYXlvdXQuY3Bw IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGlu Z0NvbnRleHRMaW5lTGF5b3V0LmNwcAppbmRleCBiOTNjZDllNzQ2YmU0YTgzNjZkODY5MDRkNGU2 ZGU4ZTgyMmUxZmZlLi44Yzc4ODRhZDYxNGY0ZmE0MjQ1NTk0MGZlY2IzNDIyMjNiMzcwNDkxIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVG b3JtYXR0aW5nQ29udGV4dExpbmVMYXlvdXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0TGluZUxheW91dC5jcHAK QEAgLTE1NSw3ICsxNTUsNyBAQCBzdGF0aWMgc3RkOjp1bmlxdWVfcHRyPExpbmU+IGNvbnN0cnVj dExpbmUoY29uc3QgTGF5b3V0U3RhdGUmIGxheW91dFN0YXRlLCBjb25zdAogSW5saW5lRm9ybWF0 dGluZ0NvbnRleHQ6OkxpbmVMYXlvdXQ6OkxpbmVDb250ZW50IElubGluZUZvcm1hdHRpbmdDb250 ZXh0OjpMaW5lTGF5b3V0OjpwbGFjZUlubGluZUl0ZW1zKGNvbnN0IExpbmVJbnB1dCYgbGluZUlu cHV0KSBjb25zdAogewogICAgIGF1dG8gbGluZSA9IGNvbnN0cnVjdExpbmUobGF5b3V0U3RhdGUo KSwgbV9mbG9hdGluZ1N0YXRlLCBtX2Zvcm1hdHRpbmdSb290LCBsaW5lSW5wdXQubG9naWNhbFRv cCwgbGluZUlucHV0LmF2YWlsYWJsZUxvZ2ljYWxXaWR0aCk7Ci0gICAgYXV0byBmbG9hdGluZ0Nv bnRleHQgPSBGbG9hdGluZ0NvbnRleHQgeyBtX2Zsb2F0aW5nU3RhdGUgfTsKKyAgICBWZWN0b3I8 V2Vha1B0cjxJbmxpbmVJdGVtPj4gZmxvYXRzOwogICAgIHVuc2lnbmVkIGNvbW1pdHRlZElubGlu ZUl0ZW1Db3VudCA9IDA7CiAKICAgICBVbmNvbW1pdHRlZENvbnRlbnQgdW5jb21taXR0ZWRDb250 ZW50OwpAQCAtMjA0LDcgKzIwNCw3IEBAIElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpMaW5lTGF5 b3V0OjpMaW5lQ29udGVudCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6TGluZUxhCiAgICAgYXV0 byBjbG9zZUxpbmUgPSBbJl0gewogICAgICAgICAvLyBUaGlzIG1pZ2h0IGNoYW5nZSBhdCBzb21l IHBvaW50LgogICAgICAgICBBU1NFUlQoY29tbWl0dGVkSW5saW5lSXRlbUNvdW50KTsKLSAgICAg ICAgcmV0dXJuIExpbmVDb250ZW50IHsgbGluZUlucHV0LmZpcnN0SW5saW5lSXRlbUluZGV4ICsg KGNvbW1pdHRlZElubGluZUl0ZW1Db3VudCAtIDEpLCBsaW5lLT5jbG9zZSgpIH07CisgICAgICAg IHJldHVybiBMaW5lQ29udGVudCB7IGxpbmVJbnB1dC5maXJzdElubGluZUl0ZW1JbmRleCArIChj b21taXR0ZWRJbmxpbmVJdGVtQ291bnQgLSAxKSwgV1RGTW92ZShmbG9hdHMpLCBsaW5lLT5jbG9z ZSgpIH07CiAgICAgfTsKICAgICBMaW5lQnJlYWtlciBsaW5lQnJlYWtlcjsKICAgICAvLyBJdGVy YXRlIHRocm91Z2ggdGhlIGlubGluZSBjb250ZW50IGFuZCBwbGFjZSB0aGUgaW5saW5lIGJveGVz IG9uIHRoZSBjdXJyZW50IGxpbmUuCkBAIC0yMzMsNyArMjMzLDEyIEBAIElubGluZUZvcm1hdHRp bmdDb250ZXh0OjpMaW5lTGF5b3V0OjpMaW5lQ29udGVudCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4 dDo6TGluZUxhCiAKICAgICAgICAgQVNTRVJUKGJyZWFraW5nQ29udGV4dC5icmVha2luZ0JlaGF2 aW9yID09IExpbmVCcmVha2VyOjpCcmVha2luZ0JlaGF2aW9yOjpLZWVwKTsKICAgICAgICAgaWYg KGlubGluZUl0ZW0tPmlzRmxvYXQoKSkgewotICAgICAgICAgICAgaGFuZGxlRmxvYXQoKmxpbmUs IGZsb2F0aW5nQ29udGV4dCwgKmlubGluZUl0ZW0pOworICAgICAgICAgICAgYXV0byYgZmxvYXRC b3ggPSBpbmxpbmVJdGVtLT5sYXlvdXRCb3goKTsKKyAgICAgICAgICAgIEFTU0VSVChsYXlvdXRT dGF0ZSgpLmhhc0Rpc3BsYXlCb3goZmxvYXRCb3gpKTsKKyAgICAgICAgICAgIC8vIFNocmluayBh dmFpbGJsZSBzcGFjZSBmb3IgY3VycmVudCBsaW5lIGFuZCBtb3ZlIGV4aXN0aW5nIGlubGluZSBy dW5zLgorICAgICAgICAgICAgYXV0byBmbG9hdEJveFdpZHRoID0gbGF5b3V0U3RhdGUoKS5kaXNw bGF5Qm94Rm9yTGF5b3V0Qm94KGZsb2F0Qm94KS5tYXJnaW5Cb3hXaWR0aCgpOworICAgICAgICAg ICAgZmxvYXRCb3guaXNMZWZ0RmxvYXRpbmdQb3NpdGlvbmVkKCkgPyBsaW5lLT5tb3ZlTG9naWNh bExlZnQoZmxvYXRCb3hXaWR0aCkgOiBsaW5lLT5tb3ZlTG9naWNhbFJpZ2h0KGZsb2F0Qm94V2lk dGgpOworICAgICAgICAgICAgZmxvYXRzLmFwcGVuZChtYWtlV2Vha1B0cigqaW5saW5lSXRlbSkp OwogICAgICAgICAgICAgKytjb21taXR0ZWRJbmxpbmVJdGVtQ291bnQ7CiAgICAgICAgICAgICBj b250aW51ZTsKICAgICAgICAgfQpAQCAtMjYwLDcgKzI2NSw3IEBAIHZvaWQgSW5saW5lRm9ybWF0 dGluZ0NvbnRleHQ6OkxpbmVMYXlvdXQ6OmxheW91dChMYXlvdXRVbml0IHdpZHRoQ29uc3RyYWlu dCkgY29uCiAgICAgdW5zaWduZWQgY3VycmVudElubGluZUl0ZW1JbmRleCA9IDA7CiAgICAgd2hp bGUgKGN1cnJlbnRJbmxpbmVJdGVtSW5kZXggPCBpbmxpbmVJdGVtcy5zaXplKCkpIHsKICAgICAg ICAgYXV0byBsaW5lQ29udGVudCA9IHBsYWNlSW5saW5lSXRlbXMoeyBsaW5lTG9naWNhbFRvcCwg d2lkdGhDb25zdHJhaW50LCBjdXJyZW50SW5saW5lSXRlbUluZGV4LCBpbmxpbmVJdGVtcyB9KTsK LSAgICAgICAgY3JlYXRlRGlzcGxheVJ1bnMoKmxpbmVDb250ZW50LnJ1bnMsIHdpZHRoQ29uc3Ry YWludCk7CisgICAgICAgIGNyZWF0ZURpc3BsYXlSdW5zKCpsaW5lQ29udGVudC5ydW5zLCBsaW5l Q29udGVudC5mbG9hdHMsIHdpZHRoQ29uc3RyYWludCk7CiAgICAgICAgIC8vIFdlIHNob3VsZCBh bHdheXMgcHV0IGF0IGxlYXN0IG9uZSBydW4gb24gdGhlIGxpbmUgYXRtLiBUaGlzIG1pZ2h0IGNo YW5nZSBsYXRlciBvbiB0aG91Z2guCiAgICAgICAgIEFTU0VSVChsaW5lQ29udGVudC5sYXN0SW5s aW5lSXRlbUluZGV4KTsKICAgICAgICAgY3VycmVudElubGluZUl0ZW1JbmRleCA9ICpsaW5lQ29u dGVudC5sYXN0SW5saW5lSXRlbUluZGV4ICsgMTsKQEAgLTI5Nyw4ICszMDIsMjIgQEAgTGF5b3V0 VW5pdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6TGluZUxheW91dDo6Y29tcHV0ZWRJbnRyaW5z aWNXaWR0aChMYXlvdXRVbmkKICAgICByZXR1cm4gc3RkOjptYXgobWF4aW11bUxpbmVXaWR0aCwg bGluZUxvZ2ljYWxSaWdodCAtIHRyaW1tYWJsZVRyYWlsaW5nV2lkdGgpOwogfQogCi12b2lkIElu bGluZUZvcm1hdHRpbmdDb250ZXh0OjpMaW5lTGF5b3V0OjpjcmVhdGVEaXNwbGF5UnVucyhjb25z dCBMaW5lOjpDb250ZW50JiBsaW5lQ29udGVudCwgTGF5b3V0VW5pdCB3aWR0aENvbnN0cmFpbnQp IGNvbnN0Cit2b2lkIElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpMaW5lTGF5b3V0OjpjcmVhdGVE aXNwbGF5UnVucyhjb25zdCBMaW5lOjpDb250ZW50JiBsaW5lQ29udGVudCwgY29uc3QgVmVjdG9y PFdlYWtQdHI8SW5saW5lSXRlbT4+JiBmbG9hdHMsIExheW91dFVuaXQgd2lkdGhDb25zdHJhaW50 KSBjb25zdAogeworICAgIGF1dG8gZmxvYXRpbmdDb250ZXh0ID0gRmxvYXRpbmdDb250ZXh0IHsg bV9mbG9hdGluZ1N0YXRlIH07CisKKyAgICAvLyBNb3ZlIGZsb2F0cyB0byB0aGVpciBmaW5hbCBw b3NpdGlvbi4KKyAgICBmb3IgKGF1dG8gZmxvYXRJdGVtIDogZmxvYXRzKSB7CisgICAgICAgIGF1 dG8mIGZsb2F0Qm94ID0gZmxvYXRJdGVtLT5sYXlvdXRCb3goKTsKKyAgICAgICAgQVNTRVJUKGxh eW91dFN0YXRlKCkuaGFzRGlzcGxheUJveChmbG9hdEJveCkpOworICAgICAgICBhdXRvJiBkaXNw bGF5Qm94ID0gbGF5b3V0U3RhdGUoKS5kaXNwbGF5Qm94Rm9yTGF5b3V0Qm94KGZsb2F0Qm94KTsK KyAgICAgICAgLy8gU2V0IHN0YXRpYyBwb3NpdGlvbiBmaXJzdC4KKyAgICAgICAgZGlzcGxheUJv eC5zZXRUb3BMZWZ0KHsgbGluZUNvbnRlbnQubG9naWNhbExlZnQoKSwgbGluZUNvbnRlbnQubG9n aWNhbFRvcCgpIH0pOworICAgICAgICAvLyBGbG9hdCBpdC4KKyAgICAgICAgZGlzcGxheUJveC5z ZXRUb3BMZWZ0KGZsb2F0aW5nQ29udGV4dC5wb3NpdGlvbkZvckZsb2F0KGZsb2F0Qm94KSk7Cisg ICAgICAgIG1fZmxvYXRpbmdTdGF0ZS5hcHBlbmQoZmxvYXRCb3gpOworICAgIH0KKwogICAgIGlm IChsaW5lQ29udGVudC5pc0VtcHR5KCkpIHsKICAgICAgICAgLy8gU3BlYyB0ZWxscyB1cyB0byBj cmVhdGUgYSB6ZXJvIGhlaWdodCwgZW1wdHkgbGluZSBib3guCiAgICAgICAgIGF1dG8gbGluZUJv eCA9IERpc3BsYXk6OlJlY3QgeyBsaW5lQ29udGVudC5sb2dpY2FsVG9wKCksIGxpbmVDb250ZW50 LmxvZ2ljYWxMZWZ0KCksIDAgLCAwIH07CkBAIC0zOTgsMjEgKzQxNyw2IEBAIHZvaWQgSW5saW5l Rm9ybWF0dGluZ0NvbnRleHQ6OkxpbmVMYXlvdXQ6OmNyZWF0ZURpc3BsYXlSdW5zKGNvbnN0IExp bmU6OkNvbnRlbnQmCiAgICAgICAgIGFsaWduUnVucyhtX2Zvcm1hdHRpbmdSb290LnN0eWxlKCku dGV4dEFsaWduKCksIHByZXZpb3VzTGluZUxhc3RSdW5JbmRleC52YWx1ZU9yKC0xKSArIDEsIHdp ZHRoQ29uc3RyYWludCAtIGxpbmVDb250ZW50LmxvZ2ljYWxXaWR0aCgpKTsKIH0KIAotdm9pZCBJ bmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6TGluZUxheW91dDo6aGFuZGxlRmxvYXQoTGluZSYgbGlu ZSwgY29uc3QgRmxvYXRpbmdDb250ZXh0JiBmbG9hdGluZ0NvbnRleHQsIGNvbnN0IElubGluZUl0 ZW0mIGZsb2F0SXRlbSkgY29uc3QKLXsKLSAgICBhdXRvJiBmbG9hdEJveCA9IGZsb2F0SXRlbS5s YXlvdXRCb3goKTsKLSAgICBBU1NFUlQobGF5b3V0U3RhdGUoKS5oYXNEaXNwbGF5Qm94KGZsb2F0 Qm94KSk7Ci0gICAgYXV0byYgZGlzcGxheUJveCA9IGxheW91dFN0YXRlKCkuZGlzcGxheUJveEZv ckxheW91dEJveChmbG9hdEJveCk7Ci0gICAgLy8gU2V0IHN0YXRpYyBwb3NpdGlvbiBmaXJzdC4K LSAgICBkaXNwbGF5Qm94LnNldFRvcExlZnQoeyBsaW5lLmNvbnRlbnRMb2dpY2FsUmlnaHQoKSwg bGluZS5sb2dpY2FsVG9wKCkgfSk7Ci0gICAgLy8gRmxvYXQgaXQuCi0gICAgZGlzcGxheUJveC5z ZXRUb3BMZWZ0KGZsb2F0aW5nQ29udGV4dC5wb3NpdGlvbkZvckZsb2F0KGZsb2F0Qm94KSk7Ci0g ICAgbV9mbG9hdGluZ1N0YXRlLmFwcGVuZChmbG9hdEJveCk7Ci0gICAgLy8gU2hyaW5rIGF2YWls YmxlIHNwYWNlIGZvciBjdXJyZW50IGxpbmUgYW5kIG1vdmUgZXhpc3RpbmcgaW5saW5lIHJ1bnMu Ci0gICAgYXV0byBmbG9hdEJveFdpZHRoID0gZGlzcGxheUJveC5tYXJnaW5Cb3hXaWR0aCgpOwot ICAgIGZsb2F0Qm94LmlzTGVmdEZsb2F0aW5nUG9zaXRpb25lZCgpID8gbGluZS5tb3ZlTG9naWNh bExlZnQoZmxvYXRCb3hXaWR0aCkgOiBsaW5lLm1vdmVMb2dpY2FsUmlnaHQoZmxvYXRCb3hXaWR0 aCk7Ci19Ci0KIHN0YXRpYyBPcHRpb25hbDxMYXlvdXRVbml0PiBob3Jpem9udGFsQWRqdXN0bWVu dEZvckFsaWdubWVudChUZXh0QWxpZ25Nb2RlIGFsaWduLCBMYXlvdXRVbml0IHJlbWFpbmluZ1dp ZHRoKQogewogICAgIHN3aXRjaCAoYWxpZ24pIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUl0ZW0uaCBiL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUl0ZW0uaAppbmRleCBhOGE3ODY5OWZiM2Y3MWMz ZTUyMTU0ODFjMzk2ODBiYWE1NzA1YzFkLi44NWEzZGUzYjU3ZTM2ZDlmM2U3ODNkYjc5ZjhlNWQw YTgxNGQ2ZWRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0 dGluZy9JbmxpbmVJdGVtLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1h dHRpbmcvSW5saW5lSXRlbS5oCkBAIC0zMCwxMSArMzAsMTIgQEAKICNpbmNsdWRlICJMYXlvdXRC b3guaCIKICNpbmNsdWRlICJMYXlvdXRJbmxpbmVCb3guaCIKICNpbmNsdWRlICJMYXlvdXRMaW5l QnJlYWtCb3guaCIKKyNpbmNsdWRlIDx3dGYvV2Vha1B0ci5oPgogCiBuYW1lc3BhY2UgV2ViQ29y ZSB7CiBuYW1lc3BhY2UgTGF5b3V0IHsKIAotY2xhc3MgSW5saW5lSXRlbSB7CitjbGFzcyBJbmxp bmVJdGVtIDogcHVibGljIENhbk1ha2VXZWFrUHRyPElubGluZUl0ZW0+IHsKIHB1YmxpYzoKICAg ICBlbnVtIGNsYXNzIFR5cGUgeyBUZXh0LCBIYXJkTGluZUJyZWFrLCBCb3gsIEZsb2F0LCBDb250 YWluZXJTdGFydCwgQ29udGFpbmVyRW5kIH07CiAgICAgSW5saW5lSXRlbShjb25zdCBCb3gmIGxh eW91dEJveCwgVHlwZSk7Cg==