187860 2018-07-20 09:35:44 -0700 [LFC][Inline formatting context] Add basic text content handling. 2018-07-20 10:07:13 -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 1443777 0 zalan 2018-07-20 09:35:44 -0700 ssia, 1443791 1 345454 zalan 2018-07-20 09:57:39 -0700 Created attachment 345454 Patch 1443797 2 zalan 2018-07-20 10:05:21 -0700 Committed r234048: <https://trac.webkit.org/changeset/234048> 1443799 3 webkit-bug-importer 2018-07-20 10:07:13 -0700 <rdar://problem/42433695> 345454 2018-07-20 09:57:39 -0700 2018-07-20 10:00:26 -0700 Patch bug-187860-20180720095739.patch text/plain 9564 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjM0MDM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODhkZTg0ZDcwMWRkNjk4 MjBkZmM4OTA4NGI3MmI0OWUzNWY2ZTFhYi4uOGM4ZmU5YTQwMDYwNmUzZmY0ZDlhNzgzYWM5NzNj YTU2ZjdlNTM2YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE4LTA3LTIwICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSW5saW5lIGZvcm1h dHRpbmcgY29udGV4dF0gQWRkIGJhc2ljIHRleHQgY29udGVudCBoYW5kbGluZy4KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4Nzg2MAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIElubGluZUZvcm1hdHRpbmdD b250ZXh0OjpsYXlvdXQoKSB3YWxrcyB0aHJvdWdoIHRoZSBmb3JtYXR0aW5nIHJvb3QncyBkZXNj ZW5kYW50IGxpc3QgaW4gYSBwb3N0LW9yZGVyIGZhc2hpb24gYW5kCisgICAgICAgIGZlZWRzIHRo ZSBUZXh0Q29udGVudFByb3ZpZGVyLgorICAgICAgICBFdmVudHVhbGx5IHRoaXMgd291bGQgdHVy biBpbnRvIGEgbW9yZSBnZW5lcmljIGxvb3Agd2hlcmUgd2Ugc3RvcCBhbmQgcHJvY2VzcyB0aGUg dGV4dCBjb250ZW50IHdoZW4gZmluZGluZyBhIG5vbi10ZXh0IGNvbnRlbnQgYm94IChmbG9hdCwg aW5saW5lLWJveCBldGMpLCBidXQgcmlnaHQgbm93CisgICAgICAgIHRoaXMgaXMgYWJvdXQgdGV4 dCBjb250ZW50IG9ubHkuCisKKyAgICAgICAgKiBsYXlvdXQvZGlzcGxheXRyZWUvRGlzcGxheUJv eC5oOgorICAgICAgICAoV2ViQ29yZTo6RGlzcGxheTo6Qm94Ojpjb250ZW50Qm94Qm90dG9tIGNv bnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkRpc3BsYXk6OkJveDo6Y29udGVudEJveFJpZ2h0IGNv bnN0KToKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5n Q29udGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdD b250ZXh0OjpsYXlvdXQgY29uc3QpOgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5n L3RleHRsYXlvdXQvVGV4dENvbnRlbnRQcm92aWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpM YXlvdXQ6OlRleHRDb250ZW50UHJvdmlkZXI6OnRleHRSdW5zKTogQWRkIGEgaGVscGVyIGZ1bmN0 aW9uIHRvIHN1cHBvcnQgdGhlIGNhc2Ugd2hlbiBhbGwgd2UgbmVlZCBpcyBqdXN0IHRoZSBydW4g bGlzdCBpbiBvbmUgZ28uCisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvdGV4dGxh eW91dC9UZXh0Q29udGVudFByb3ZpZGVyLmg6CisgICAgICAgICogbGF5b3V0L2xheW91dHRyZWUv TGF5b3V0Qm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6Qm94Ojppc0Rlc2NlbmRh bnRPZiBjb25zdCk6CisgICAgICAgICogbGF5b3V0L2xheW91dHRyZWUvTGF5b3V0Qm94Lmg6Cisg ICAgICAgICogbGF5b3V0L2xheW91dHRyZWUvTGF5b3V0SW5saW5lQm94Lmg6CisgICAgICAgIChX ZWJDb3JlOjpMYXlvdXQ6OklubGluZUJveDo6dGV4dENvbnRlbnQgY29uc3QpOgorCiAyMDE4LTA3 LTE5ICBBbnRvaW5lIFF1aW50ICA8Z3Jhb3V0c0BhcHBsZS5jb20+CiAKICAgICAgICAgRmxha3kg Y3Jhc2ggaW4gQW5pbWF0aW9uVGltZWxpbmU6OmNhbmNlbE9yUmVtb3ZlRGVjbGFyYXRpdmVBbmlt YXRpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9kaXNwbGF5dHJlZS9EaXNw bGF5Qm94LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZGlzcGxheXRyZWUvRGlzcGxheUJveC5o CmluZGV4IDc1ODAyM2NmMTg3ODM1NjcwZmU2OGRlNGQxOTQ1YTRmOWM0NjFkNjIuLmQzNGNkZGQy YWU5MjJjMTg3NzhlZjVjYTVhZDY0OGM1MjViYzZkYTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9kaXNwbGF5dHJlZS9EaXNwbGF5Qm94LmgKKysrIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2Rpc3BsYXl0cmVlL0Rpc3BsYXlCb3guaApAQCAtMTQ2LDYgKzE0Niw4IEBAIHB1Ymxp YzoKIAogICAgIExheW91dFVuaXQgY29udGVudEJveFRvcCgpIGNvbnN0IHsgcmV0dXJuIGJvcmRl clRvcCgpICsgcGFkZGluZ1RvcCgpOyB9CiAgICAgTGF5b3V0VW5pdCBjb250ZW50Qm94TGVmdCgp IGNvbnN0IHsgcmV0dXJuIGJvcmRlckxlZnQoKSArIHBhZGRpbmdMZWZ0KCk7IH0KKyAgICBMYXlv dXRVbml0IGNvbnRlbnRCb3hCb3R0b20oKSBjb25zdCB7IHJldHVybiBjb250ZW50Qm94VG9wKCkg KyBjb250ZW50Qm94SGVpZ2h0KCk7IH0KKyAgICBMYXlvdXRVbml0IGNvbnRlbnRCb3hSaWdodCgp IGNvbnN0IHsgcmV0dXJuIGNvbnRlbnRCb3hMZWZ0KCkgKyBjb250ZW50Qm94V2lkdGgoKTsgfQog ICAgIExheW91dFVuaXQgY29udGVudEJveEhlaWdodCgpIGNvbnN0OwogICAgIExheW91dFVuaXQg Y29udGVudEJveFdpZHRoKCkgY29uc3Q7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0 LmNwcAppbmRleCA2ZWYwZTM5YTM5YTE5ZmZhNGE5Y2E3ZGZmMzYwZGIwYWY2ODk1NTRiLi5jMTYw YTg2MmU1YTg1ODY2MDY5YmJkZGY2MjM0ZjRlNWQ5Nzc4Zjg3IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9y bWF0dGluZ0NvbnRleHQuY3BwCkBAIC0zMSw4ICszMSwxNSBAQAogI2luY2x1ZGUgIkZsb2F0aW5n U3RhdGUuaCIKICNpbmNsdWRlICJJbmxpbmVGb3JtYXR0aW5nU3RhdGUuaCIKICNpbmNsdWRlICJM YXlvdXRCb3guaCIKKyNpbmNsdWRlICJMYXlvdXRDb250YWluZXIuaCIKICNpbmNsdWRlICJMYXlv dXRDb250ZXh0LmgiCisjaW5jbHVkZSAiTGF5b3V0SW5saW5lQm94LmgiCisjaW5jbHVkZSAiTGF5 b3V0SW5saW5lQ29udGFpbmVyLmgiCisjaW5jbHVkZSAiTG9nZ2luZy5oIgorI2luY2x1ZGUgIlNp bXBsZUxpbmVCcmVha2VyLmgiCisjaW5jbHVkZSAiVGV4dENvbnRlbnRQcm92aWRlci5oIgogI2lu Y2x1ZGUgPHd0Zi9Jc29NYWxsb2NJbmxpbmVzLmg+CisjaW5jbHVkZSA8d3RmL3RleHQvVGV4dFN0 cmVhbS5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiBuYW1lc3BhY2UgTGF5b3V0IHsKQEAgLTQ0 LDggKzUxLDUyIEBAIElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpJbmxpbmVGb3JtYXR0aW5nQ29u dGV4dChjb25zdCBCb3gmIGZvcm1hdHRpbmdDb250ZXh0Um9vCiB7CiB9CiAKLXZvaWQgSW5saW5l Rm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dChMYXlvdXRDb250ZXh0JiwgRm9ybWF0dGluZ1N0YXRl JikgY29uc3QKK3ZvaWQgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dChMYXlvdXRDb250 ZXh0JiBsYXlvdXRDb250ZXh0LCBGb3JtYXR0aW5nU3RhdGUmKSBjb25zdAogeworICAgIGlmICgh aXM8Q29udGFpbmVyPihyb290KCkpKQorICAgICAgICByZXR1cm47CisKKyAgICBMT0dfV0lUSF9T VFJFQU0oRm9ybWF0dGluZ0NvbnRleHRMYXlvdXQsIHN0cmVhbSA8PCAiW1N0YXJ0XSAtPiBpbmxp bmUgZm9ybWF0dGluZyBjb250ZXh0IC0+IGxheW91dCBjb250ZXh0KCIgPDwgJmxheW91dENvbnRl eHQgPDwgIikgZm9ybWF0dGluZyByb290KCIgPDwgJnJvb3QoKSA8PCAiKSIpOworCisgICAgVGV4 dENvbnRlbnRQcm92aWRlciB0ZXh0Q29udGVudFByb3ZpZGVyOworICAgIGF1dG8mIGZvcm1hdHRp bmdSb290ID0gZG93bmNhc3Q8Q29udGFpbmVyPihyb290KCkpOworICAgIGF1dG8qIGxheW91dEJv eCA9IGZvcm1hdHRpbmdSb290LmZpcnN0SW5GbG93T3JGbG9hdGluZ0NoaWxkKCk7CisgICAgLy8g Q2FzdWFsbHkgd2FsayB0aHJvdWdoIHRoZSBibG9jaydzIGRlc2NlbmRhbnQgYW5kIHBsYWNlIHRo ZSBpbmxpbmUgYm94ZXMgb25lIGFmdGVyIHRoZSBvdGhlciBhcyBtdWNoIGFzIHdlIGNhbiAoeWVh aCwgSSBhbSBsb29raW5nIGF0IHlvdSBmbG9hdHMpLgorICAgIHdoaWxlIChsYXlvdXRCb3gpIHsK KyAgICAgICAgaWYgKGlzPENvbnRhaW5lcj4obGF5b3V0Qm94KSkgeworICAgICAgICAgICAgQVNT RVJUKGlzPElubGluZUNvbnRhaW5lcj4obGF5b3V0Qm94KSk7CisgICAgICAgICAgICBsYXlvdXRC b3ggPSBkb3duY2FzdDxDb250YWluZXI+KCpsYXlvdXRCb3gpLmZpcnN0SW5GbG93T3JGbG9hdGlu Z0NoaWxkKCk7CisgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgfQorICAgICAgICBhdXRv JiBpbmxpbmVCb3ggPSBkb3duY2FzdDxJbmxpbmVCb3g+KCpsYXlvdXRCb3gpOworICAgICAgICAv LyBPbmx5IHRleHQgY29udGVudCBhdCB0aGlzIHBvaW50LgorICAgICAgICBpZiAoaW5saW5lQm94 LnRleHRDb250ZW50KCkpCisgICAgICAgICAgICB0ZXh0Q29udGVudFByb3ZpZGVyLmFwcGVuZFRl eHQoKmlubGluZUJveC50ZXh0Q29udGVudCgpLCBpbmxpbmVCb3guc3R5bGUoKSwgdHJ1ZSk7CisK KyAgICAgICAgZm9yICg7IGxheW91dEJveDsgbGF5b3V0Qm94ID0gbGF5b3V0Qm94LT5jb250YWlu aW5nQmxvY2soKSkgeworICAgICAgICAgICAgaWYgKGxheW91dEJveCA9PSAmZm9ybWF0dGluZ1Jv b3QpIHsKKyAgICAgICAgICAgICAgICBsYXlvdXRCb3ggPSBudWxscHRyOworICAgICAgICAgICAg ICAgIGJyZWFrOworICAgICAgICAgICAgfQorICAgICAgICAgICAgaWYgKGF1dG8qIG5leHRTaWJs aW5nID0gbGF5b3V0Qm94LT5uZXh0SW5GbG93T3JGbG9hdGluZ1NpYmxpbmcoKSkgeworICAgICAg ICAgICAgICAgIGxheW91dEJveCA9IG5leHRTaWJsaW5nOworICAgICAgICAgICAgICAgIGJyZWFr OworICAgICAgICAgICAgfQorICAgICAgICB9CisgICAgICAgIEFTU0VSVCghbGF5b3V0Qm94IHx8 IGxheW91dEJveC0+aXNEZXNjZW5kYW50T2YoZm9ybWF0dGluZ1Jvb3QpKTsKKyAgICB9CisKKyAg ICBhdXRvJiBmb3JtYXR0aW5nUm9vdERpc3BsYXlCb3ggPSAqbGF5b3V0Q29udGV4dC5kaXNwbGF5 Qm94Rm9yTGF5b3V0Qm94KGZvcm1hdHRpbmdSb290KTsKKyAgICBhdXRvIGxpbmVMZWZ0ID0gZm9y bWF0dGluZ1Jvb3REaXNwbGF5Qm94LmNvbnRlbnRCb3hMZWZ0KCk7CisgICAgYXV0byBsaW5lUmln aHQgPSBmb3JtYXR0aW5nUm9vdERpc3BsYXlCb3guY29udGVudEJveFJpZ2h0KCk7CisKKyAgICBh dXRvIHRleHRSdW5zID0gdGV4dENvbnRlbnRQcm92aWRlci50ZXh0UnVucygpOworICAgIFNpbXBs ZUxpbmVCcmVha2VyOjpMaW5lQ29uc3RyYWludExpc3QgY29uc3RyYWludHM7CisgICAgY29uc3Ry YWludHMuYXBwZW5kKHsgeyB9LCBsaW5lTGVmdCwgbGluZVJpZ2h0IH0pOworICAgIFNpbXBsZUxp bmVCcmVha2VyIHNpbXBsZUxpbmVCcmVha2VyKHRleHRSdW5zLCB0ZXh0Q29udGVudFByb3ZpZGVy LCBXVEZNb3ZlKGNvbnN0cmFpbnRzKSwgZm9ybWF0dGluZ1Jvb3Quc3R5bGUoKSk7CisgICAgYXV0 byBsYXlvdXRSdW5zID0gc2ltcGxlTGluZUJyZWFrZXIucnVucygpOworCisgICAgTE9HX1dJVEhf U1RSRUFNKEZvcm1hdHRpbmdDb250ZXh0TGF5b3V0LCBzdHJlYW0gPDwgIltFbmRdIC0+IGlubGlu ZSBmb3JtYXR0aW5nIGNvbnRleHQgLT4gbGF5b3V0IGNvbnRleHQoIiA8PCAmbGF5b3V0Q29udGV4 dCA8PCAiKSBmb3JtYXR0aW5nIHJvb3QoIiA8PCAmcm9vdCgpIDw8ICIpIik7CiB9CiAKIHN0ZDo6 dW5pcXVlX3B0cjxGb3JtYXR0aW5nU3RhdGU+IElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpjcmVh dGVGb3JtYXR0aW5nU3RhdGUoUmVmPEZsb2F0aW5nU3RhdGU+JiYgZmxvYXRpbmdTdGF0ZSwgY29u c3QgTGF5b3V0Q29udGV4dCYgbGF5b3V0Q29udGV4dCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL3RleHRsYXlvdXQvVGV4dENvbnRlbnRQ cm92aWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy90ZXh0 bGF5b3V0L1RleHRDb250ZW50UHJvdmlkZXIuY3BwCmluZGV4IDMyMmQ3MGRkYzA3NzY3ODQ2OGI3 YTdiZTUwOTMxNWVhMGQxYTFhN2IuLmUyMmJiYmNkZWVhNzI5MDU5NTVlNzkyOWIzMGRkN2M1YTE3 N2M0OWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5n L3RleHRsYXlvdXQvVGV4dENvbnRlbnRQcm92aWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2lubGluZWZvcm1hdHRpbmcvdGV4dGxheW91dC9UZXh0Q29udGVudFByb3ZpZGVyLmNw cApAQCAtMjA5LDYgKzIwOSwxOCBAQCBUZXh0Q29udGVudFByb3ZpZGVyOjpJdGVyYXRvciBUZXh0 Q29udGVudFByb3ZpZGVyOjppdGVyYXRvcigpCiAgICAgcmV0dXJuIEl0ZXJhdG9yKCp0aGlzKTsK IH0KIAorVGV4dENvbnRlbnRQcm92aWRlcjo6VGV4dFJ1bkxpc3QgVGV4dENvbnRlbnRQcm92aWRl cjo6dGV4dFJ1bnMoKQoreworICAgIFRleHRSdW5MaXN0IHRleHRSdW5MaXN0OworCisgICAgYXV0 byB0ZXh0UnVuSXRlcmF0b3IgPSBpdGVyYXRvcigpOworICAgIHdoaWxlIChhdXRvIHRleHRSdW0g PSB0ZXh0UnVuSXRlcmF0b3IuY3VycmVudCgpKSB7CisgICAgICAgIHRleHRSdW5MaXN0LmFwcGVu ZCgqdGV4dFJ1bSk7CisgICAgICAgICsrdGV4dFJ1bkl0ZXJhdG9yOworICAgIH0KKyAgICByZXR1 cm4gdGV4dFJ1bkxpc3Q7Cit9CisKIHZvaWQgVGV4dENvbnRlbnRQcm92aWRlcjo6ZmluZE5leHRS dW4oKQogewogICAgIG1fc2ltcGxlVGV4dFJ1bkdlbmVyYXRvci0+ZmluZE5leHRSdW4oKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL3RleHRsYXlv dXQvVGV4dENvbnRlbnRQcm92aWRlci5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZv cm1hdHRpbmcvdGV4dGxheW91dC9UZXh0Q29udGVudFByb3ZpZGVyLmgKaW5kZXggNmE4MGJjN2U0 YzA1NmZjZDBkMzg2NDZlOTExZTA1NGRjMDA5MWRlNS4uYTcxNTQzY2ZjN2NlZTkwOTVmNGVmYTQ5 OWRlMTY4ZTYyNmZmZDkyMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGlu ZWZvcm1hdHRpbmcvdGV4dGxheW91dC9UZXh0Q29udGVudFByb3ZpZGVyLmgKKysrIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvdGV4dGxheW91dC9UZXh0Q29udGVudFBy b3ZpZGVyLmgKQEAgLTg5LDkgKzg5LDExIEBAIHB1YmxpYzoKIAogICAgICAgICBUZXh0Q29udGVu dFByb3ZpZGVyJiBtX2NvbnRlbnRQcm92aWRlcjsKICAgICB9OwotCiAgICAgSXRlcmF0b3IgaXRl cmF0b3IoKTsKIAorICAgIHVzaW5nIFRleHRSdW5MaXN0ID0gVmVjdG9yPFRleHRSdW4+OworICAg IFRleHRSdW5MaXN0IHRleHRSdW5zKCk7CisKIHByaXZhdGU6CiAgICAgZnJpZW5kIGNsYXNzIEl0 ZXJhdG9yOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvbGF5b3V0dHJlZS9M YXlvdXRCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2xheW91dHRyZWUvTGF5b3V0Qm94 LmNwcAppbmRleCA1OTFjOWIyNDhiYzRlNDA2YTg5MTU0NWI1MjVkMmE3MWMyMDE4MGFiLi4yNGJj YzA2NDZhZTJlNmM2M2VhOTU1ZTI0MmUzYmRiNDkzYzhhODA4IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9sYXlvdXR0cmVlL0xheW91dEJveC5jcHAKQEAgLTE0MSw3ICsxNDEsNyBAQCBj b25zdCBDb250YWluZXImIEJveDo6Zm9ybWF0dGluZ0NvbnRleHRSb290KCkgY29uc3QKICAgICBS RUxFQVNFX0FTU0VSVF9OT1RfUkVBQ0hFRCgpOwogfQogCi1ib29sIEJveDo6aXNEZXNjZW5kYW50 T2YoQ29udGFpbmVyJiBjb250YWluZXIpIGNvbnN0Citib29sIEJveDo6aXNEZXNjZW5kYW50T2Yo Y29uc3QgQ29udGFpbmVyJiBjb250YWluZXIpIGNvbnN0CiB7IAogICAgIGZvciAoYXV0byogYW5j ZXN0b3IgPSBjb250YWluaW5nQmxvY2soKTsgYW5jZXN0b3I7IGFuY2VzdG9yID0gYW5jZXN0b3It PmNvbnRhaW5pbmdCbG9jaygpKSB7CiAgICAgICAgIGlmIChhbmNlc3RvciA9PSAmY29udGFpbmVy KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2xheW91dHRyZWUvTGF5b3V0Qm94 LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRCb3guaAppbmRleCBi MWVhOGUwOTZmMmJjODIzY2IxYzU4YzBiMTQwYzU3NzYyN2RiOGU3Li5mZTJjMWVhZjU3NDQ5NWI2 ZGZjYjBiM2M5ZTEzMjViODY1NTZiMGNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvbGF5b3V0dHJlZS9MYXlvdXRCb3guaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvbGF5 b3V0dHJlZS9MYXlvdXRCb3guaApAQCAtNjQsNyArNjQsNyBAQCBwdWJsaWM6CiAKICAgICBjb25z dCBDb250YWluZXIqIGNvbnRhaW5pbmdCbG9jaygpIGNvbnN0OwogICAgIGNvbnN0IENvbnRhaW5l ciYgZm9ybWF0dGluZ0NvbnRleHRSb290KCkgY29uc3Q7Ci0gICAgYm9vbCBpc0Rlc2NlbmRhbnRP ZihDb250YWluZXImKSBjb25zdDsKKyAgICBib29sIGlzRGVzY2VuZGFudE9mKGNvbnN0IENvbnRh aW5lciYpIGNvbnN0OwogCiAgICAgYm9vbCBpc0Fub255bW91cygpIGNvbnN0IHsgcmV0dXJuICFt X2VsZW1lbnRBdHRyaWJ1dGVzOyB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9sYXlvdXR0cmVlL0xheW91dElubGluZUJveC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2xh eW91dHRyZWUvTGF5b3V0SW5saW5lQm94LmgKaW5kZXggZDVhNmI3ZmFlMmZkOTA2ZTcyMmFhYWRk MmY2NGYxMTY5MzUxNGNiMC4uMDkxOTFjN2IzOThhZTNhOTZlMGY4NTViMTZlZDNhOGJmOWNkMjFm NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2xheW91dHRyZWUvTGF5b3V0SW5s aW5lQm94LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2xheW91dHRyZWUvTGF5b3V0SW5s aW5lQm94LmgKQEAgLTQyLDkgKzQyLDEwIEBAIHB1YmxpYzoKICAgICBJbmxpbmVCb3goc3RkOjpv cHRpb25hbDxFbGVtZW50QXR0cmlidXRlcz4sIFJlbmRlclN0eWxlJiYpOwogCiAgICAgdm9pZCBz ZXRUZXh0Q29udGVudChTdHJpbmcgdGV4dCkgeyBtX3RleHRDb250ZW50ID0gdGV4dDsgfQorICAg IHN0ZDo6b3B0aW9uYWw8U3RyaW5nPiB0ZXh0Q29udGVudCgpIGNvbnN0IHsgcmV0dXJuIG1fdGV4 dENvbnRlbnQ7IH0KIAogcHJpdmF0ZToKLSAgICBTdHJpbmcgbV90ZXh0Q29udGVudDsKKyAgICBz dGQ6Om9wdGlvbmFsPFN0cmluZz4gbV90ZXh0Q29udGVudDsKIH07CiAKIH0K