187096 2018-06-27 07:26:54 -0700 [LFC] Compute static position for out-of-flow elements only when required. 2018-06-27 09:14:32 -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 1436931 0 zalan 2018-06-27 07:26:54 -0700 since it is somewhat expensive. 1436932 1 343708 zalan 2018-06-27 07:31:39 -0700 Created attachment 343708 Patch 1436964 2 zalan 2018-06-27 09:14:00 -0700 Committed r233259: <https://trac.webkit.org/changeset/233259> 1436965 3 webkit-bug-importer 2018-06-27 09:14:32 -0700 <rdar://problem/41526757> 343708 2018-06-27 07:31:39 -0700 2018-06-27 09:10:30 -0700 Patch bug-187096-20180627073137.patch text/plain 10485 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjMzMjAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTc2OTIzYmJjMDQxMTVk NmJiM2IwZjEyMzBhMDUwYWI2YWFlMTVlNi4uMTViZjliMGU2ODVlZWZjOTg4NTBkZmMyYmYyZTc0 OGVlNzNkMDNjOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE4LTA2LTI3ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ10gQ29tcHV0ZSBzdGF0 aWMgcG9zaXRpb24gZm9yIG91dC1vZi1mbG93IGVsZW1lbnRzIG9ubHkgd2hlbiByZXF1aXJlZC4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4NzA5Ngor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENvbXB1dGlu ZyBzdGF0aWMgcG9zaXRpb24gZm9yIG91dC1vZi1mbG93IGVsZW1lbnRzIGNvdWxkIGJlIHNvbWV3 aGF0IGV4cGVuc2l2ZSwgc28gbGV0J3Mgbm90IGRvIGl0IHVubGVzcyB3ZSBhY3R1YWxseSBuZWVk IGl0LgorCisgICAgICAgICogbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpzdGF0aWNWZXJ0aWNhbFBvc2l0aW9uRm9yT3V0T2ZG bG93UG9zaXRpb25lZCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OnN0YXRpY0hvcml6b250 YWxQb3NpdGlvbkZvck91dE9mRmxvd1Bvc2l0aW9uZWQpOgorICAgICAgICAoV2ViQ29yZTo6TGF5 b3V0OjpGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6Om91dE9mRmxvd05vblJlcGxhY2VkVmVy dGljYWxHZW9tZXRyeSk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkZvcm1hdHRpbmdDb250 ZXh0OjpHZW9tZXRyeTo6b3V0T2ZGbG93Tm9uUmVwbGFjZWRIb3Jpem9udGFsR2VvbWV0cnkpOgor ICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6Om91 dE9mRmxvd1JlcGxhY2VkVmVydGljYWxHZW9tZXRyeSk6CisgICAgICAgIChXZWJDb3JlOjpMYXlv dXQ6OkZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6b3V0T2ZGbG93UmVwbGFjZWRIb3Jpem9u dGFsR2VvbWV0cnkpOgorICAgICAgICAqIGxheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3Jt YXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6Qmxv Y2tGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OnN0YXRpY1Bvc2l0aW9uKToKKyAgICAgICAg KFdlYkNvcmU6OkxheW91dDo6QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OnN0YXRp Y1Bvc2l0aW9uRm9yT3V0T2ZGbG93UG9zaXRpb25lZCk6IERlbGV0ZWQuCisKIDIwMTgtMDYtMjYg IFRoaWJhdWx0IFNhdW5pZXIgIDx0c2F1bmllckBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHU3Ry ZWFtZXJdIERvIG5vdCBmb3JnZXQgdG8gc2V0IHN0cmVhbSBvbiB0cmFjayBzd2l0Y2hpbmcKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5 LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNw cAppbmRleCBmNWZhMDVjNzkxNDMzZjA4M2YwMGRiMThjZTYyZDAxNzFjYTA0YjZkLi4yNDY2ZjJk ZWM5ZjU0ZTI2NWU1NDhlODRhNGU5ZjI3NjU2MDU3ZWU5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCkBAIC03NSw2ICs3NSw0 NSBAQCBzdGQ6Om9wdGlvbmFsPExheW91dFVuaXQ+IEZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRy eTo6Y29tcHV0ZWRWYWx1ZUlmTm90QXV0byhjbwogICAgIHJldHVybiB2YWx1ZUZvckxlbmd0aChn ZW9tZXRyeVByb3BlcnR5LCBjb250YWluaW5nQmxvY2tXaWR0aCk7CiB9CiAKK3N0YXRpYyBMYXlv dXRVbml0IHN0YXRpY1ZlcnRpY2FsUG9zaXRpb25Gb3JPdXRPZkZsb3dQb3NpdGlvbmVkKGNvbnN0 IExheW91dENvbnRleHQmIGxheW91dENvbnRleHQsIGNvbnN0IEJveCYgbGF5b3V0Qm94KQorewor ICAgIEFTU0VSVChsYXlvdXRCb3guaXNPdXRPZkZsb3dQb3NpdGlvbmVkKCkpOworCisgICAgTGF5 b3V0VW5pdCB0b3A7CisgICAgLy8gUmVzb2x2ZSB0b3AgYWxsIHRoZSB3YXkgdXAgdG8gdGhlIGNv bnRhaW5pbmcgYmxvY2suCisgICAgYXV0byogY29udGFpbmluZ0Jsb2NrID0gbGF5b3V0Qm94LmNv bnRhaW5pbmdCbG9jaygpOworICAgIGZvciAoYXV0byogcGFyZW50ID0gbGF5b3V0Qm94LnBhcmVu dCgpOyBwYXJlbnQ7IHBhcmVudCA9IHBhcmVudC0+cGFyZW50KCkpIHsKKyAgICAgICAgYXV0byYg ZGlzcGxheUJveCA9ICpsYXlvdXRDb250ZXh0LmRpc3BsYXlCb3hGb3JMYXlvdXRCb3goKnBhcmVu dCk7CisgICAgICAgIHRvcCArPSAoZGlzcGxheUJveC50b3AoKSArIGRpc3BsYXlCb3guY29udGVu dEJveFRvcCgpKTsKKyAgICAgICAgaWYgKHBhcmVudCA9PSBjb250YWluaW5nQmxvY2spCisgICAg ICAgICAgICBicmVhazsKKyAgICB9CisgICAgLy8gQWRkIHNpYmxpbmcgb2Zmc2V0CisgICAgaWYg KGF1dG8qIHByZXZpb3VzSW5GbG93U2libGluZyA9IGxheW91dEJveC5wcmV2aW91c0luRmxvd1Np YmxpbmcoKSkgeworICAgICAgICBhdXRvJiBwcmV2aW91c0luRmxvd0Rpc3BsYXlCb3ggPSAqbGF5 b3V0Q29udGV4dC5kaXNwbGF5Qm94Rm9yTGF5b3V0Qm94KCpwcmV2aW91c0luRmxvd1NpYmxpbmcp OworICAgICAgICB0b3AgKz0gcHJldmlvdXNJbkZsb3dEaXNwbGF5Qm94LmJvdHRvbSgpICsgcHJl dmlvdXNJbkZsb3dEaXNwbGF5Qm94Lm1hcmdpbkJvdHRvbSgpOworICAgIH0KKyAgICAvLyBGSVhN RTogZmxvYXRpbmdzIG5lZWQgdG8gYmUgdGFrZW4gaW50byBhY2NvdW50LgorICAgIHJldHVybiB0 b3A7Cit9CisKK3N0YXRpYyBMYXlvdXRVbml0IHN0YXRpY0hvcml6b250YWxQb3NpdGlvbkZvck91 dE9mRmxvd1Bvc2l0aW9uZWQoY29uc3QgTGF5b3V0Q29udGV4dCYgbGF5b3V0Q29udGV4dCwgY29u c3QgQm94JiBsYXlvdXRCb3gpCit7CisgICAgQVNTRVJUKGxheW91dEJveC5pc091dE9mRmxvd1Bv c2l0aW9uZWQoKSk7CisKKyAgICBMYXlvdXRVbml0IGxlZnQ7CisgICAgLy8gUmVzb2x2ZSBsZWZ0 IGFsbCB0aGUgd2F5IHVwIHRvIHRoZSBjb250YWluaW5nIGJsb2NrLgorICAgIGF1dG8qIGNvbnRh aW5pbmdCbG9jayA9IGxheW91dEJveC5jb250YWluaW5nQmxvY2soKTsKKyAgICBmb3IgKGF1dG8q IHBhcmVudCA9IGxheW91dEJveC5wYXJlbnQoKTsgcGFyZW50OyBwYXJlbnQgPSBwYXJlbnQtPnBh cmVudCgpKSB7CisgICAgICAgIGF1dG8mIGRpc3BsYXlCb3ggPSAqbGF5b3V0Q29udGV4dC5kaXNw bGF5Qm94Rm9yTGF5b3V0Qm94KCpwYXJlbnQpOworICAgICAgICBsZWZ0ICs9IChkaXNwbGF5Qm94 LmxlZnQoKSArIGRpc3BsYXlCb3guY29udGVudEJveExlZnQoKSk7CisgICAgICAgIGlmIChwYXJl bnQgPT0gY29udGFpbmluZ0Jsb2NrKQorICAgICAgICAgICAgYnJlYWs7CisgICAgfQorICAgIC8v IEZJWE1FOiBmbG9hdGluZ3MgbmVlZCB0byBiZSB0YWtlbiBpbnRvIGFjY291bnQuCisgICAgcmV0 dXJuIGxlZnQ7Cit9CisKIEZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6VmVydGljYWxHZW9t ZXRyeSBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6Om91dE9mRmxvd05vblJlcGxhY2VkVmVy dGljYWxHZW9tZXRyeShMYXlvdXRDb250ZXh0JiBsYXlvdXRDb250ZXh0LCBjb25zdCBCb3gmIGxh eW91dEJveCkKIHsKICAgICBBU1NFUlQobGF5b3V0Qm94LmlzT3V0T2ZGbG93UG9zaXRpb25lZCgp ICYmICFsYXlvdXRCb3gucmVwbGFjZWQoKSk7CkBAIC0xMjAsNyArMTU5LDcgQEAgRm9ybWF0dGlu Z0NvbnRleHQ6Okdlb21ldHJ5OjpWZXJ0aWNhbEdlb21ldHJ5IEZvcm1hdHRpbmdDb250ZXh0OjpH ZW9tZXRyeTo6b3V0T2YKICAgICBhdXRvIGJvcmRlckJvdHRvbSA9IGRpc3BsYXlCb3guYm9yZGVy Qm90dG9tKCk7CiAKICAgICBpZiAoIXRvcCAmJiAhaGVpZ2h0ICYmICFib3R0b20pCi0gICAgICAg IHRvcCA9IGRpc3BsYXlCb3gudG9wKCk7CisgICAgICAgIHRvcCA9IHN0YXRpY1ZlcnRpY2FsUG9z aXRpb25Gb3JPdXRPZkZsb3dQb3NpdGlvbmVkKGxheW91dENvbnRleHQsIGxheW91dEJveCk7CiAK ICAgICBpZiAodG9wICYmIGhlaWdodCAmJiBib3R0b20pIHsKICAgICAgICAgaWYgKCFtYXJnaW5U b3AgJiYgIW1hcmdpbkJvdHRvbSkgewpAQCAtMTQ2LDcgKzE4NSw3IEBAIEZvcm1hdHRpbmdDb250 ZXh0OjpHZW9tZXRyeTo6VmVydGljYWxHZW9tZXRyeSBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0 cnk6Om91dE9mCiAKICAgICBpZiAoIXRvcCAmJiAhYm90dG9tICYmIGhlaWdodCkgewogICAgICAg ICAvLyAjMgotICAgICAgICB0b3AgPSBkaXNwbGF5Qm94LnRvcCgpOworICAgICAgICB0b3AgPSBz dGF0aWNWZXJ0aWNhbFBvc2l0aW9uRm9yT3V0T2ZGbG93UG9zaXRpb25lZChsYXlvdXRDb250ZXh0 LCBsYXlvdXRCb3gpOwogICAgICAgICBtYXJnaW5Ub3AgPSBtYXJnaW5Ub3AudmFsdWVfb3IoMCk7 CiAgICAgICAgIG1hcmdpbkJvdHRvbSA9IG1hcmdpbkJvdHRvbS52YWx1ZV9vcigwKTsKICAgICAg ICAgYm90dG9tID0gY29udGFpbmluZ0Jsb2NrSGVpZ2h0IC0gKCp0b3AgKyAqbWFyZ2luVG9wICsg Ym9yZGVyVG9wICsgcGFkZGluZ1RvcCArICpoZWlnaHQgKyBwYWRkaW5nQm90dG9tICsgYm9yZGVy Qm90dG9tICsgKm1hcmdpbkJvdHRvbSk7IApAQCAtMjQ0LDEwICsyODMsMTEgQEAgRm9ybWF0dGlu Z0NvbnRleHQ6Okdlb21ldHJ5OjpIb3Jpem9udGFsR2VvbWV0cnkgRm9ybWF0dGluZ0NvbnRleHQ6 Okdlb21ldHJ5OjpvdXQKICAgICAgICAgbWFyZ2luTGVmdCA9IG1hcmdpbkxlZnQudmFsdWVfb3Io MCk7CiAgICAgICAgIG1hcmdpblJpZ2h0ID0gbWFyZ2luUmlnaHQudmFsdWVfb3IoMCk7CiAKKyAg ICAgICAgYXV0byBzdGF0aWNIb3Jpem9udGFsUG9zaXRpb24gPSBzdGF0aWNIb3Jpem9udGFsUG9z aXRpb25Gb3JPdXRPZkZsb3dQb3NpdGlvbmVkKGxheW91dENvbnRleHQsIGxheW91dEJveCk7CiAg ICAgICAgIGlmIChpc0xlZnRUb1JpZ2h0RGlyZWN0aW9uKQotICAgICAgICAgICAgbGVmdCA9IGRp c3BsYXlCb3gubGVmdCgpOworICAgICAgICAgICAgbGVmdCA9IHN0YXRpY0hvcml6b250YWxQb3Np dGlvbjsKICAgICAgICAgZWxzZQotICAgICAgICAgICAgcmlnaHQgPSBkaXNwbGF5Qm94LnJpZ2h0 KCk7CisgICAgICAgICAgICByaWdodCA9IHN0YXRpY0hvcml6b250YWxQb3NpdGlvbjsKICAgICB9 IGVsc2UgaWYgKGxlZnQgJiYgd2lkdGggJiYgcmlnaHQpIHsKICAgICAgICAgLy8gSWYgbm9uZSBv ZiB0aGUgdGhyZWUgaXMgJ2F1dG8nOiBJZiBib3RoICdtYXJnaW4tbGVmdCcgYW5kICdtYXJnaW4t cmlnaHQnIGFyZSAnYXV0bycsIHNvbHZlIHRoZSBlcXVhdGlvbiB1bmRlciB0aGUgZXh0cmEgY29u c3RyYWludCB0aGF0IHRoZSB0d28gbWFyZ2lucyBnZXQgZXF1YWwgdmFsdWVzLAogICAgICAgICAv LyB1bmxlc3MgdGhpcyB3b3VsZCBtYWtlIHRoZW0gbmVnYXRpdmUsIGluIHdoaWNoIGNhc2Ugd2hl biBkaXJlY3Rpb24gb2YgdGhlIGNvbnRhaW5pbmcgYmxvY2sgaXMgJ2x0cicgKCdydGwnKSwgc2V0 ICdtYXJnaW4tbGVmdCcgKCdtYXJnaW4tcmlnaHQnKSB0byB6ZXJvIGFuZApAQCAtMzAxLDExICsz NDEsMTIgQEAgRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpIb3Jpem9udGFsR2VvbWV0cnkg Rm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpvdXQKICAgICAgICAgbGVmdCA9IGNvbnRhaW5p bmdCbG9ja1dpZHRoIC0gKCptYXJnaW5MZWZ0ICsgYm9yZGVyTGVmdCArIHBhZGRpbmdMZWZ0ICsg KndpZHRoICsgcGFkZGluZ1JpZ2h0ICArIGJvcmRlclJpZ2h0ICsgKm1hcmdpblJpZ2h0ICsgKnJp Z2h0KTsKICAgICB9IGVsc2UgaWYgKCFsZWZ0ICYmICFyaWdodCAmJiB3aWR0aCkgewogICAgICAg ICAvLyAjMgorICAgICAgICBhdXRvIHN0YXRpY0hvcml6b250YWxQb3NpdGlvbiA9IHN0YXRpY0hv cml6b250YWxQb3NpdGlvbkZvck91dE9mRmxvd1Bvc2l0aW9uZWQobGF5b3V0Q29udGV4dCwgbGF5 b3V0Qm94KTsKICAgICAgICAgaWYgKGlzTGVmdFRvUmlnaHREaXJlY3Rpb24pIHsKLSAgICAgICAg ICAgIGxlZnQgPSBkaXNwbGF5Qm94LmxlZnQoKTsKKyAgICAgICAgICAgIGxlZnQgPSBzdGF0aWNI b3Jpem9udGFsUG9zaXRpb247CiAgICAgICAgICAgICByaWdodCA9IGNvbnRhaW5pbmdCbG9ja1dp ZHRoIC0gKCpsZWZ0ICsgKm1hcmdpbkxlZnQgKyBib3JkZXJMZWZ0ICsgcGFkZGluZ0xlZnQgKyAq d2lkdGggKyBwYWRkaW5nUmlnaHQgKyBib3JkZXJSaWdodCArICptYXJnaW5SaWdodCk7CiAgICAg ICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICByaWdodCA9IGRpc3BsYXlCb3gucmlnaHQoKTsKKyAg ICAgICAgICAgIHJpZ2h0ID0gc3RhdGljSG9yaXpvbnRhbFBvc2l0aW9uOwogICAgICAgICAgICAg bGVmdCA9IGNvbnRhaW5pbmdCbG9ja1dpZHRoIC0gKCptYXJnaW5MZWZ0ICsgYm9yZGVyTGVmdCAr IHBhZGRpbmdMZWZ0ICsgKndpZHRoICsgcGFkZGluZ1JpZ2h0ICsgYm9yZGVyUmlnaHQgKyAqbWFy Z2luUmlnaHQgKyAqcmlnaHQpOwogICAgICAgICB9CiAgICAgfSBlbHNlIGlmICghd2lkdGggJiYg IXJpZ2h0ICYmIGxlZnQpIHsKQEAgLTM2NSw3ICs0MDYsNyBAQCBGb3JtYXR0aW5nQ29udGV4dDo6 R2VvbWV0cnk6OlZlcnRpY2FsR2VvbWV0cnkgRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5Ojpv dXRPZgogCiAgICAgaWYgKCF0b3AgJiYgIWJvdHRvbSkgewogICAgICAgICAvLyAjMQotICAgICAg ICB0b3AgPSBkaXNwbGF5Qm94LnRvcCgpOworICAgICAgICB0b3AgPSBzdGF0aWNWZXJ0aWNhbFBv c2l0aW9uRm9yT3V0T2ZGbG93UG9zaXRpb25lZChsYXlvdXRDb250ZXh0LCBsYXlvdXRCb3gpOwog ICAgIH0KIAogICAgIGlmICghYm90dG9tKSB7CkBAIC00MzgsMTAgKzQ3OSwxMSBAQCBGb3JtYXR0 aW5nQ29udGV4dDo6R2VvbWV0cnk6Okhvcml6b250YWxHZW9tZXRyeSBGb3JtYXR0aW5nQ29udGV4 dDo6R2VvbWV0cnk6Om91dAogCiAgICAgaWYgKCFsZWZ0ICYmICFyaWdodCkgewogICAgICAgICAv LyAjMQorICAgICAgICBhdXRvIHN0YXRpY0hvcml6b250YWxQb3NpdGlvbiA9IHN0YXRpY0hvcml6 b250YWxQb3NpdGlvbkZvck91dE9mRmxvd1Bvc2l0aW9uZWQobGF5b3V0Q29udGV4dCwgbGF5b3V0 Qm94KTsKICAgICAgICAgaWYgKGlzTGVmdFRvUmlnaHREaXJlY3Rpb24pCi0gICAgICAgICAgICBs ZWZ0ID0gZGlzcGxheUJveC5sZWZ0KCk7CisgICAgICAgICAgICBsZWZ0ID0gc3RhdGljSG9yaXpv bnRhbFBvc2l0aW9uOwogICAgICAgICBlbHNlCi0gICAgICAgICAgICByaWdodCA9IGRpc3BsYXlC b3gucmlnaHQoKTsKKyAgICAgICAgICAgIHJpZ2h0ID0gc3RhdGljSG9yaXpvbnRhbFBvc2l0aW9u OwogICAgIH0KIAogICAgIGlmICghbGVmdCB8fCAhcmlnaHQpIHsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dEdl b21ldHJ5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tG b3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcAppbmRleCBiYTY1YjdlZGI0ZGRjMDE2MmU1NzU3 NzkwY2NmNDUzZWVmNTI3ZWI4Li4zN2U4ZDJhMTg1ZWQ0NGM4YWFiYmY5Njk1NTVmMjhiY2Y2ZjVm ZmJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Js b2NrRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCkBA IC0yNjUsMzEgKzI2NSw2IEBAIEZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6V2lkdGhBbmRN YXJnaW4gQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmluCiAgICAgcmV0dXJuIHsg d2lkdGgsIG1hcmdpbiB9OwogfQogCi1Gb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OlBvc2l0 aW9uIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpzdGF0aWNQb3NpdGlvbkZvck91 dE9mRmxvd1Bvc2l0aW9uZWQoY29uc3QgTGF5b3V0Q29udGV4dCYgbGF5b3V0Q29udGV4dCwgY29u c3QgQm94JiBsYXlvdXRCb3gpCi17Ci0gICAgLy8gRklYTUU6IFRoaXMgaXMgY2VydGFpbmx5IG9u bHkgcmVhbGx5IG5lZWRlZCB3aGVuIHRvcC9ib3R0b20gbGVmdC9yaWdodCBhcmUgYXV0by4KLSAg ICBBU1NFUlQobGF5b3V0Qm94LmlzT3V0T2ZGbG93UG9zaXRpb25lZCgpKTsKLSAgICBMYXlvdXRV bml0IHRvcDsKLSAgICBMYXlvdXRVbml0IGxlZnQ7Ci0gICAgLy8gUmVzb2x2ZSB0b3AvbGVmdCBh bGwgdGhlIHdheSB1cCB0byB0aGUgY29udGFpbmluZyBibG9jay4KLSAgICBhdXRvKiBjb250YWlu aW5nQmxvY2sgPSBsYXlvdXRCb3guY29udGFpbmluZ0Jsb2NrKCk7Ci0gICAgZm9yIChhdXRvKiBw YXJlbnQgPSBsYXlvdXRCb3gucGFyZW50KCk7IHBhcmVudDsgcGFyZW50ID0gcGFyZW50LT5wYXJl bnQoKSkgewotICAgICAgICBhdXRvJiBkaXNwbGF5Qm94ID0gKmxheW91dENvbnRleHQuZGlzcGxh eUJveEZvckxheW91dEJveCgqcGFyZW50KTsKLSAgICAgICAgdG9wICs9IChkaXNwbGF5Qm94LnRv cCgpICsgZGlzcGxheUJveC5jb250ZW50Qm94VG9wKCkpOwotICAgICAgICBsZWZ0ICs9IChkaXNw bGF5Qm94LmxlZnQoKSArIGRpc3BsYXlCb3guY29udGVudEJveExlZnQoKSk7Ci0gICAgICAgIGlm IChwYXJlbnQgPT0gY29udGFpbmluZ0Jsb2NrKQotICAgICAgICAgICAgYnJlYWs7Ci0gICAgfQot ICAgIC8vIEFkZCBzaWJsaW5nIG9mZnNldAotICAgIGlmIChhdXRvKiBwcmV2aW91c0luRmxvd1Np YmxpbmcgPSBsYXlvdXRCb3gucHJldmlvdXNJbkZsb3dTaWJsaW5nKCkpIHsKLSAgICAgICAgYXV0 byYgcHJldmlvdXNJbkZsb3dEaXNwbGF5Qm94ID0gKmxheW91dENvbnRleHQuZGlzcGxheUJveEZv ckxheW91dEJveCgqcHJldmlvdXNJbkZsb3dTaWJsaW5nKTsKLSAgICAgICAgdG9wICs9IHByZXZp b3VzSW5GbG93RGlzcGxheUJveC5ib3R0b20oKSArIHByZXZpb3VzSW5GbG93RGlzcGxheUJveC5t YXJnaW5Cb3R0b20oKTsKLSAgICB9Ci0KLSAgICBMT0dfV0lUSF9TVFJFQU0oRm9ybWF0dGluZ0Nv bnRleHRMYXlvdXQsIHN0cmVhbSA8PCAiW1Bvc2l0aW9uXSAtPiBvdXQtb2YtZmxvdyAtPiBzdGF0 aWMgLT4gdG9wKCIgPDwgdG9wIDw8ICJweCkgbGVmdCgiIDw8IGxlZnQgPDwgInB4KSBsYXlvdXRC b3goIiA8PCAmbGF5b3V0Qm94IDw8ICIpIik7Ci0gICAgcmV0dXJuIHsgbGVmdCwgdG9wIH07Ci19 Ci0KIEZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6UG9zaXRpb24gQmxvY2tGb3JtYXR0aW5n Q29udGV4dDo6R2VvbWV0cnk6OnN0YXRpY1Bvc2l0aW9uKExheW91dENvbnRleHQmIGxheW91dENv bnRleHQsIGNvbnN0IEJveCYgbGF5b3V0Qm94KQogewogICAgIC8vIGh0dHBzOi8vd3d3LnczLm9y Zy9UUi9DU1MyMi92aXN1cmVuLmh0bWwjYmxvY2stZm9ybWF0dGluZwpAQCAtMjk4LDkgKzI3Myw2 IEBAIEZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6UG9zaXRpb24gQmxvY2tGb3JtYXR0aW5n Q29udGV4dDo6R2VvbWV0cnk6OnN0YXRpY1BvCiAgICAgLy8gVmVydGljYWwgbWFyZ2lucyBiZXR3 ZWVuIGFkamFjZW50IGJsb2NrLWxldmVsIGJveGVzIGluIGEgYmxvY2sgZm9ybWF0dGluZyBjb250 ZXh0IGNvbGxhcHNlLgogICAgIC8vIEluIGEgYmxvY2sgZm9ybWF0dGluZyBjb250ZXh0LCBlYWNo IGJveCdzIGxlZnQgb3V0ZXIgZWRnZSB0b3VjaGVzIHRoZSBsZWZ0IGVkZ2Ugb2YgdGhlIGNvbnRh aW5pbmcgYmxvY2sgKGZvciByaWdodC10by1sZWZ0IGZvcm1hdHRpbmcsIHJpZ2h0IGVkZ2VzIHRv dWNoKS4KIAotICAgIGlmIChsYXlvdXRCb3guaXNPdXRPZkZsb3dQb3NpdGlvbmVkKCkpCi0gICAg ICAgIHJldHVybiBzdGF0aWNQb3NpdGlvbkZvck91dE9mRmxvd1Bvc2l0aW9uZWQobGF5b3V0Q29u dGV4dCwgbGF5b3V0Qm94KTsKLQogICAgIExheW91dFVuaXQgdG9wOwogICAgIGF1dG8mIGNvbnRh aW5pbmdCbG9ja0Rpc3BsYXlCb3ggPSAqbGF5b3V0Q29udGV4dC5kaXNwbGF5Qm94Rm9yTGF5b3V0 Qm94KCpsYXlvdXRCb3guY29udGFpbmluZ0Jsb2NrKCkpOwogICAgIGlmIChhdXRvKiBwcmV2aW91 c0luRmxvd1NpYmxpbmcgPSBsYXlvdXRCb3gucHJldmlvdXNJbkZsb3dTaWJsaW5nKCkpIHsK