204991 2019-12-07 14:12:21 -0800 [LFC][IFC] Convert InlineLayoutUnit/Point/Rect to LayoutUnit/Point/Rect when crossing inline/block boundary 2019-12-07 19:00:30 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham koivisto sam simon.fraser webkit-bug-importer zalan oldest_to_newest 1596627 0 zalan 2019-12-07 14:12:21 -0800 Implicit floor will do for now (when going from float -> LayoutUnit) 1596628 1 webkit-bug-importer 2019-12-07 14:13:13 -0800 <rdar://problem/57730383> 1596629 2 385106 zalan 2019-12-07 14:20:03 -0800 Created attachment 385106 Patch 1596642 3 385106 sam 2019-12-07 16:53:11 -0800 Comment on attachment 385106 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=385106&action=review > Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp:229 > + LayoutRect rect = Layout::toLayoutRect(run.logicalRect()); Auto? 1596647 4 zalan 2019-12-07 19:00:29 -0800 (In reply to Sam Weinig from comment #3) > Comment on attachment 385106 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=385106&action=review > > > Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp:229 > > + LayoutRect rect = Layout::toLayoutRect(run.logicalRect()); > > Auto? oh right! 1596648 5 zalan 2019-12-07 19:00:30 -0800 Committed r253266: <https://trac.webkit.org/changeset/253266> 385106 2019-12-07 14:20:03 -0800 2019-12-07 16:53:11 -0800 Patch bug-204991-20191207142002.patch text/plain 11124 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjUzMjYxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWFlNTQzODczNzliMTA0 ODQ1NWY2NzRiNjUzOTRkZmNlOGQyNjQ5Zi4uODhhY2Q3ZWQ5YmE3YzBjOGQ3NDg4ODM0Zjk2MzQy ZTI5M2FlMjllNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDE5LTEyLTA3ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBDb252ZXJ0 IElubGluZUxheW91dFVuaXQvUG9pbnQvUmVjdCB0byBMYXlvdXRVbml0L1BvaW50L1JlY3Qgd2hl biBjcm9zc2luZyBpbmxpbmUvYmxvY2sgYm91bmRhcnkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNDk5MQorICAgICAgICA8cmRhcjovL3Byb2JsZW0v NTc3MzAzODM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgRmxvYXQgLT4gTGF5b3V0VW5pdCByZXF1aXJlcyBleHBsaWNpdCBjb252ZXJzaW9uIGR1ZSB0 byBwcmVjaXNpb24gbG9zcy4gVXNlIHRoZXNlIGZ1bmN0aW9ucyB3aGVuCisgICAgICAgIGZlZWRp bmcgaW5saW5lIGJveCBnZW9tZXRyeSBpbmZvcm1hdGlvbiBiYWNrIHRvIGJsb2NrIGxheW91dC4K KworICAgICAgICBJbXBsaWNpdCBmbG9vciB3aWxsIGRvIGZvciBub3cgKG1pZ2h0IG5lZWQgdG8g Y2FsbCByb3VuZCB0aG91Z2gpLgorCisgICAgICAgIFRoaXMgaXMgaW4gcHJlcGFyYXRpb24gZm9y IHVzaW5nIGZsb2F0IGJhc2VkIHR5cGVzIGluIElGQy4gU2VlIHdlYmtpdC5vcmcvYi8yMDQ5ODYg Zm9yIG1vcmUgaW5mby4KKworICAgICAgICAqIGxheW91dC9MYXlvdXRVbml0cy5oOgorICAgICAg ICAoV2ViQ29yZTo6TGF5b3V0Ojp0b0xheW91dFVuaXQpOgorICAgICAgICAoV2ViQ29yZTo6TGF5 b3V0Ojp0b0xheW91dFBvaW50KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6dG9MYXlvdXRS ZWN0KToKKyAgICAgICAgKiBsYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0Nv bnRleHRHZW9tZXRyeS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJsb2NrRm9ybWF0 dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjppbkZsb3dOb25SZXBsYWNlZEhlaWdodEFuZE1hcmdpbik6 CisgICAgICAgICogbGF5b3V0L2Rpc3BsYXl0cmVlL0Rpc3BsYXlJbmxpbmVDb250ZW50LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkRpc3BsYXk6OiBjb25zdCk6CisgICAgICAgICogbGF5b3V0L2lu bGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZWRJbnRyaW5zaWNX aWR0aENvbnN0cmFpbnRzKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRm9ybWF0 dGluZ0NvbnRleHQ6OmNvbnN0cmFpbnRzRm9yTGluZSk6CisgICAgICAgIChXZWJDb3JlOjpMYXlv dXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0OjpzZXREaXNwbGF5Qm94ZXNGb3JMaW5lKToKKyAg ICAgICAgKiBsYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25MaW5lTGF5b3V0LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpMaW5lTGF5b3V0OjpwYWlu dCk6CisKIDIwMTktMTItMDcgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAg ICAgICBbTEZDXVtJRkNdIERpc3BsYXk6OkxpbmVCb3ggc2hvdWxkIGFkb3B0IHRvIElubGluZUxh eW91dFVuaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9MYXlvdXRVbml0cy5o IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L0xheW91dFVuaXRzLmgKaW5kZXggNGQxZjAxMDY2M2Jl Mzg5NTNkNGI2MDNmZTczODY4MjQ2MjQzZGEwNy4uODg5YzZhZDFjNTg2ODBjOWI2MTFhOThiODEy NGUyNTAwNzdhYmFmMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L0xheW91dFVu aXRzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L0xheW91dFVuaXRzLmgKQEAgLTE5OSw2 ICsxOTksMjEgQEAgc3RydWN0IFVzZWRWZXJ0aWNhbFZhbHVlcyB7CiAgICAgT3B0aW9uYWw8TGF5 b3V0VW5pdD4gaGVpZ2h0OwogfTsKIAoraW5saW5lIExheW91dFVuaXQgdG9MYXlvdXRVbml0KElu bGluZUxheW91dFVuaXQgdmFsdWUpCit7CisgICAgcmV0dXJuIExheW91dFVuaXQgeyB2YWx1ZSB9 OworfQorCitpbmxpbmUgTGF5b3V0UG9pbnQgdG9MYXlvdXRQb2ludChjb25zdCBJbmxpbmVMYXlv dXRQb2ludCYgcG9pbnQpCit7CisgICAgcmV0dXJuIExheW91dFBvaW50IHsgcG9pbnQgfTsKK30K KworaW5saW5lIExheW91dFJlY3QgdG9MYXlvdXRSZWN0KGNvbnN0IElubGluZUxheW91dFJlY3Qm IHJlY3QpCit7CisgICAgcmV0dXJuIExheW91dFJlY3QgeyByZWN0IH07Cit9CisKIH0KIH0KICNl bmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9C bG9ja0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCmluZGV4 IGI0NDQ0MjM0MjIyMWFiYjk1MDc0YmI3MTE2ZWYzNGJjMjAxMGI5ZDMuLmZiZTNhZDJmZGY0MjVm M2NhNGUxNDRiNDA1M2Y0MDA3NjlkMmEyMmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGlu Z0NvbnRleHRHZW9tZXRyeS5jcHAKQEAgLTc1LDcgKzc1LDcgQEAgQ29udGVudEhlaWdodEFuZE1h cmdpbiBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6aW5GbG93Tm9uUmVwbGFjZWRI ZWlnaHQKICAgICAgICAgICAgIGF1dG8mIGxpbmVCb3hlcyA9IGRvd25jYXN0PElubGluZUZvcm1h dHRpbmdTdGF0ZT4obGF5b3V0U3RhdGUoKS5lc3RhYmxpc2hlZEZvcm1hdHRpbmdTdGF0ZShsYXlv dXRDb250YWluZXIpKS5kaXNwbGF5SW5saW5lQ29udGVudCgpLT5saW5lQm94ZXM7CiAgICAgICAg ICAgICAvLyBFdmVuIGVtcHR5IGNvbnRhaW5lcnMgZ2VuZXJhdGUgb25lIGxpbmUuIAogICAgICAg ICAgICAgQVNTRVJUKCFsaW5lQm94ZXMuaXNFbXB0eSgpKTsKLSAgICAgICAgICAgIHJldHVybiB7 IGxpbmVCb3hlcy5sYXN0KCkubG9naWNhbEJvdHRvbSgpIC0gYm9yZGVyQW5kUGFkZGluZ1RvcCwg bm9uQ29sbGFwc2VkTWFyZ2luIH07CisgICAgICAgICAgICByZXR1cm4geyB0b0xheW91dFVuaXQo bGluZUJveGVzLmxhc3QoKS5sb2dpY2FsQm90dG9tKCkpIC0gYm9yZGVyQW5kUGFkZGluZ1RvcCwg bm9uQ29sbGFwc2VkTWFyZ2luIH07CiAgICAgICAgIH0KIAogICAgICAgICAvLyAyLiB0aGUgYm90 dG9tIGVkZ2Ugb2YgdGhlIGJvdHRvbSAocG9zc2libHkgY29sbGFwc2VkKSBtYXJnaW4gb2YgaXRz IGxhc3QgaW4tZmxvdyBjaGlsZCwgaWYgdGhlIGNoaWxkJ3MgYm90dG9tIG1hcmdpbi4uLgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Rpc3BsYXl0cmVlL0Rpc3BsYXlJbmxpbmVD b250ZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9kaXNwbGF5dHJlZS9EaXNwbGF5SW5s aW5lQ29udGVudC5jcHAKaW5kZXggZDVhOTkxOTM4NjNkMmNlNTFhMmE1Y2JlYzQxOTA2NGI0Nzg4 MjZjYi4uYmMyMDcwNDkyYjlmMWIxODJlYWU5NTQxNDVlYTc3MTIxZWMxZTc5MyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Rpc3BsYXl0cmVlL0Rpc3BsYXlJbmxpbmVDb250ZW50 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZGlzcGxheXRyZWUvRGlzcGxheUlubGlu ZUNvbnRlbnQuY3BwCkBAIC0zNiw3ICszNiw3IEBAIFdURjo6SXRlcmF0b3JSYW5nZTxjb25zdCBS dW4qPiBJbmxpbmVDb250ZW50OjpydW5zRm9yUmVjdChjb25zdCBMYXlvdXRSZWN0JiByZWN0CiAg ICAgLy8gRklYTUU6IERvIHNvbWV0aGluZyBlZmZpY2llbnQuCiAgICAgY29uc3QgUnVuKiBmaXJz dCA9IG51bGxwdHI7CiAgICAgZm9yIChhdXRvJiBydW4gOiBydW5zKSB7Ci0gICAgICAgIExheW91 dFJlY3QgcnVuUmVjdCA9IHJ1bi5sb2dpY2FsUmVjdCgpOworICAgICAgICBhdXRvIHJ1blJlY3Qg PSBMYXlvdXQ6OnRvTGF5b3V0UmVjdChydW4ubG9naWNhbFJlY3QoKSk7CiAgICAgICAgIGlmIChy dW5SZWN0LmludGVyc2VjdHMocmVjdCkpIHsKICAgICAgICAgICAgIGZpcnN0ID0gJnJ1bjsKICAg ICAgICAgICAgIGJyZWFrOwpAQCAtNDcsNyArNDcsNyBAQCBXVEY6Okl0ZXJhdG9yUmFuZ2U8Y29u c3QgUnVuKj4gSW5saW5lQ29udGVudDo6cnVuc0ZvclJlY3QoY29uc3QgTGF5b3V0UmVjdCYgcmVj dAogCiAgICAgY29uc3QgUnVuKiBsYXN0ID0gbnVsbHB0cjsKICAgICBmb3IgKGF1dG8mIHJ1biA6 IFdURjo6bWFrZVJldmVyc2VkUmFuZ2UocnVucykpIHsKLSAgICAgICAgTGF5b3V0UmVjdCBydW5S ZWN0ID0gcnVuLmxvZ2ljYWxSZWN0KCk7CisgICAgICAgIGF1dG8gcnVuUmVjdCA9IExheW91dDo6 dG9MYXlvdXRSZWN0KHJ1bi5sb2dpY2FsUmVjdCgpKTsKICAgICAgICAgaWYgKHJ1blJlY3QuaW50 ZXJzZWN0cyhyZWN0KSkgewogICAgICAgICAgICAgbGFzdCA9ICZydW47CiAgICAgICAgICAgICBi cmVhazsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5n L0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxp bmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcAppbmRleCA3ZjAwMTM5ZWI0 ZTBjNGFkYjM2ZmNmZWQxNDQ2YWQ3ZTk2NGZiNGZjLi5jZDM4NGEzMWM5OGYwNTdlMWNiNDNmMTYz ZDg2MGU1N2VhZjAyZmIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5l Zm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwCkBA IC0yMTksMTEgKzIxOSwxMSBAQCBGb3JtYXR0aW5nQ29udGV4dDo6SW50cmluc2ljV2lkdGhDb25z dHJhaW50cyBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZWRJbgogICAgICAgICAgICAg YXV0byBjb250ZW50V2lkdGggPSAoYXZhaWxhYmxlV2lkdGggPyBpbnRyaW5zaWNXaWR0aHMtPm1h eGltdW0gOiBpbnRyaW5zaWNXaWR0aHMtPm1pbmltdW0pIC0gZGlzcGxheUJveC5ob3Jpem9udGFs TWFyZ2luQm9yZGVyQW5kUGFkZGluZygpOwogICAgICAgICAgICAgZGlzcGxheUJveC5zZXRDb250 ZW50Qm94V2lkdGgoY29udGVudFdpZHRoKTsKICAgICAgICAgfQotICAgICAgICBhdXRvIHVzZWRI b3Jpem9udGFsVmFsdWVzID0gVXNlZEhvcml6b250YWxWYWx1ZXMgeyBVc2VkSG9yaXpvbnRhbFZh bHVlczo6Q29uc3RyYWludHMgeyAwX2x1LCBhdmFpbGFibGVXaWR0aCB9IH07CisgICAgICAgIGF1 dG8gdXNlZEhvcml6b250YWxWYWx1ZXMgPSBVc2VkSG9yaXpvbnRhbFZhbHVlcyB7IFVzZWRIb3Jp em9udGFsVmFsdWVzOjpDb25zdHJhaW50cyB7IDBfbHUsIHRvTGF5b3V0VW5pdChhdmFpbGFibGVX aWR0aCkgfSB9OwogICAgICAgICByZXR1cm4gY29tcHV0ZWRJbnRyaW5zaWNXaWR0aEZvckNvbnN0 cmFpbnQodXNlZEhvcml6b250YWxWYWx1ZXMpOwogICAgIH07CiAKLSAgICBhdXRvIGNvbnN0cmFp bnRzID0gZ2VvbWV0cnkoKS5jb25zdHJhaW5CeU1pbk1heFdpZHRoKHJvb3QoKSwgeyBtYXhpbXVt TGluZVdpZHRoKDApLCBtYXhpbXVtTGluZVdpZHRoKElubGluZUxheW91dFVuaXQ6Om1heCgpKSB9 KTsKKyAgICBhdXRvIGNvbnN0cmFpbnRzID0gZ2VvbWV0cnkoKS5jb25zdHJhaW5CeU1pbk1heFdp ZHRoKHJvb3QoKSwgeyB0b0xheW91dFVuaXQobWF4aW11bUxpbmVXaWR0aCgwKSksIHRvTGF5b3V0 VW5pdChtYXhpbXVtTGluZVdpZHRoKElubGluZUxheW91dFVuaXQ6Om1heCgpKSkgfSk7CiAgICAg Zm9ybWF0dGluZ1N0YXRlKCkuc2V0SW50cmluc2ljV2lkdGhDb25zdHJhaW50cyhjb25zdHJhaW50 cyk7CiAgICAgcmV0dXJuIGNvbnN0cmFpbnRzOwogfQpAQCAtMzgwLDcgKzM4MCw3IEBAIExpbmVC dWlsZGVyOjpDb25zdHJhaW50cyBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6Y29uc3RyYWludHNG b3JMaW5lKGNvbnN0IFVzZWRICiAgICAgYXV0byBmbG9hdGluZ0NvbnRleHQgPSBGbG9hdGluZ0Nv bnRleHQgeyByb290KCksICp0aGlzLCBmb3JtYXR0aW5nU3RhdGUoKS5mbG9hdGluZ1N0YXRlKCkg fTsKICAgICAvLyBDaGVjayBmb3IgaW50cnVkaW5nIGZsb2F0cyBhbmQgYWRqdXN0IGxvZ2ljYWwg bGVmdC9hdmFpbGFibGUgd2lkdGggZm9yIHRoaXMgbGluZSBhY2NvcmRpbmdseS4KICAgICBpZiAo IWZsb2F0aW5nQ29udGV4dC5pc0VtcHR5KCkpIHsKLSAgICAgICAgYXV0byBmbG9hdENvbnN0cmFp bnRzID0gZmxvYXRpbmdDb250ZXh0LmNvbnN0cmFpbnRzKHsgbGluZUxvZ2ljYWxUb3AgfSk7Cisg ICAgICAgIGF1dG8gZmxvYXRDb25zdHJhaW50cyA9IGZsb2F0aW5nQ29udGV4dC5jb25zdHJhaW50 cyh7IHRvTGF5b3V0VW5pdChsaW5lTG9naWNhbFRvcCkgfSk7CiAgICAgICAgIC8vIENoZWNrIGlm IHRoZXNlIGNvbnN0cmFpbnRzIGFjdHVhbGx5IHB1dCBsaW1pdGF0aW9uIG9uIHRoZSBsaW5lLgog ICAgICAgICBpZiAoZmxvYXRDb25zdHJhaW50cy5sZWZ0ICYmIGZsb2F0Q29uc3RyYWludHMubGVm dC0+eCA8PSBsaW5lTG9naWNhbExlZnQpCiAgICAgICAgICAgICBmbG9hdENvbnN0cmFpbnRzLmxl ZnQgPSB7IH07CkBAIC00NDUsOSArNDQ1LDkgQEAgdm9pZCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4 dDo6c2V0RGlzcGxheUJveGVzRm9yTGluZShjb25zdCBMaW5lTGF5b3V0Q29udGV4dDo6TGkKICAg ICAgICAgICAgIGlubGluZUNvbnRlbnQucnVucy5hcHBlbmQoeyBsaW5lSW5kZXgsIGxpbmVSdW4u bGF5b3V0Qm94KCksIGxpbmVSdW4ubG9naWNhbFJlY3QoKSwgbGluZVJ1bi50ZXh0Q29udGV4dCgp IH0pOwogCiAgICAgICAgIGlmIChsaW5lUnVuLmlzTGluZUJyZWFrKCkpIHsKLSAgICAgICAgICAg IGRpc3BsYXlCb3guc2V0VG9wTGVmdChsb2dpY2FsUmVjdC50b3BMZWZ0KCkpOwotICAgICAgICAg ICAgZGlzcGxheUJveC5zZXRDb250ZW50Qm94V2lkdGgobG9naWNhbFJlY3Qud2lkdGgoKSk7Ci0g ICAgICAgICAgICBkaXNwbGF5Qm94LnNldENvbnRlbnRCb3hIZWlnaHQobG9naWNhbFJlY3QuaGVp Z2h0KCkpOworICAgICAgICAgICAgZGlzcGxheUJveC5zZXRUb3BMZWZ0KHRvTGF5b3V0UG9pbnQo bG9naWNhbFJlY3QudG9wTGVmdCgpKSk7CisgICAgICAgICAgICBkaXNwbGF5Qm94LnNldENvbnRl bnRCb3hXaWR0aCh0b0xheW91dFVuaXQobG9naWNhbFJlY3Qud2lkdGgoKSkpOworICAgICAgICAg ICAgZGlzcGxheUJveC5zZXRDb250ZW50Qm94SGVpZ2h0KHRvTGF5b3V0VW5pdChsb2dpY2FsUmVj dC5oZWlnaHQoKSkpOwogICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgIH0KIApAQCAtNDU2 LDEzICs0NTYsMTMgQEAgdm9pZCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6c2V0RGlzcGxheUJv eGVzRm9yTGluZShjb25zdCBMaW5lTGF5b3V0Q29udGV4dDo6TGkKICAgICAgICAgICAgIGF1dG8g dG9wTGVmdCA9IGxvZ2ljYWxSZWN0LnRvcExlZnQoKTsKICAgICAgICAgICAgIGlmIChsYXlvdXRC b3guaXNJbkZsb3dQb3NpdGlvbmVkKCkpCiAgICAgICAgICAgICAgICAgdG9wTGVmdCArPSBnZW9t ZXRyeSgpLmluRmxvd1Bvc2l0aW9uZWRQb3NpdGlvbk9mZnNldChsYXlvdXRCb3gsIHVzZWRIb3Jp em9udGFsVmFsdWVzKTsKLSAgICAgICAgICAgIGRpc3BsYXlCb3guc2V0VG9wTGVmdCh0b3BMZWZ0 KTsKKyAgICAgICAgICAgIGRpc3BsYXlCb3guc2V0VG9wTGVmdCh0b0xheW91dFBvaW50KHRvcExl ZnQpKTsKICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICB9CiAKICAgICAgICAgLy8gSW5s aW5lIGxldmVsIGNvbnRhaW5lciBzdGFydCAoPHNwYW4+KQogICAgICAgICBpZiAobGluZVJ1bi5p c0NvbnRhaW5lclN0YXJ0KCkpIHsKLSAgICAgICAgICAgIGRpc3BsYXlCb3guc2V0VG9wTGVmdChs b2dpY2FsUmVjdC50b3BMZWZ0KCkpOworICAgICAgICAgICAgZGlzcGxheUJveC5zZXRUb3BMZWZ0 KHRvTGF5b3V0UG9pbnQobG9naWNhbFJlY3QudG9wTGVmdCgpKSk7CiAgICAgICAgICAgICBjb250 aW51ZTsKICAgICAgICAgfQogCkBAIC00NzYsOCArNDc2LDggQEAgdm9pZCBJbmxpbmVGb3JtYXR0 aW5nQ29udGV4dDo6c2V0RGlzcGxheUJveGVzRm9yTGluZShjb25zdCBMaW5lTGF5b3V0Q29udGV4 dDo6TGkKICAgICAgICAgICAgIGF1dG8gbWFyZ2luQm94V2lkdGggPSBsb2dpY2FsUmVjdC5sZWZ0 KCkgLSBkaXNwbGF5Qm94LmxlZnQoKTsKICAgICAgICAgICAgIGF1dG8gY29udGVudEJveFdpZHRo ID0gbWFyZ2luQm94V2lkdGggLSAoZGlzcGxheUJveC5tYXJnaW5TdGFydCgpICsgZGlzcGxheUJv eC5ib3JkZXJMZWZ0KCkgKyBkaXNwbGF5Qm94LnBhZGRpbmdMZWZ0KCkudmFsdWVPcigwKSk7CiAg ICAgICAgICAgICAvLyBGSVhNRSBmaXggaXQgZm9yIG11bHRpbGluZS4KLSAgICAgICAgICAgIGRp c3BsYXlCb3guc2V0Q29udGVudEJveFdpZHRoKGNvbnRlbnRCb3hXaWR0aCk7Ci0gICAgICAgICAg ICBkaXNwbGF5Qm94LnNldENvbnRlbnRCb3hIZWlnaHQobG9naWNhbFJlY3QuaGVpZ2h0KCkpOwor ICAgICAgICAgICAgZGlzcGxheUJveC5zZXRDb250ZW50Qm94V2lkdGgodG9MYXlvdXRVbml0KGNv bnRlbnRCb3hXaWR0aCkpOworICAgICAgICAgICAgZGlzcGxheUJveC5zZXRDb250ZW50Qm94SGVp Z2h0KHRvTGF5b3V0VW5pdChsb2dpY2FsUmVjdC5oZWlnaHQoKSkpOwogICAgICAgICAgICAgY29u dGludWU7CiAgICAgICAgIH0KIApAQCAtNDg2LDEyICs0ODYsMTIgQEAgdm9pZCBJbmxpbmVGb3Jt YXR0aW5nQ29udGV4dDo6c2V0RGlzcGxheUJveGVzRm9yTGluZShjb25zdCBMaW5lTGF5b3V0Q29u dGV4dDo6TGkKICAgICAgICAgICAgIGF1dG8gZmlyc3RSdW5Gb3JMYXlvdXRCb3ggPSAhaW5kZXgg fHwgJmxpbmVSdW5zW2luZGV4IC0gMV0ubGF5b3V0Qm94KCkgIT0gJmxheW91dEJveDsgCiAgICAg ICAgICAgICBpZiAoZmlyc3RSdW5Gb3JMYXlvdXRCb3gpIHsKICAgICAgICAgICAgICAgICAvLyBT ZXR1cCBkaXNwbGF5IGJveCBmb3IgdGhlIGFzc29jaWF0ZWQgbGF5b3V0IGJveC4KLSAgICAgICAg ICAgICAgICBkaXNwbGF5Qm94LnNldFRvcExlZnQobG9naWNhbFJlY3QudG9wTGVmdCgpKTsKLSAg ICAgICAgICAgICAgICBkaXNwbGF5Qm94LnNldENvbnRlbnRCb3hXaWR0aChsb2dpY2FsUmVjdC53 aWR0aCgpKTsKLSAgICAgICAgICAgICAgICBkaXNwbGF5Qm94LnNldENvbnRlbnRCb3hIZWlnaHQo bG9naWNhbFJlY3QuaGVpZ2h0KCkpOworICAgICAgICAgICAgICAgIGRpc3BsYXlCb3guc2V0VG9w TGVmdCh0b0xheW91dFBvaW50KGxvZ2ljYWxSZWN0LnRvcExlZnQoKSkpOworICAgICAgICAgICAg ICAgIGRpc3BsYXlCb3guc2V0Q29udGVudEJveFdpZHRoKHRvTGF5b3V0VW5pdChsb2dpY2FsUmVj dC53aWR0aCgpKSk7CisgICAgICAgICAgICAgICAgZGlzcGxheUJveC5zZXRDb250ZW50Qm94SGVp Z2h0KHRvTGF5b3V0VW5pdChsb2dpY2FsUmVjdC5oZWlnaHQoKSkpOwogICAgICAgICAgICAgfSBl bHNlIHsKICAgICAgICAgICAgICAgICAvLyBGSVhNRSBmaXggaXQgZm9yIG11bHRpcnVuL211bHRp bGluZS4KLSAgICAgICAgICAgICAgICBkaXNwbGF5Qm94LnNldENvbnRlbnRCb3hXaWR0aChkaXNw bGF5Qm94LmNvbnRlbnRCb3hXaWR0aCgpICsgbG9naWNhbFJlY3Qud2lkdGgoKSk7CisgICAgICAg ICAgICAgICAgZGlzcGxheUJveC5zZXRDb250ZW50Qm94V2lkdGgodG9MYXlvdXRVbml0KGRpc3Bs YXlCb3guY29udGVudEJveFdpZHRoKCkgKyBsb2dpY2FsUmVjdC53aWR0aCgpKSk7CiAgICAgICAg ICAgICB9CiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uTGluZUxheW91 dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRp b25MaW5lTGF5b3V0LmNwcAppbmRleCA1MDI1NGYzMGI1MGE2MzU3NDY3MDMzN2UzYmM2MmIxYjhj NjE0NjY2Li5hYTdkYjZjZDI4M2RmNTYzYjEyNDFmMjVlNzlkNjMxNGQxNjg2ZmZjIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25M aW5lTGF5b3V0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5 b3V0SW50ZWdyYXRpb25MaW5lTGF5b3V0LmNwcApAQCAtMjI2LDcgKzIyNiw3IEBAIHZvaWQgTGlu ZUxheW91dDo6cGFpbnQoUGFpbnRJbmZvJiBwYWludEluZm8sIGNvbnN0IExheW91dFBvaW50JiBw YWludE9mZnNldCkKICAgICAgICAgaWYgKHN0eWxlLnZpc2liaWxpdHkoKSAhPSBWaXNpYmlsaXR5 OjpWaXNpYmxlKQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIExheW91dFJlY3QgcmVj dCA9IHJ1bi5sb2dpY2FsUmVjdCgpOworICAgICAgICBMYXlvdXRSZWN0IHJlY3QgPSBMYXlvdXQ6 OnRvTGF5b3V0UmVjdChydW4ubG9naWNhbFJlY3QoKSk7CiAgICAgICAgIGF1dG8gdmlzdWFsT3Zl cmZsb3dSZWN0ID0gY29tcHV0ZU92ZXJmbG93KHN0eWxlLCByZWN0LCB2aWV3cG9ydFNpemUpOwog ICAgICAgICBpZiAocGFpbnRSZWN0LnkoKSA+IHZpc3VhbE92ZXJmbG93UmVjdC5tYXhZKCkgfHwg cGFpbnRSZWN0Lm1heFkoKSA8IHZpc3VhbE92ZXJmbG93UmVjdC55KCkpCiAgICAgICAgICAgICBj b250aW51ZTsK