205934 2020-01-08 09:48:56 -0800 [LFC][BFC] Start passing in vertical constraints to compute* functions 2020-01-09 10:06:53 -0800 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 1604130 0 zalan 2020-01-08 09:48:56 -0800 ssia 1604131 1 webkit-bug-importer 2020-01-08 09:49:19 -0800 <rdar://problem/58411387> 1604138 2 387109 zalan 2020-01-08 09:54:48 -0800 Created attachment 387109 Patch 1604688 3 zalan 2020-01-09 10:06:53 -0800 Committed r254268: <https://trac.webkit.org/changeset/254268> 387109 2020-01-08 09:54:48 -0800 2020-01-08 10:27:17 -0800 Patch bug-205934-20200108095447.patch text/plain 13709 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjU0MTg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjQ3ZDk0NTk1MTc4ZGVi ZTI3Yzg0NWVmZTBkNmY3MDJiZTExZjgyYi4uZDg0ZGVlNTUyNzdmMDBhMjQ2MTk5M2Y4NTNhY2Q3 MDIzM2RhNDA5NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIwLTAxLTA4ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bQkZDXSBTdGFydCBw YXNzaW5nIGluIHZlcnRpY2FsIGNvbnN0cmFpbnRzIHRvIGNvbXB1dGUqIGZ1bmN0aW9ucworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA1OTM0CisgICAg ICAgIDxyZGFyOi8vcHJvYmxlbS81ODQxMTM4Nz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGlzIGluIHByZXBhcmF0aW9uIGZvciBub3QgbmVl ZGluZyB0byBxdWVyeSB0aGUgY29udGFpbmluZyBibG9jayBmb3IgY29uc3RyYWludCBpbmZvcm1h dGlvbi4KKworICAgICAgICAqIGxheW91dC9Gb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6Rm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5Ojp2 ZXJ0aWNhbENvbnN0cmFpbnRzRm9ySW5GbG93KToKKyAgICAgICAgKiBsYXlvdXQvYmxvY2tmb3Jt YXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5 b3V0OjpCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXRJbkZsb3dDb250ZW50KToKKyAgICAg ICAgKFdlYkNvcmU6OkxheW91dDo6QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0Rm9ybWF0 dGluZ0NvbnRleHRSb290KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6QmxvY2tGb3JtYXR0 aW5nQ29udGV4dDo6Y29tcHV0ZVN0YXRpY1ZlcnRpY2FsUG9zaXRpb24pOgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0OjpCbG9ja0Zvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlU3RhdGljUG9zaXRp b24pOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpCbG9ja0Zvcm1hdHRpbmdDb250ZXh0Ojpj b21wdXRlSGVpZ2h0QW5kTWFyZ2luKToKKyAgICAgICAgKiBsYXlvdXQvYmxvY2tmb3JtYXR0aW5n L0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuaDoKKwogMjAyMC0wMS0wNyAgWmFsYW4gQnVqdGFzICA8 emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdIGNvbXB1dGVIZWlnaHRBbmRNYXJnaW4v cGxhY2VJbkZsb3dQb3NpdGlvbmVkQ2hpbGRyZW4gc2hvdWxkIHRha2UgVXNlZEhvcml6b250YWxW YWx1ZXM6OkNvbnN0cmFpbnRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9y bWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0 dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAKaW5kZXggNGEyZTBjZWEzYWYwMTcyMzhhMTRlOWUzYzNj ZTQ2NjhhYzViZjkxNy4uNTgyODZlMTQ2OGE1OWNlMTk2NWVhODQ3MzViMTAwODYxMDc5MDExOCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0 cnkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dEdlb21l dHJ5LmNwcApAQCAtMTEyNCw3ICsxMTI0LDcgQEAgVXNlZEhvcml6b250YWxWYWx1ZXM6OkNvbnN0 cmFpbnRzIEZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6aG9yaXpvbnRhbENvbnN0cmEKIAog VXNlZFZlcnRpY2FsVmFsdWVzOjpDb25zdHJhaW50cyBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0 cnk6OnZlcnRpY2FsQ29uc3RyYWludHNGb3JJbkZsb3coY29uc3QgRGlzcGxheTo6Qm94JiBjb250 YWluaW5nQmxvY2tHZW9tZXRyeSkKIHsKLSAgICByZXR1cm4gVXNlZFZlcnRpY2FsVmFsdWVzOjpD b25zdHJhaW50cyB7IGNvbnRhaW5pbmdCbG9ja0dlb21ldHJ5LmNvbnRlbnRCb3hUb3AoKSwgY29u dGFpbmluZ0Jsb2NrR2VvbWV0cnkuY29udGVudEJveEhlaWdodCgpIH07CisgICAgcmV0dXJuIFVz ZWRWZXJ0aWNhbFZhbHVlczo6Q29uc3RyYWludHMgeyBjb250YWluaW5nQmxvY2tHZW9tZXRyeS5j b250ZW50Qm94VG9wKCksIHsgfSB9OwogfQogCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwIGIvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0 LmNwcAppbmRleCBlYmEzMDEzYzI4NGNmOTczYmNmNjUwODM1MTA2ZjA2MDZhOWQwNzg5Li5jMDE4 MGZiYjQ5MDNhNzc5ODQzOWQyNTJiM2VhYTY0NWI3MWNmYzY1IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0 aW5nQ29udGV4dC5jcHAKQEAgLTk2LDYgKzk2LDEwIEBAIHZvaWQgQmxvY2tGb3JtYXR0aW5nQ29u dGV4dDo6bGF5b3V0SW5GbG93Q29udGVudChJbnZhbGlkYXRpb25TdGF0ZSYgaW52YWxpZGF0aW9u CiAgICAgICAgICAgICByZXR1cm4gcm9vdEhvcml6b250YWxDb25zdHJhaW50czsKICAgICAgICAg cmV0dXJuIEdlb21ldHJ5Ojpob3Jpem9udGFsQ29uc3RyYWludHNGb3JJbkZsb3coZ2VvbWV0cnlG b3JCb3goKmNvbnRhaW5pbmdCbG9jaykpOwogICAgIH07CisKKyAgICBhdXRvIHZlcnRpY2FsQ29u c3RyYWludHNGb3JMYXlvdXRCb3ggPSBbJl0gKGNvbnN0IGF1dG8mIGxheW91dEJveCkgeworICAg ICAgICByZXR1cm4gR2VvbWV0cnk6OnZlcnRpY2FsQ29uc3RyYWludHNGb3JJbkZsb3coZ2VvbWV0 cnlGb3JCb3goKmxheW91dEJveC5jb250YWluaW5nQmxvY2soKSkpOworICAgIH07CiAgICAgLy8g VGhpcyBpcyBhIHBvc3Qtb3JkZXIgdHJlZSB0cmF2ZXJzYWwgbGF5b3V0LgogICAgIC8vIFRoZSBy b290IGNvbnRhaW5lciBsYXlvdXQgaXMgZG9uZSBpbiB0aGUgZm9ybWF0dGluZyBjb250ZXh0IGl0 IGxpdmVzIGluLCBub3QgdGhhdCBvbmUgaXQgY3JlYXRlcywgc28gbGV0J3Mgc3RhcnQgd2l0aCB0 aGUgZmlyc3QgY2hpbGQuCiAgICAgYXBwZW5kTmV4dFRvTGF5b3V0UXVldWUoZm9ybWF0dGluZ1Jv b3QsIExheW91dERpcmVjdGlvbjo6Q2hpbGQpOwpAQCAtMTA4LDEwICsxMTIsMTEgQEAgdm9pZCBC bG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXRJbkZsb3dDb250ZW50KEludmFsaWRhdGlvblN0 YXRlJiBpbnZhbGlkYXRpb24KICAgICAgICAgd2hpbGUgKHRydWUpIHsKICAgICAgICAgICAgIGF1 dG8mIGxheW91dEJveCA9ICpsYXlvdXRRdWV1ZS5sYXN0KCk7CiAgICAgICAgICAgICBhdXRvIGhv cml6b250YWxDb25zdHJhaW50cyA9IGhvcml6b250YWxDb25zdHJhaW50c0ZvckxheW91dEJveChs YXlvdXRCb3gpOworICAgICAgICAgICAgYXV0byB2ZXJ0aWNhbENvbnN0cmFpbnRzID0gdmVydGlj YWxDb25zdHJhaW50c0ZvckxheW91dEJveChsYXlvdXRCb3gpOwogCiAgICAgICAgICAgICBpZiAo bGF5b3V0Qm94LmVzdGFibGlzaGVzRm9ybWF0dGluZ0NvbnRleHQoKSkgewogICAgICAgICAgICAg ICAgIC8vIGxheW91dEZvcm1hdHRpbmdDb250ZXh0Um9vdCgpIHRha2VzIGNhcmUgb2YgdGhlIGxh eW91dEJveCBpdHNlbGYgYW5kIGl0cyBkZXNjZW5kYW50cy4KLSAgICAgICAgICAgICAgICBsYXlv dXRGb3JtYXR0aW5nQ29udGV4dFJvb3QobGF5b3V0Qm94LCBmbG9hdGluZ0NvbnRleHQsIGludmFs aWRhdGlvblN0YXRlLCBob3Jpem9udGFsQ29uc3RyYWludHMpOworICAgICAgICAgICAgICAgIGxh eW91dEZvcm1hdHRpbmdDb250ZXh0Um9vdChsYXlvdXRCb3gsIGZsb2F0aW5nQ29udGV4dCwgaW52 YWxpZGF0aW9uU3RhdGUsIGhvcml6b250YWxDb25zdHJhaW50cywgdmVydGljYWxDb25zdHJhaW50 cyk7CiAgICAgICAgICAgICAgICAgbGF5b3V0UXVldWUucmVtb3ZlTGFzdCgpOwogICAgICAgICAg ICAgICAgIGlmICghYXBwZW5kTmV4dFRvTGF5b3V0UXVldWUobGF5b3V0Qm94LCBMYXlvdXREaXJl Y3Rpb246OlNpYmxpbmcpKQogICAgICAgICAgICAgICAgICAgICBicmVhazsKQEAgLTExOSw3ICsx MjQsNyBAQCB2b2lkIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dEluRmxvd0NvbnRlbnQo SW52YWxpZGF0aW9uU3RhdGUmIGludmFsaWRhdGlvbgogICAgICAgICAgICAgfQogICAgICAgICAg ICAgY29tcHV0ZUJvcmRlckFuZFBhZGRpbmcobGF5b3V0Qm94LCBob3Jpem9udGFsQ29uc3RyYWlu dHMpOwogICAgICAgICAgICAgY29tcHV0ZVdpZHRoQW5kTWFyZ2luKGxheW91dEJveCwgaG9yaXpv bnRhbENvbnN0cmFpbnRzKTsKLSAgICAgICAgICAgIGNvbXB1dGVTdGF0aWNQb3NpdGlvbihmbG9h dGluZ0NvbnRleHQsIGxheW91dEJveCwgaG9yaXpvbnRhbENvbnN0cmFpbnRzKTsKKyAgICAgICAg ICAgIGNvbXB1dGVTdGF0aWNQb3NpdGlvbihmbG9hdGluZ0NvbnRleHQsIGxheW91dEJveCwgaG9y aXpvbnRhbENvbnN0cmFpbnRzLCB2ZXJ0aWNhbENvbnN0cmFpbnRzKTsKICAgICAgICAgICAgIGlm ICghYXBwZW5kTmV4dFRvTGF5b3V0UXVldWUobGF5b3V0Qm94LCBMYXlvdXREaXJlY3Rpb246OkNo aWxkKSkKICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQpAQCAtMTI5LDkgKzEzNCwx MCBAQCB2b2lkIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dEluRmxvd0NvbnRlbnQoSW52 YWxpZGF0aW9uU3RhdGUmIGludmFsaWRhdGlvbgogICAgICAgICAgICAgLy8gQWxsIGluZmxvdyBk ZXNjZW5kYW50cyAoaWYgdGhlcmUgYXJlIGFueSkgYXJlIGxhaWQgb3V0IGJ5IG5vdy4gTGV0J3Mg Y29tcHV0ZSB0aGUgYm94J3MgaGVpZ2h0LgogICAgICAgICAgICAgYXV0byYgbGF5b3V0Qm94ID0g KmxheW91dFF1ZXVlLnRha2VMYXN0KCk7CiAgICAgICAgICAgICBhdXRvIGhvcml6b250YWxDb25z dHJhaW50cyA9IGhvcml6b250YWxDb25zdHJhaW50c0ZvckxheW91dEJveChsYXlvdXRCb3gpOwor ICAgICAgICAgICAgYXV0byB2ZXJ0aWNhbENvbnN0cmFpbnRzID0gdmVydGljYWxDb25zdHJhaW50 c0ZvckxheW91dEJveChsYXlvdXRCb3gpOwogICAgICAgICAgICAgLy8gRm9ybWF0dGluZyByb290 IGJveGVzIGFyZSBzcGVjaWFsLWNhc2VkIGFuZCB0aGV5IGRvbid0IGNvbWUgaGVyZS4KICAgICAg ICAgICAgIEFTU0VSVCghbGF5b3V0Qm94LmVzdGFibGlzaGVzRm9ybWF0dGluZ0NvbnRleHQoKSk7 Ci0gICAgICAgICAgICBjb21wdXRlSGVpZ2h0QW5kTWFyZ2luKGxheW91dEJveCwgaG9yaXpvbnRh bENvbnN0cmFpbnRzKTsKKyAgICAgICAgICAgIGNvbXB1dGVIZWlnaHRBbmRNYXJnaW4obGF5b3V0 Qm94LCBob3Jpem9udGFsQ29uc3RyYWludHMsIHZlcnRpY2FsQ29uc3RyYWludHMpOwogICAgICAg ICAgICAgLy8gTW92ZSBpbi1mbG93IHBvc2l0aW9uZWQgY2hpbGRyZW4gdG8gdGhlaXIgZmluYWwg cG9zaXRpb24uCiAgICAgICAgICAgICBwbGFjZUluRmxvd1Bvc2l0aW9uZWRDaGlsZHJlbihsYXlv dXRCb3gpOwogICAgICAgICAgICAgaWYgKGFwcGVuZE5leHRUb0xheW91dFF1ZXVlKGxheW91dEJv eCwgTGF5b3V0RGlyZWN0aW9uOjpTaWJsaW5nKSkKQEAgLTE3Nyw3ICsxODMsNyBAQCBPcHRpb25h bDxMYXlvdXRVbml0PiBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0Ojp1c2VkQXZhaWxhYmxlV2lkdGhG b3JGbG9hdEF2b2lkZXIoYwogICAgIHJldHVybiBhdmFpbGFibGVXaWR0aDsKIH0KIAotdm9pZCBC bG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXRGb3JtYXR0aW5nQ29udGV4dFJvb3QoY29uc3Qg Qm94JiBsYXlvdXRCb3gsIEZsb2F0aW5nQ29udGV4dCYgZmxvYXRpbmdDb250ZXh0LCBJbnZhbGlk YXRpb25TdGF0ZSYgaW52YWxpZGF0aW9uU3RhdGUsIGNvbnN0IFVzZWRIb3Jpem9udGFsVmFsdWVz OjpDb25zdHJhaW50cyYgaG9yaXpvbnRhbENvbnN0cmFpbnRzKQordm9pZCBCbG9ja0Zvcm1hdHRp bmdDb250ZXh0OjpsYXlvdXRGb3JtYXR0aW5nQ29udGV4dFJvb3QoY29uc3QgQm94JiBsYXlvdXRC b3gsIEZsb2F0aW5nQ29udGV4dCYgZmxvYXRpbmdDb250ZXh0LCBJbnZhbGlkYXRpb25TdGF0ZSYg aW52YWxpZGF0aW9uU3RhdGUsIGNvbnN0IFVzZWRIb3Jpem9udGFsVmFsdWVzOjpDb25zdHJhaW50 cyYgaG9yaXpvbnRhbENvbnN0cmFpbnRzLCBjb25zdCBVc2VkVmVydGljYWxWYWx1ZXM6OkNvbnN0 cmFpbnRzJiB2ZXJ0aWNhbENvbnN0cmFpbnRzKQogewogICAgIEFTU0VSVChsYXlvdXRCb3guZXN0 YWJsaXNoZXNGb3JtYXR0aW5nQ29udGV4dCgpKTsKICAgICAvLyBTdGFydCBsYXlpbmcgb3V0IHRo aXMgZm9ybWF0dGluZyByb290IGluIHRoZSBmb3JtYXR0aW5nIGNvbnRlbnh0IGl0IGxpdmVzIGlu LgpAQCAtMTg4LDcgKzE5NCw3IEBAIHZvaWQgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0 Rm9ybWF0dGluZ0NvbnRleHRSb290KGNvbnN0IEJveCYgbGF5b3V0Qm94LCBGCiAgICAgICAgIGFk anVzdGVkSG9yaXpvbnRhbENvbnN0cmFpbnRzLndpZHRoID0gdXNlZEF2YWlsYWJsZVdpZHRoRm9y RmxvYXRBdm9pZGVyKGZsb2F0aW5nQ29udGV4dCwgbGF5b3V0Qm94KS52YWx1ZU9yKGhvcml6b250 YWxDb25zdHJhaW50cy53aWR0aCk7CiAKICAgICBjb21wdXRlQm9yZGVyQW5kUGFkZGluZyhsYXlv dXRCb3gsIGFkanVzdGVkSG9yaXpvbnRhbENvbnN0cmFpbnRzKTsKLSAgICBjb21wdXRlU3RhdGlj VmVydGljYWxQb3NpdGlvbihmbG9hdGluZ0NvbnRleHQsIGxheW91dEJveCk7CisgICAgY29tcHV0 ZVN0YXRpY1ZlcnRpY2FsUG9zaXRpb24oZmxvYXRpbmdDb250ZXh0LCBsYXlvdXRCb3gsIHZlcnRp Y2FsQ29uc3RyYWludHMpOwogICAgIGNvbXB1dGVXaWR0aEFuZE1hcmdpbihsYXlvdXRCb3gsIGFk anVzdGVkSG9yaXpvbnRhbENvbnN0cmFpbnRzKTsKICAgICBjb21wdXRlU3RhdGljSG9yaXpvbnRh bFBvc2l0aW9uKGxheW91dEJveCwgYWRqdXN0ZWRIb3Jpem9udGFsQ29uc3RyYWludHMpOwogCkBA IC0xOTksMTMgKzIwNSwxMyBAQCB2b2lkIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dEZv cm1hdHRpbmdDb250ZXh0Um9vdChjb25zdCBCb3gmIGxheW91dEJveCwgRgogICAgICAgICBhdXRv IGZvcm1hdHRpbmdDb250ZXh0ID0gTGF5b3V0Q29udGV4dDo6Y3JlYXRlRm9ybWF0dGluZ0NvbnRl eHQocm9vdENvbnRhaW5lciwgbGF5b3V0U3RhdGUoKSk7CiAgICAgICAgIGZvcm1hdHRpbmdDb250 ZXh0LT5sYXlvdXRJbkZsb3dDb250ZW50KGludmFsaWRhdGlvblN0YXRlLCBHZW9tZXRyeTo6aG9y aXpvbnRhbENvbnN0cmFpbnRzRm9ySW5GbG93KHJvb3RDb250YWluZXJEaXNwbGF5Qm94KSk7CiAg ICAgICAgIC8vIENvbWUgYmFjayBhbmQgZmluYWxpemUgdGhlIHJvb3QncyBnZW9tZXRyeS4KLSAg ICAgICAgY29tcHV0ZUhlaWdodEFuZE1hcmdpbihyb290Q29udGFpbmVyLCBhZGp1c3RlZEhvcml6 b250YWxDb25zdHJhaW50cyk7CisgICAgICAgIGNvbXB1dGVIZWlnaHRBbmRNYXJnaW4ocm9vdENv bnRhaW5lciwgYWRqdXN0ZWRIb3Jpem9udGFsQ29uc3RyYWludHMsIHZlcnRpY2FsQ29uc3RyYWlu dHMpOwogICAgICAgICAvLyBOb3cgdGhhdCB3ZSBjb21wdXRlZCB0aGUgcm9vdCdzIGhlaWdodCwg d2UgY2FuIGdvIGJhY2sgYW5kIGxheW91dCB0aGUgb3V0LW9mLWZsb3cgY29udGVudC4KICAgICAg ICAgYXV0byBob3Jpem9udGFsQ29uc3RyYWludHNGb3JPdXRPZkZsb3cgPSAgR2VvbWV0cnk6Omhv cml6b250YWxDb25zdHJhaW50c0Zvck91dE9mRmxvdyhyb290Q29udGFpbmVyRGlzcGxheUJveCk7 CiAgICAgICAgIGF1dG8gdmVydGljYWxDb25zdHJhaW50c0Zvck91dE9mRmxvdyA9IEdlb21ldHJ5 Ojp2ZXJ0aWNhbENvbnN0cmFpbnRzRm9yT3V0T2ZGbG93KHJvb3RDb250YWluZXJEaXNwbGF5Qm94 KTsKICAgICAgICAgZm9ybWF0dGluZ0NvbnRleHQtPmxheW91dE91dE9mRmxvd0NvbnRlbnQoaW52 YWxpZGF0aW9uU3RhdGUsIGhvcml6b250YWxDb25zdHJhaW50c0Zvck91dE9mRmxvdywgdmVydGlj YWxDb25zdHJhaW50c0Zvck91dE9mRmxvdyk7CiAgICAgfSBlbHNlCi0gICAgICAgIGNvbXB1dGVI ZWlnaHRBbmRNYXJnaW4obGF5b3V0Qm94LCBhZGp1c3RlZEhvcml6b250YWxDb25zdHJhaW50cyk7 CisgICAgICAgIGNvbXB1dGVIZWlnaHRBbmRNYXJnaW4obGF5b3V0Qm94LCBhZGp1c3RlZEhvcml6 b250YWxDb25zdHJhaW50cywgdmVydGljYWxDb25zdHJhaW50cyk7CiAgICAgLy8gRmxvYXQgcmVs YXRlZCBmaW5hbCBwb3NpdGlvbmluZy4KICAgICBpZiAobGF5b3V0Qm94LmlzRmxvYXRpbmdQb3Np dGlvbmVkKCkpIHsKICAgICAgICAgY29tcHV0ZUZsb2F0aW5nUG9zaXRpb24oZmxvYXRpbmdDb250 ZXh0LCBsYXlvdXRCb3gpOwpAQCAtMjMxLDEwICsyMzcsOSBAQCB2b2lkIEJsb2NrRm9ybWF0dGlu Z0NvbnRleHQ6OnBsYWNlSW5GbG93UG9zaXRpb25lZENoaWxkcmVuKGNvbnN0IEJveCYgbGF5b3V0 Qm94LAogICAgIExPR19XSVRIX1NUUkVBTShGb3JtYXR0aW5nQ29udGV4dExheW91dCwgc3RyZWFt IDw8ICJFbmQ6IG1vdmUgaW4tZmxvdyBwb3NpdGlvbmVkIGNoaWxkcmVuIC0+IHBhcmVudDogIiA8 PCAmbGF5b3V0Qm94KTsKIH0KIAotdm9pZCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRl U3RhdGljVmVydGljYWxQb3NpdGlvbihjb25zdCBGbG9hdGluZ0NvbnRleHQmIGZsb2F0aW5nQ29u dGV4dCwgY29uc3QgQm94JiBsYXlvdXRCb3gpCit2b2lkIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6 OmNvbXB1dGVTdGF0aWNWZXJ0aWNhbFBvc2l0aW9uKGNvbnN0IEZsb2F0aW5nQ29udGV4dCYgZmxv YXRpbmdDb250ZXh0LCBjb25zdCBCb3gmIGxheW91dEJveCwgY29uc3QgVXNlZFZlcnRpY2FsVmFs dWVzOjpDb25zdHJhaW50cyYgdmVydGljYWxDb25zdHJhaW50cykKIHsKLSAgICBhdXRvIHVzZWRW ZXJ0aWNhbFZhbHVlcyA9IFVzZWRWZXJ0aWNhbFZhbHVlcyB7IFVzZWRWZXJ0aWNhbFZhbHVlczo6 Q29uc3RyYWludHMgeyBnZW9tZXRyeUZvckJveCgqbGF5b3V0Qm94LmNvbnRhaW5pbmdCbG9jaygp KS5jb250ZW50Qm94VG9wKCkgfSB9OwotICAgIGZvcm1hdHRpbmdTdGF0ZSgpLmRpc3BsYXlCb3go bGF5b3V0Qm94KS5zZXRUb3AoZ2VvbWV0cnkoKS5zdGF0aWNWZXJ0aWNhbFBvc2l0aW9uKGxheW91 dEJveCwgdXNlZFZlcnRpY2FsVmFsdWVzKSk7CisgICAgZm9ybWF0dGluZ1N0YXRlKCkuZGlzcGxh eUJveChsYXlvdXRCb3gpLnNldFRvcChnZW9tZXRyeSgpLnN0YXRpY1ZlcnRpY2FsUG9zaXRpb24o bGF5b3V0Qm94LCBVc2VkVmVydGljYWxWYWx1ZXMgeyB2ZXJ0aWNhbENvbnN0cmFpbnRzIH0pKTsK ICAgICBpZiAobGF5b3V0Qm94Lmhhc0Zsb2F0Q2xlYXIoKSkKICAgICAgICAgY29tcHV0ZUVzdGlt YXRlZFZlcnRpY2FsUG9zaXRpb25Gb3JGbG9hdENsZWFyKGZsb2F0aW5nQ29udGV4dCwgbGF5b3V0 Qm94KTsKICAgICBlbHNlIGlmIChsYXlvdXRCb3guZXN0YWJsaXNoZXNGb3JtYXR0aW5nQ29udGV4 dCgpKQpAQCAtMjQ2LDkgKzI1MSw5IEBAIHZvaWQgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6Y29t cHV0ZVN0YXRpY0hvcml6b250YWxQb3NpdGlvbihjb25zdCBCb3gmIGxheW91dEJvCiAgICAgZm9y bWF0dGluZ1N0YXRlKCkuZGlzcGxheUJveChsYXlvdXRCb3gpLnNldExlZnQoZ2VvbWV0cnkoKS5z dGF0aWNIb3Jpem9udGFsUG9zaXRpb24obGF5b3V0Qm94LCBVc2VkSG9yaXpvbnRhbFZhbHVlcyB7 IGhvcml6b250YWxDb25zdHJhaW50cyB9KSk7CiB9CiAKLXZvaWQgQmxvY2tGb3JtYXR0aW5nQ29u dGV4dDo6Y29tcHV0ZVN0YXRpY1Bvc2l0aW9uKGNvbnN0IEZsb2F0aW5nQ29udGV4dCYgZmxvYXRp bmdDb250ZXh0LCBjb25zdCBCb3gmIGxheW91dEJveCwgY29uc3QgVXNlZEhvcml6b250YWxWYWx1 ZXM6OkNvbnN0cmFpbnRzJiBob3Jpem9udGFsQ29uc3RyYWludHMpCit2b2lkIEJsb2NrRm9ybWF0 dGluZ0NvbnRleHQ6OmNvbXB1dGVTdGF0aWNQb3NpdGlvbihjb25zdCBGbG9hdGluZ0NvbnRleHQm IGZsb2F0aW5nQ29udGV4dCwgY29uc3QgQm94JiBsYXlvdXRCb3gsIGNvbnN0IFVzZWRIb3Jpem9u dGFsVmFsdWVzOjpDb25zdHJhaW50cyYgaG9yaXpvbnRhbENvbnN0cmFpbnRzLCBjb25zdCBVc2Vk VmVydGljYWxWYWx1ZXM6OkNvbnN0cmFpbnRzJiB2ZXJ0aWNhbENvbnN0cmFpbnRzKQogewotICAg IGNvbXB1dGVTdGF0aWNWZXJ0aWNhbFBvc2l0aW9uKGZsb2F0aW5nQ29udGV4dCwgbGF5b3V0Qm94 KTsKKyAgICBjb21wdXRlU3RhdGljVmVydGljYWxQb3NpdGlvbihmbG9hdGluZ0NvbnRleHQsIGxh eW91dEJveCwgdmVydGljYWxDb25zdHJhaW50cyk7CiAgICAgY29tcHV0ZVN0YXRpY0hvcml6b250 YWxQb3NpdGlvbihsYXlvdXRCb3gsIGhvcml6b250YWxDb25zdHJhaW50cyk7CiB9CiAKQEAgLTQw NCw3ICs0MDksNyBAQCB2b2lkIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVXaWR0aEFu ZE1hcmdpbihjb25zdCBCb3gmIGxheW91dEJveCwgY29uc3QgVQogICAgIGRpc3BsYXlCb3guc2V0 SG9yaXpvbnRhbENvbXB1dGVkTWFyZ2luKGNvbnRlbnRXaWR0aEFuZE1hcmdpbi5jb21wdXRlZE1h cmdpbik7CiB9CiAKLXZvaWQgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUhlaWdodEFu ZE1hcmdpbihjb25zdCBCb3gmIGxheW91dEJveCwgY29uc3QgVXNlZEhvcml6b250YWxWYWx1ZXM6 OkNvbnN0cmFpbnRzJiBob3Jpem9udGFsQ29uc3RyYWludHMpCit2b2lkIEJsb2NrRm9ybWF0dGlu Z0NvbnRleHQ6OmNvbXB1dGVIZWlnaHRBbmRNYXJnaW4oY29uc3QgQm94JiBsYXlvdXRCb3gsIGNv bnN0IFVzZWRIb3Jpem9udGFsVmFsdWVzOjpDb25zdHJhaW50cyYgaG9yaXpvbnRhbENvbnN0cmFp bnRzLCBjb25zdCBVc2VkVmVydGljYWxWYWx1ZXM6OkNvbnN0cmFpbnRzJiB2ZXJ0aWNhbENvbnN0 cmFpbnRzKQogewogICAgIGF1dG8gdXNlZEhvcml6b250YWxWYWx1ZXMgPSBVc2VkSG9yaXpvbnRh bFZhbHVlcyB7IGhvcml6b250YWxDb25zdHJhaW50cyB9OwogICAgIGF1dG8gY29tcHV0ZSA9IFsm XShhdXRvIHVzZWRWZXJ0aWNhbFZhbHVlcykgLT4gQ29udGVudEhlaWdodEFuZE1hcmdpbiB7CkBA IC00MTgsNyArNDIzLDYgQEAgdm9pZCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlSGVp Z2h0QW5kTWFyZ2luKGNvbnN0IEJveCYgbGF5b3V0Qm94LCBjb25zdAogICAgICAgICByZXR1cm4g eyB9OwogICAgIH07CiAKLSAgICBhdXRvIHZlcnRpY2FsQ29uc3RyYWludHMgPSBVc2VkVmVydGlj YWxWYWx1ZXM6OkNvbnN0cmFpbnRzIHsgZ2VvbWV0cnlGb3JCb3goKmxheW91dEJveC5jb250YWlu aW5nQmxvY2soKSkuY29udGVudEJveFRvcCgpIH07CiAgICAgYXV0byBjb250ZW50SGVpZ2h0QW5k TWFyZ2luID0gY29tcHV0ZShVc2VkVmVydGljYWxWYWx1ZXMgeyB2ZXJ0aWNhbENvbnN0cmFpbnRz IH0pOwogICAgIGlmIChhdXRvIG1heEhlaWdodCA9IGdlb21ldHJ5KCkuY29tcHV0ZWRNYXhIZWln aHQobGF5b3V0Qm94KSkgewogICAgICAgICBpZiAoY29udGVudEhlaWdodEFuZE1hcmdpbi5jb250 ZW50SGVpZ2h0ID4gKm1heEhlaWdodCkgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmggYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuaAppbmRl eCA5NjIxZjAzYzZmNTk4NmU5ZGEzNTZiYTIwYjQ1NWQ0ZWMzMTU5Y2U0Li42MTU0NTlkZDJkOTIw ZjdhNWUwN2RlNzVlN2I1YjQ5MzRhMmU5MjU5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQu aApAQCAtNTEsMTUgKzUxLDE1IEBAIHB1YmxpYzoKICAgICB2b2lkIGxheW91dEluRmxvd0NvbnRl bnQoSW52YWxpZGF0aW9uU3RhdGUmLCBjb25zdCBVc2VkSG9yaXpvbnRhbFZhbHVlczo6Q29uc3Ry YWludHMmKSBvdmVycmlkZTsKIAogcHJpdmF0ZToKLSAgICB2b2lkIGxheW91dEZvcm1hdHRpbmdD b250ZXh0Um9vdChjb25zdCBCb3gmLCBGbG9hdGluZ0NvbnRleHQmLCBJbnZhbGlkYXRpb25TdGF0 ZSYsIGNvbnN0IFVzZWRIb3Jpem9udGFsVmFsdWVzOjpDb25zdHJhaW50cyYpOworICAgIHZvaWQg bGF5b3V0Rm9ybWF0dGluZ0NvbnRleHRSb290KGNvbnN0IEJveCYsIEZsb2F0aW5nQ29udGV4dCYs IEludmFsaWRhdGlvblN0YXRlJiwgY29uc3QgVXNlZEhvcml6b250YWxWYWx1ZXM6OkNvbnN0cmFp bnRzJiwgY29uc3QgVXNlZFZlcnRpY2FsVmFsdWVzOjpDb25zdHJhaW50cyYpOwogICAgIHZvaWQg cGxhY2VJbkZsb3dQb3NpdGlvbmVkQ2hpbGRyZW4oY29uc3QgQm94JiwgT3B0aW9uYWw8VXNlZEhv cml6b250YWxWYWx1ZXM6OkNvbnN0cmFpbnRzPiA9IFdURjo6bnVsbG9wdCk7CiAKICAgICB2b2lk IGNvbXB1dGVXaWR0aEFuZE1hcmdpbihjb25zdCBCb3gmLCBjb25zdCBVc2VkSG9yaXpvbnRhbFZh bHVlczo6Q29uc3RyYWludHMmKTsKLSAgICB2b2lkIGNvbXB1dGVIZWlnaHRBbmRNYXJnaW4oY29u c3QgQm94JiwgY29uc3QgVXNlZEhvcml6b250YWxWYWx1ZXM6OkNvbnN0cmFpbnRzJik7CisgICAg dm9pZCBjb21wdXRlSGVpZ2h0QW5kTWFyZ2luKGNvbnN0IEJveCYsIGNvbnN0IFVzZWRIb3Jpem9u dGFsVmFsdWVzOjpDb25zdHJhaW50cyYsIGNvbnN0IFVzZWRWZXJ0aWNhbFZhbHVlczo6Q29uc3Ry YWludHMmKTsKIAogICAgIHZvaWQgY29tcHV0ZVN0YXRpY0hvcml6b250YWxQb3NpdGlvbihjb25z dCBCb3gmLCBjb25zdCBVc2VkSG9yaXpvbnRhbFZhbHVlczo6Q29uc3RyYWludHMmKTsKLSAgICB2 b2lkIGNvbXB1dGVTdGF0aWNWZXJ0aWNhbFBvc2l0aW9uKGNvbnN0IEZsb2F0aW5nQ29udGV4dCYs IGNvbnN0IEJveCYpOwotICAgIHZvaWQgY29tcHV0ZVN0YXRpY1Bvc2l0aW9uKGNvbnN0IEZsb2F0 aW5nQ29udGV4dCYsIGNvbnN0IEJveCYsIGNvbnN0IFVzZWRIb3Jpem9udGFsVmFsdWVzOjpDb25z dHJhaW50cyYpOworICAgIHZvaWQgY29tcHV0ZVN0YXRpY1ZlcnRpY2FsUG9zaXRpb24oY29uc3Qg RmxvYXRpbmdDb250ZXh0JiwgY29uc3QgQm94JiwgY29uc3QgVXNlZFZlcnRpY2FsVmFsdWVzOjpD b25zdHJhaW50cyYpOworICAgIHZvaWQgY29tcHV0ZVN0YXRpY1Bvc2l0aW9uKGNvbnN0IEZsb2F0 aW5nQ29udGV4dCYsIGNvbnN0IEJveCYsIGNvbnN0IFVzZWRIb3Jpem9udGFsVmFsdWVzOjpDb25z dHJhaW50cyYsIGNvbnN0IFVzZWRWZXJ0aWNhbFZhbHVlczo6Q29uc3RyYWludHMmKTsKICAgICB2 b2lkIGNvbXB1dGVGbG9hdGluZ1Bvc2l0aW9uKGNvbnN0IEZsb2F0aW5nQ29udGV4dCYsIGNvbnN0 IEJveCYpOwogICAgIHZvaWQgY29tcHV0ZVBvc2l0aW9uVG9Bdm9pZEZsb2F0cyhjb25zdCBGbG9h dGluZ0NvbnRleHQmLCBjb25zdCBCb3gmKTsKIAo=