207440 2020-02-09 08:26:19 -0800 [LFC] FloatingContext::constraints should take a vertical range instead of just vertical position. 2020-02-09 09:46:10 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham commit-queue koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1616671 0 zalan 2020-02-09 08:26:19 -0800 so that the available horizontal space can be adjusted for the entire line in case of IFC. 1616672 1 webkit-bug-importer 2020-02-09 08:26:43 -0800 <rdar://problem/59295022> 1616673 2 390205 zalan 2020-02-09 08:34:13 -0800 Created attachment 390205 Patch 1616677 3 390205 commit-queue 2020-02-09 09:46:09 -0800 Comment on attachment 390205 Patch Clearing flags on attachment: 390205 Committed r256101: <https://trac.webkit.org/changeset/256101> 1616678 4 commit-queue 2020-02-09 09:46:10 -0800 All reviewed patches have been landed. Closing bug. 390205 2020-02-09 08:34:13 -0800 2020-02-09 09:46:09 -0800 Patch bug-207440-20200209083412.patch text/plain 8537 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjU1Mzc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWRlM2FlZTNjM2FiZjY1 YjY3NmZhZTE4YmI2YTRiNzBiNTYwMWFkMy4uMWNjMzczNmZjYWNmMmRjYWIxOGVhOTQzY2RiOTc5 OWM0YjJjYWVhMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIwLTAyLTA5ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ10gRmxvYXRpbmdDb250 ZXh0Ojpjb25zdHJhaW50cyBzaG91bGQgdGFrZSBhIHZlcnRpY2FsIHJhbmdlIGluc3RlYWQgb2Yg anVzdCB2ZXJ0aWNhbCBwb3NpdGlvbi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIwNzQ0MAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTkyOTUwMjI+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW4gYW4g SUZDLCB0aGlzIGNvdmVycyB0aGUgZW50aXJlIGxpbmUgd2hlbiBzZWFyY2hpbmcgZm9yIGludHJ1 c2l2ZSBmbG9hdCB0byBzaHJpbmsgdGhlIGF2YWlsYWJsZSBob3Jpem9udGFsIHNwYWNlLgorICAg ICAgICAoVGhpcyBmaXggaXMgbGltaXRlZCB0byBjb250ZW50IHdpdGggZml4ZWQgbGluZSBoZWln aHQpCisKKyAgICAgICAgKiBsYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0Nv bnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpCbG9ja0Zvcm1hdHRpbmdDb250 ZXh0Ojp1c2VkQXZhaWxhYmxlV2lkdGhGb3JGbG9hdEF2b2lkZXIgY29uc3QpOgorICAgICAgICAq IGxheW91dC9mbG9hdHMvRmxvYXRpbmdDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okxh eW91dDo6RmxvYXRpbmdDb250ZXh0Ojpjb25zdHJhaW50cyBjb25zdCk6CisgICAgICAgICogbGF5 b3V0L2Zsb2F0cy9GbG9hdGluZ0NvbnRleHQuaDoKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9y bWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpM YXlvdXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0OjpsaW5lTGF5b3V0KToKKyAgICAgICAgKFdl YkNvcmU6OkxheW91dDo6SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmNvbnN0cmFpbnRzRm9yTGlu ZSk6CisKIDIwMjAtMDItMDggIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAg ICAgICBbTEZDXVtCRkNdIFJlcGxhY2UgImVzdGltYXRlZCIgdGVybSB3aXRoICJwcmVjb21wdXRl ZCIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxv Y2tGb3JtYXR0aW5nQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3Jt YXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwCmluZGV4IDM2MmRhNDA1ZGIwOGZmNTQ0 MjZmODBlZWY1MTIwMDQ3MDZlNjU1MzEuLjFiMWQ1YzJhMzE4NTUwMjFiNDE4ZTEwMGI3NWFhZjFj NjdkZWVmMTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRp bmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmNwcApAQCAtMTgzLDcgKzE4 Myw5IEBAIE9wdGlvbmFsPExheW91dFVuaXQ+IEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6OnVzZWRB dmFpbGFibGVXaWR0aEZvckZsb2F0QXZvaWRlcihjCiAgICAgICAgIHJldHVybiB7IH07CiAgICAg Ly8gVmVydGljYWwgc3RhdGljIHBvc2l0aW9uIGlzIG5vdCBjb21wdXRlZCB5ZXQsIHNvIGxldCdz IGp1c3QgcHJlLWNvbXB1dGUgaXQgZm9yIG5vdy4KICAgICBhdXRvIHZlcnRpY2FsUG9zaXRpb24g PSBtYXBUb3BUb0Zvcm1hdHRpbmdDb250ZXh0Um9vdChsYXlvdXRCb3gpOwotICAgIGF1dG8gY29u c3RyYWludHMgPSBmbG9hdGluZ0NvbnRleHQuY29uc3RyYWludHMoeyB2ZXJ0aWNhbFBvc2l0aW9u IH0pOworICAgIC8vIEZJWE1FOiBDaGVjayBpZiB0aGUgbm9uLXlldC1jb21wdXRlZCBoZWlnaHQg YWZmZWN0cyB0aGlzIGNvbXB1dGF0aW9uIC0gYW5kIHdoZXRoZXIgd2UgaGF2ZSB0byByZXNvbHZl IGl0CisgICAgLy8gYXQgYSBsYXRlciBwb2ludCBvciBub3QgKGNhbid0IGZpbmQgdGhpcyBpbiB0 aGUgc3BlYykuCisgICAgYXV0byBjb25zdHJhaW50cyA9IGZsb2F0aW5nQ29udGV4dC5jb25zdHJh aW50cyh2ZXJ0aWNhbFBvc2l0aW9uLCB2ZXJ0aWNhbFBvc2l0aW9uKTsKICAgICBpZiAoIWNvbnN0 cmFpbnRzLmxlZnQgJiYgIWNvbnN0cmFpbnRzLnJpZ2h0KQogICAgICAgICByZXR1cm4geyB9Owog ICAgIGF1dG8mIGNvbnRhaW5pbmdCbG9jayA9ICpsYXlvdXRCb3guY29udGFpbmluZ0Jsb2NrKCk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZmxvYXRzL0Zsb2F0aW5nQ29udGV4 dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZmxvYXRzL0Zsb2F0aW5nQ29udGV4dC5jcHAK aW5kZXggNmE2ZjYxMDIwNmVjM2RkZmM3NTgyOGIwNjY0NWMzMjczMTA2YmI4YS4uOTdkMTE4NTMw MmU1Y2FkYTk2MjhkMjI1NzIxZmZlOThjNDA0YmRjYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Zsb2F0cy9GbG9hdGluZ0NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9mbG9hdHMvRmxvYXRpbmdDb250ZXh0LmNwcApAQCAtMjc2LDIyICsyNzYsMjMgQEAg RmxvYXRpbmdDb250ZXh0OjpDbGVhcmFuY2VQb3NpdGlvbiBGbG9hdGluZ0NvbnRleHQ6OnZlcnRp Y2FsUG9zaXRpb25XaXRoQ2xlYXJhbmMKICAgICByZXR1cm4geyB9OwogfQogCi1GbG9hdGluZ0Nv bnRleHQ6OkNvbnN0cmFpbnRzIEZsb2F0aW5nQ29udGV4dDo6Y29uc3RyYWludHMoUG9zaXRpb25J bkNvbnRleHRSb290IHZlcnRpY2FsUG9zaXRpb24pIGNvbnN0CitGbG9hdGluZ0NvbnRleHQ6OkNv bnN0cmFpbnRzIEZsb2F0aW5nQ29udGV4dDo6Y29uc3RyYWludHMoTGF5b3V0VW5pdCBsb2dpY2Fs VG9wLCBMYXlvdXRVbml0IGxvZ2ljYWxCb3R0b20pIGNvbnN0CiB7CiAgICAgaWYgKGlzRW1wdHko KSkKICAgICAgICAgcmV0dXJuIHsgfTsKIAogICAgIC8vIDEuIENvbnZlcnQgdmVydGljYWwgcG9z aXRpb24gaWYgdGhpcyBmbG9hdGluZyBjb250ZXh0IGlzIGluaGVyaXRlZC4KLSAgICAvLyAyLiBG aW5kIHRoZSBpbm5lciBsZWZ0L3JpZ2h0IGZsb2F0cyBhdCB2ZXJ0aWNhbFBvc2l0aW9uLgorICAg IC8vIDIuIEZpbmQgdGhlIGlubmVyIGxlZnQvcmlnaHQgZmxvYXRzIGF0IGxvZ2ljYWxUb3AvbG9n aWNhbEJvdHRvbS4KICAgICAvLyAzLiBDb252ZXJ0IGxlZnQvcmlnaHQgcG9zaXRpb25zIGJhY2sg dG8gZm9ybWF0dGluZ0NvbnRleHRSb290J3MgY29vcmlkbmF0ZSBzeXN0ZW0uCiAgICAgYXV0byBj b29yZGluYXRlTWFwcGluZ0lzUmVxdWlyZWQgPSAmZmxvYXRpbmdTdGF0ZSgpLnJvb3QoKSAhPSAm cm9vdCgpOwotICAgIGF1dG8gYWRqdXN0ZWRQb3NpdGlvbiA9IFBvaW50IHsgMCwgdmVydGljYWxQ b3NpdGlvbiB9OworICAgIGF1dG8gYWRqdXN0ZWRMb2dpY2FsVG9wID0gbG9naWNhbFRvcDsKICAg ICBMYXlvdXRTaXplIGFkanVzdGluZ0RlbHRhOwotCiAgICAgaWYgKGNvb3JkaW5hdGVNYXBwaW5n SXNSZXF1aXJlZCkgewotICAgICAgICBhZGp1c3RlZFBvc2l0aW9uID0gbWFwUG9pbnRGcm9tRm9y bWF0dGluZ0NvbnRleHRSb290VG9GbG9hdGluZ1N0YXRlUm9vdChhZGp1c3RlZFBvc2l0aW9uKTsK LSAgICAgICAgYWRqdXN0aW5nRGVsdGEgPSB7IGFkanVzdGVkUG9zaXRpb24ueCwgYWRqdXN0ZWRQ b3NpdGlvbi55IC0gdmVydGljYWxQb3NpdGlvbiB9OworICAgICAgICBhdXRvIGFkanVzdGVkUG9z aXRpb24gPSBtYXBQb2ludEZyb21Gb3JtYXR0aW5nQ29udGV4dFJvb3RUb0Zsb2F0aW5nU3RhdGVS b290KHsgMCwgbG9naWNhbFRvcCB9KTsKKyAgICAgICAgYWRqdXN0ZWRMb2dpY2FsVG9wID0gYWRq dXN0ZWRQb3NpdGlvbi55OworICAgICAgICBhZGp1c3RpbmdEZWx0YSA9IHsgYWRqdXN0ZWRQb3Np dGlvbi54LCBhZGp1c3RlZExvZ2ljYWxUb3AgLSBsb2dpY2FsVG9wIH07CiAgICAgfQorICAgIGF1 dG8gYWRqdXN0ZWRMb2dpY2FsQm90dG9tID0gYWRqdXN0ZWRMb2dpY2FsVG9wICsgKGxvZ2ljYWxC b3R0b20gLSBsb2dpY2FsVG9wKTsKIAogICAgIENvbnN0cmFpbnRzIGNvbnN0cmFpbnRzOwogICAg IGF1dG8mIGZsb2F0cyA9IGZsb2F0aW5nU3RhdGUoKS5mbG9hdHMoKTsKQEAgLTMwNSw3ICszMDYs NyBAQCBGbG9hdGluZ0NvbnRleHQ6OkNvbnN0cmFpbnRzIEZsb2F0aW5nQ29udGV4dDo6Y29uc3Ry YWludHMoUG9zaXRpb25JbkNvbnRleHRSb290CiAgICAgICAgICAgICBjb250aW51ZTsKIAogICAg ICAgICBhdXRvIHJlY3QgPSBmbG9hdEl0ZW0ucmVjdFdpdGhNYXJnaW4oKTsKLSAgICAgICAgaWYg KCEocmVjdC50b3AoKSA8PSBhZGp1c3RlZFBvc2l0aW9uLnkgJiYgYWRqdXN0ZWRQb3NpdGlvbi55 IDwgcmVjdC5ib3R0b20oKSkpCisgICAgICAgIGlmIChyZWN0LnRvcCgpID49IGFkanVzdGVkTG9n aWNhbEJvdHRvbSB8fCByZWN0LmJvdHRvbSgpIDw9IGFkanVzdGVkTG9naWNhbFRvcCkKICAgICAg ICAgICAgIGNvbnRpbnVlOwogCiAgICAgICAgIGlmIChmbG9hdEl0ZW0uaXNMZWZ0UG9zaXRpb25l ZCgpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zsb2F0cy9GbG9hdGluZ0Nv bnRleHQuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mbG9hdHMvRmxvYXRpbmdDb250ZXh0LmgK aW5kZXggMTJiMDhmNzg2OTk1OTZiZDIyMzA3YzhjZTFkNmQyOGM4NDVjODViOC4uMjA1YzQ1YjYw MGQ1OWFhNWUzMzIyMDJjNzU5YTFmOGUxMDdmZjJkNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Zsb2F0cy9GbG9hdGluZ0NvbnRleHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvZmxvYXRzL0Zsb2F0aW5nQ29udGV4dC5oCkBAIC02NCw3ICs2NCw3IEBAIHB1YmxpYzoK ICAgICAgICAgT3B0aW9uYWw8UG9pbnRJbkNvbnRleHRSb290PiBsZWZ0OwogICAgICAgICBPcHRp b25hbDxQb2ludEluQ29udGV4dFJvb3Q+IHJpZ2h0OwogICAgIH07Ci0gICAgQ29uc3RyYWludHMg Y29uc3RyYWludHMoUG9zaXRpb25JbkNvbnRleHRSb290IHZlcnRpY2FsUG9zaXRpb24pIGNvbnN0 OworICAgIENvbnN0cmFpbnRzIGNvbnN0cmFpbnRzKExheW91dFVuaXQgbG9naWNhbFRvcCwgTGF5 b3V0VW5pdCBsb2dpY2FsQm90dG9tKSBjb25zdDsKICAgICB2b2lkIGFwcGVuZChjb25zdCBCb3gm KTsKIAogcHJpdmF0ZToKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVm b3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcAppbmRleCBm ZjI2ZmU2YzY0OGE5OTg4ZjJmM2I5NTE0NzA2ZGVmOGMyZmQyN2I0Li41MmM3NmViOTQ2NDlhYmQ0 YTYwZmRjY2E5ZWZlMTMyNDhjMDZiZjdjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRl eHQuY3BwCkBAIC0xNTksNyArMTU5LDcgQEAgdm9pZCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6 bGluZUxheW91dChJbmxpbmVJdGVtcyYgaW5saW5lSXRlbXMsIExpbmVMYXlvdXRDb24KICAgICAg ICAgQVNTRVJUKGxpbmVCdWlsZGVyLmhhc0ludHJ1c2l2ZUZsb2F0KCkpOwogICAgICAgICAvLyBN b3ZlIHRoZSBuZXh0IGxpbmUgYmVsb3cgdGhlIGludHJ1c2l2ZSBmbG9hdC4KICAgICAgICAgYXV0 byBmbG9hdGluZ0NvbnRleHQgPSBGbG9hdGluZ0NvbnRleHQgeyByb290KCksICp0aGlzLCBmb3Jt YXR0aW5nU3RhdGUoKS5mbG9hdGluZ1N0YXRlKCkgfTsKLSAgICAgICAgYXV0byBmbG9hdENvbnN0 cmFpbnRzID0gZmxvYXRpbmdDb250ZXh0LmNvbnN0cmFpbnRzKHsgbGluZUxvZ2ljYWxUb3AgfSk7 CisgICAgICAgIGF1dG8gZmxvYXRDb25zdHJhaW50cyA9IGZsb2F0aW5nQ29udGV4dC5jb25zdHJh aW50cyhsaW5lTG9naWNhbFRvcCwgdG9MYXlvdXRVbml0KGxpbmVDb250ZW50LmxpbmVCb3gubG9n aWNhbEJvdHRvbSgpKSApOwogICAgICAgICBBU1NFUlQoZmxvYXRDb25zdHJhaW50cy5sZWZ0IHx8 IGZsb2F0Q29uc3RyYWludHMucmlnaHQpOwogICAgICAgICBzdGF0aWMgYXV0byBpbmlmaXRlUG9p bnQgPSBQb2ludEluQ29udGV4dFJvb3Q6Om1heCgpOwogICAgICAgICAvLyBJbiBjYXNlIG9mIGxl ZnQgYW5kIHJpZ2h0IGNvbnN0cmFpbnRzLCB3ZSBuZWVkIHRvIHBpY2sgdGhlIG9uZSB0aGF0J3Mg Y2xvc2VyIHRvIHRoZSBjdXJyZW50IGxpbmUuCkBAIC0zNTcsMTIgKzM1NywxNCBAQCBMaW5lQnVp bGRlcjo6Q29uc3RyYWludHMgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmNvbnN0cmFpbnRzRm9y TGluZShjb25zdCBIb3JpegogewogICAgIGF1dG8gbGluZUxvZ2ljYWxMZWZ0ID0gaG9yaXpvbnRh bENvbnN0cmFpbnRzLmxvZ2ljYWxMZWZ0OwogICAgIGF1dG8gbGluZUxvZ2ljYWxSaWdodCA9IGxp bmVMb2dpY2FsTGVmdCArIGhvcml6b250YWxDb25zdHJhaW50cy5sb2dpY2FsV2lkdGg7CisgICAg YXV0byBsaW5lSGVpZ2h0QW5kQmFzZWxpbmUgPSBxdWlya3MoKS5saW5lSGVpZ2h0Q29uc3RyYWlu dHMocm9vdCgpKTsKICAgICBhdXRvIGxpbmVJc0NvbnN0cmFpbmVkQnlGbG9hdCA9IGZhbHNlOwog CiAgICAgYXV0byBmbG9hdGluZ0NvbnRleHQgPSBGbG9hdGluZ0NvbnRleHQgeyByb290KCksICp0 aGlzLCBmb3JtYXR0aW5nU3RhdGUoKS5mbG9hdGluZ1N0YXRlKCkgfTsKICAgICAvLyBDaGVjayBm b3IgaW50cnVkaW5nIGZsb2F0cyBhbmQgYWRqdXN0IGxvZ2ljYWwgbGVmdC9hdmFpbGFibGUgd2lk dGggZm9yIHRoaXMgbGluZSBhY2NvcmRpbmdseS4KICAgICBpZiAoIWZsb2F0aW5nQ29udGV4dC5p c0VtcHR5KCkpIHsKLSAgICAgICAgYXV0byBmbG9hdENvbnN0cmFpbnRzID0gZmxvYXRpbmdDb250 ZXh0LmNvbnN0cmFpbnRzKHsgdG9MYXlvdXRVbml0KGxpbmVMb2dpY2FsVG9wKSB9KTsKKyAgICAg ICAgLy8gRklYTUU6IEFkZCBzdXBwb3J0IGZvciB2YXJpYWJsZSBsaW5lIGhlaWdodCwgd2hlcmUg dGhlIGludHJ1c2l2ZSBmbG9hdHMgc2hvdWxkIGJlIHByb2JlZCBhcyB0aGUgbGluZSBoZWlnaHQg Z3Jvd3MuCisgICAgICAgIGF1dG8gZmxvYXRDb25zdHJhaW50cyA9IGZsb2F0aW5nQ29udGV4dC5j b25zdHJhaW50cyh0b0xheW91dFVuaXQobGluZUxvZ2ljYWxUb3ApLCB0b0xheW91dFVuaXQobGlu ZUxvZ2ljYWxUb3AgKyBsaW5lSGVpZ2h0QW5kQmFzZWxpbmUuaGVpZ2h0KSk7CiAgICAgICAgIC8v IENoZWNrIGlmIHRoZXNlIGNvbnN0cmFpbnRzIGFjdHVhbGx5IHB1dCBsaW1pdGF0aW9uIG9uIHRo ZSBsaW5lLgogICAgICAgICBpZiAoZmxvYXRDb25zdHJhaW50cy5sZWZ0ICYmIGZsb2F0Q29uc3Ry YWludHMubGVmdC0+eCA8PSBsaW5lTG9naWNhbExlZnQpCiAgICAgICAgICAgICBmbG9hdENvbnN0 cmFpbnRzLmxlZnQgPSB7IH07CkBAIC00MTgsNyArNDIwLDcgQEAgTGluZUJ1aWxkZXI6OkNvbnN0 cmFpbnRzIElubGluZUZvcm1hdHRpbmdDb250ZXh0Ojpjb25zdHJhaW50c0ZvckxpbmUoY29uc3Qg SG9yaXoKICAgICAgICAgcmV0dXJuIGdlb21ldHJ5KCkuY29tcHV0ZWRUZXh0SW5kZW50KHJvb3Qs IGhvcml6b250YWxDb25zdHJhaW50cykudmFsdWVPcihJbmxpbmVMYXlvdXRVbml0IHsgfSk7CiAg ICAgfTsKICAgICBsaW5lTG9naWNhbExlZnQgKz0gY29tcHV0ZWRUZXh0SW5kZW50KCk7Ci0gICAg cmV0dXJuIExpbmVCdWlsZGVyOjpDb25zdHJhaW50cyB7IHsgbGluZUxvZ2ljYWxMZWZ0LCBsaW5l TG9naWNhbFRvcCB9LCBsaW5lTG9naWNhbFJpZ2h0IC0gbGluZUxvZ2ljYWxMZWZ0LCBsaW5lSXND b25zdHJhaW5lZEJ5RmxvYXQsIHF1aXJrcygpLmxpbmVIZWlnaHRDb25zdHJhaW50cyhyb290KCkp IH07CisgICAgcmV0dXJuIExpbmVCdWlsZGVyOjpDb25zdHJhaW50cyB7IHsgbGluZUxvZ2ljYWxM ZWZ0LCBsaW5lTG9naWNhbFRvcCB9LCBsaW5lTG9naWNhbFJpZ2h0IC0gbGluZUxvZ2ljYWxMZWZ0 LCBsaW5lSXNDb25zdHJhaW5lZEJ5RmxvYXQsIGxpbmVIZWlnaHRBbmRCYXNlbGluZSB9OwogfQog CiB2b2lkIElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpzZXREaXNwbGF5Qm94ZXNGb3JMaW5lKGNv bnN0IExpbmVMYXlvdXRDb250ZXh0OjpMaW5lQ29udGVudCYgbGluZUNvbnRlbnQsIGNvbnN0IEhv cml6b250YWxDb25zdHJhaW50cyYgaG9yaXpvbnRhbENvbnN0cmFpbnRzKQo=