205904 2020-01-07 20:54:39 -0800 [LFC] computeHeightAndMargin/placeInFlowPositionedChildren should take UsedHorizontalValues::Constraints 2020-01-09 09:59:39 -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 1603929 0 zalan 2020-01-07 20:54:39 -0800 ssia 1603930 1 webkit-bug-importer 2020-01-07 20:55:09 -0800 <rdar://problem/58398413> 1603931 2 387065 zalan 2020-01-07 20:58:01 -0800 Created attachment 387065 Patch 1604684 3 zalan 2020-01-09 09:59:39 -0800 Committed r254266: <https://trac.webkit.org/changeset/254266> 387065 2020-01-07 20:58:01 -0800 2020-01-09 07:19:49 -0800 Patch bug-205904-20200107205801.patch text/plain 9384 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjU0MTg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGZlOTczNmY3OWVhYzdl YjE5YTAwYzUxNmZmNTEyZjU2ZWI5YWZjMS4uNjQ3ZDk0NTk1MTc4ZGViZTI3Yzg0NWVmZTBkNmY3 MDJiZTExZjgyYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIwLTAxLTA3ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ10gY29tcHV0ZUhlaWdo dEFuZE1hcmdpbi9wbGFjZUluRmxvd1Bvc2l0aW9uZWRDaGlsZHJlbiBzaG91bGQgdGFrZSBVc2Vk SG9yaXpvbnRhbFZhbHVlczo6Q29uc3RyYWludHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNTkwNAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTgz OTg0MTM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBsYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6TGF5b3V0OjpCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXRJbkZs b3dDb250ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6QmxvY2tGb3JtYXR0aW5nQ29u dGV4dDo6bGF5b3V0Rm9ybWF0dGluZ0NvbnRleHRSb290KToKKyAgICAgICAgKFdlYkNvcmU6Okxh eW91dDo6QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6cGxhY2VJbkZsb3dQb3NpdGlvbmVkQ2hpbGRy ZW4pOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpCbG9ja0Zvcm1hdHRpbmdDb250ZXh0Ojpj b21wdXRlSGVpZ2h0QW5kTWFyZ2luKToKKyAgICAgICAgKiBsYXlvdXQvYmxvY2tmb3JtYXR0aW5n L0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuaDoKKyAgICAgICAgKiBsYXlvdXQvZGlzcGxheXRyZWUv RGlzcGxheUJveC5oOgorICAgICAgICAoV2ViQ29yZTo6RGlzcGxheTo6Qm94Ojptb3ZlKToKKwog MjAyMC0wMS0wNyAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtM RkNdW0JGQ10gQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0Rm9ybWF0dGluZ0NvbnRleHRS b290IHNob3VsZCB0YWtlIHRoZSBob3Jpem9udGFsIGNvbnN0cmFpbnRzCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRl eHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1h dHRpbmdDb250ZXh0LmNwcAppbmRleCBjOGZlMTlmZjUyOGMxNDYyY2Q1YjhkNWJiN2VmZGQ2Mjk2 NmIyZDE2Li5lYmEzMDEzYzI4NGNmOTczYmNmNjUwODM1MTA2ZjA2MDZhOWQwNzg5IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGlu Z0NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcv QmxvY2tGb3JtYXR0aW5nQ29udGV4dC5jcHAKQEAgLTEyOCw5ICsxMjgsMTAgQEAgdm9pZCBCbG9j a0Zvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXRJbkZsb3dDb250ZW50KEludmFsaWRhdGlvblN0YXRl JiBpbnZhbGlkYXRpb24KICAgICAgICAgd2hpbGUgKCFsYXlvdXRRdWV1ZS5pc0VtcHR5KCkpIHsK ICAgICAgICAgICAgIC8vIEFsbCBpbmZsb3cgZGVzY2VuZGFudHMgKGlmIHRoZXJlIGFyZSBhbnkp IGFyZSBsYWlkIG91dCBieSBub3cuIExldCdzIGNvbXB1dGUgdGhlIGJveCdzIGhlaWdodC4KICAg ICAgICAgICAgIGF1dG8mIGxheW91dEJveCA9ICpsYXlvdXRRdWV1ZS50YWtlTGFzdCgpOworICAg ICAgICAgICAgYXV0byBob3Jpem9udGFsQ29uc3RyYWludHMgPSBob3Jpem9udGFsQ29uc3RyYWlu dHNGb3JMYXlvdXRCb3gobGF5b3V0Qm94KTsKICAgICAgICAgICAgIC8vIEZvcm1hdHRpbmcgcm9v dCBib3hlcyBhcmUgc3BlY2lhbC1jYXNlZCBhbmQgdGhleSBkb24ndCBjb21lIGhlcmUuCiAgICAg ICAgICAgICBBU1NFUlQoIWxheW91dEJveC5lc3RhYmxpc2hlc0Zvcm1hdHRpbmdDb250ZXh0KCkp OwotICAgICAgICAgICAgY29tcHV0ZUhlaWdodEFuZE1hcmdpbihsYXlvdXRCb3gpOworICAgICAg ICAgICAgY29tcHV0ZUhlaWdodEFuZE1hcmdpbihsYXlvdXRCb3gsIGhvcml6b250YWxDb25zdHJh aW50cyk7CiAgICAgICAgICAgICAvLyBNb3ZlIGluLWZsb3cgcG9zaXRpb25lZCBjaGlsZHJlbiB0 byB0aGVpciBmaW5hbCBwb3NpdGlvbi4KICAgICAgICAgICAgIHBsYWNlSW5GbG93UG9zaXRpb25l ZENoaWxkcmVuKGxheW91dEJveCk7CiAgICAgICAgICAgICBpZiAoYXBwZW5kTmV4dFRvTGF5b3V0 UXVldWUobGF5b3V0Qm94LCBMYXlvdXREaXJlY3Rpb246OlNpYmxpbmcpKQpAQCAtMTM4LDcgKzEz OSw3IEBAIHZvaWQgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0SW5GbG93Q29udGVudChJ bnZhbGlkYXRpb25TdGF0ZSYgaW52YWxpZGF0aW9uCiAgICAgICAgIH0KICAgICB9CiAgICAgLy8g UGxhY2UgdGhlIGluZmxvdyBwb3NpdGlvbmVkIGNoaWxkcmVuLgotICAgIHBsYWNlSW5GbG93UG9z aXRpb25lZENoaWxkcmVuKGZvcm1hdHRpbmdSb290KTsKKyAgICBwbGFjZUluRmxvd1Bvc2l0aW9u ZWRDaGlsZHJlbihmb3JtYXR0aW5nUm9vdCwgcm9vdEhvcml6b250YWxDb25zdHJhaW50cyk7CiAg ICAgTE9HX1dJVEhfU1RSRUFNKEZvcm1hdHRpbmdDb250ZXh0TGF5b3V0LCBzdHJlYW0gPDwgIltF bmRdIC0+IGJsb2NrIGZvcm1hdHRpbmcgY29udGV4dCAtPiBmb3JtYXR0aW5nIHJvb3QoIiA8PCAm cm9vdCgpIDw8ICIpIik7CiB9CiAKQEAgLTE5OCwxMyArMTk5LDEzIEBAIHZvaWQgQmxvY2tGb3Jt YXR0aW5nQ29udGV4dDo6bGF5b3V0Rm9ybWF0dGluZ0NvbnRleHRSb290KGNvbnN0IEJveCYgbGF5 b3V0Qm94LCBGCiAgICAgICAgIGF1dG8gZm9ybWF0dGluZ0NvbnRleHQgPSBMYXlvdXRDb250ZXh0 OjpjcmVhdGVGb3JtYXR0aW5nQ29udGV4dChyb290Q29udGFpbmVyLCBsYXlvdXRTdGF0ZSgpKTsK ICAgICAgICAgZm9ybWF0dGluZ0NvbnRleHQtPmxheW91dEluRmxvd0NvbnRlbnQoaW52YWxpZGF0 aW9uU3RhdGUsIEdlb21ldHJ5Ojpob3Jpem9udGFsQ29uc3RyYWludHNGb3JJbkZsb3cocm9vdENv bnRhaW5lckRpc3BsYXlCb3gpKTsKICAgICAgICAgLy8gQ29tZSBiYWNrIGFuZCBmaW5hbGl6ZSB0 aGUgcm9vdCdzIGdlb21ldHJ5LgotICAgICAgICBjb21wdXRlSGVpZ2h0QW5kTWFyZ2luKHJvb3RD b250YWluZXIpOworICAgICAgICBjb21wdXRlSGVpZ2h0QW5kTWFyZ2luKHJvb3RDb250YWluZXIs IGFkanVzdGVkSG9yaXpvbnRhbENvbnN0cmFpbnRzKTsKICAgICAgICAgLy8gTm93IHRoYXQgd2Ug Y29tcHV0ZWQgdGhlIHJvb3QncyBoZWlnaHQsIHdlIGNhbiBnbyBiYWNrIGFuZCBsYXlvdXQgdGhl IG91dC1vZi1mbG93IGNvbnRlbnQuCiAgICAgICAgIGF1dG8gaG9yaXpvbnRhbENvbnN0cmFpbnRz Rm9yT3V0T2ZGbG93ID0gIEdlb21ldHJ5Ojpob3Jpem9udGFsQ29uc3RyYWludHNGb3JPdXRPZkZs b3cocm9vdENvbnRhaW5lckRpc3BsYXlCb3gpOwogICAgICAgICBhdXRvIHZlcnRpY2FsQ29uc3Ry YWludHNGb3JPdXRPZkZsb3cgPSBHZW9tZXRyeTo6dmVydGljYWxDb25zdHJhaW50c0Zvck91dE9m Rmxvdyhyb290Q29udGFpbmVyRGlzcGxheUJveCk7CiAgICAgICAgIGZvcm1hdHRpbmdDb250ZXh0 LT5sYXlvdXRPdXRPZkZsb3dDb250ZW50KGludmFsaWRhdGlvblN0YXRlLCBob3Jpem9udGFsQ29u c3RyYWludHNGb3JPdXRPZkZsb3csIHZlcnRpY2FsQ29uc3RyYWludHNGb3JPdXRPZkZsb3cpOwog ICAgIH0gZWxzZQotICAgICAgICBjb21wdXRlSGVpZ2h0QW5kTWFyZ2luKGxheW91dEJveCk7Cisg ICAgICAgIGNvbXB1dGVIZWlnaHRBbmRNYXJnaW4obGF5b3V0Qm94LCBhZGp1c3RlZEhvcml6b250 YWxDb25zdHJhaW50cyk7CiAgICAgLy8gRmxvYXQgcmVsYXRlZCBmaW5hbCBwb3NpdGlvbmluZy4K ICAgICBpZiAobGF5b3V0Qm94LmlzRmxvYXRpbmdQb3NpdGlvbmVkKCkpIHsKICAgICAgICAgY29t cHV0ZUZsb2F0aW5nUG9zaXRpb24oZmxvYXRpbmdDb250ZXh0LCBsYXlvdXRCb3gpOwpAQCAtMjEz LDMwICsyMTQsMTkgQEAgdm9pZCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXRGb3JtYXR0 aW5nQ29udGV4dFJvb3QoY29uc3QgQm94JiBsYXlvdXRCb3gsIEYKICAgICAgICAgY29tcHV0ZVBv c2l0aW9uVG9Bdm9pZEZsb2F0cyhmbG9hdGluZ0NvbnRleHQsIGxheW91dEJveCk7CiB9CiAKLXZv aWQgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6cGxhY2VJbkZsb3dQb3NpdGlvbmVkQ2hpbGRyZW4o Y29uc3QgQm94JiBsYXlvdXRCb3gpCit2b2lkIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6OnBsYWNl SW5GbG93UG9zaXRpb25lZENoaWxkcmVuKGNvbnN0IEJveCYgbGF5b3V0Qm94LCBPcHRpb25hbDxV c2VkSG9yaXpvbnRhbFZhbHVlczo6Q29uc3RyYWludHM+IGhvcml6b250YWxDb25zdHJhaW50cykK IHsKICAgICBpZiAoIWlzPENvbnRhaW5lcj4obGF5b3V0Qm94KSkKICAgICAgICAgcmV0dXJuOwot CiAgICAgTE9HX1dJVEhfU1RSRUFNKEZvcm1hdHRpbmdDb250ZXh0TGF5b3V0LCBzdHJlYW0gPDwg IlN0YXJ0OiBtb3ZlIGluLWZsb3cgcG9zaXRpb25lZCBjaGlsZHJlbiAtPiBwYXJlbnQ6ICIgPDwg JmxheW91dEJveCk7CisKKyAgICBhdXRvIHVzZWRIb3Jpem9udGFsVmFsdWVzID0gVXNlZEhvcml6 b250YWxWYWx1ZXMgeyBob3Jpem9udGFsQ29uc3RyYWludHMgPyAqaG9yaXpvbnRhbENvbnN0cmFp bnRzIDogR2VvbWV0cnk6Omhvcml6b250YWxDb25zdHJhaW50c0ZvckluRmxvdyhnZW9tZXRyeUZv ckJveChsYXlvdXRCb3gpKSB9OwogICAgIGF1dG8mIGNvbnRhaW5lciA9IGRvd25jYXN0PENvbnRh aW5lcj4obGF5b3V0Qm94KTsKICAgICBmb3IgKGF1dG8mIGNoaWxkQm94IDogY2hpbGRyZW5PZlR5 cGU8Qm94Pihjb250YWluZXIpKSB7CiAgICAgICAgIGlmICghY2hpbGRCb3guaXNJbkZsb3dQb3Np dGlvbmVkKCkpCiAgICAgICAgICAgICBjb250aW51ZTsKLQotICAgICAgICBhdXRvIGNvbXB1dGVJ bkZsb3dQb3NpdGlvbmVkUG9zaXRpb24gPSBbJl0gewotICAgICAgICAgICAgYXV0byB1c2VkSG9y aXpvbnRhbFZhbHVlcyA9IFVzZWRIb3Jpem9udGFsVmFsdWVzIHsgR2VvbWV0cnk6Omhvcml6b250 YWxDb25zdHJhaW50c0ZvckluRmxvdyhnZW9tZXRyeUZvckJveCgqY2hpbGRCb3guY29udGFpbmlu Z0Jsb2NrKCkpKSB9OwotICAgICAgICAgICAgYXV0byBwb3NpdGlvbk9mZnNldCA9IGdlb21ldHJ5 KCkuaW5GbG93UG9zaXRpb25lZFBvc2l0aW9uT2Zmc2V0KGNoaWxkQm94LCB1c2VkSG9yaXpvbnRh bFZhbHVlcyk7Ci0KLSAgICAgICAgICAgIGF1dG8mIGRpc3BsYXlCb3ggPSBmb3JtYXR0aW5nU3Rh dGUoKS5kaXNwbGF5Qm94KGNoaWxkQm94KTsKLSAgICAgICAgICAgIGF1dG8gdG9wTGVmdCA9IGRp c3BsYXlCb3gudG9wTGVmdCgpOwotCi0gICAgICAgICAgICB0b3BMZWZ0Lm1vdmUocG9zaXRpb25P ZmZzZXQpOwotCi0gICAgICAgICAgICBkaXNwbGF5Qm94LnNldFRvcExlZnQodG9wTGVmdCk7Ci0g ICAgICAgIH07Ci0KLSAgICAgICAgY29tcHV0ZUluRmxvd1Bvc2l0aW9uZWRQb3NpdGlvbigpOwor ICAgICAgICBhdXRvIHBvc2l0aW9uT2Zmc2V0ID0gZ2VvbWV0cnkoKS5pbkZsb3dQb3NpdGlvbmVk UG9zaXRpb25PZmZzZXQoY2hpbGRCb3gsIHVzZWRIb3Jpem9udGFsVmFsdWVzKTsKKyAgICAgICAg Zm9ybWF0dGluZ1N0YXRlKCkuZGlzcGxheUJveChjaGlsZEJveCkubW92ZShwb3NpdGlvbk9mZnNl dCk7CiAgICAgfQogICAgIExPR19XSVRIX1NUUkVBTShGb3JtYXR0aW5nQ29udGV4dExheW91dCwg c3RyZWFtIDw8ICJFbmQ6IG1vdmUgaW4tZmxvdyBwb3NpdGlvbmVkIGNoaWxkcmVuIC0+IHBhcmVu dDogIiA8PCAmbGF5b3V0Qm94KTsKIH0KQEAgLTQxNCwxMCArNDA0LDkgQEAgdm9pZCBCbG9ja0Zv cm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlV2lkdGhBbmRNYXJnaW4oY29uc3QgQm94JiBsYXlvdXRC b3gsIGNvbnN0IFUKICAgICBkaXNwbGF5Qm94LnNldEhvcml6b250YWxDb21wdXRlZE1hcmdpbihj b250ZW50V2lkdGhBbmRNYXJnaW4uY29tcHV0ZWRNYXJnaW4pOwogfQogCi12b2lkIEJsb2NrRm9y bWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVIZWlnaHRBbmRNYXJnaW4oY29uc3QgQm94JiBsYXlvdXRC b3gpCit2b2lkIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVIZWlnaHRBbmRNYXJnaW4o Y29uc3QgQm94JiBsYXlvdXRCb3gsIGNvbnN0IFVzZWRIb3Jpem9udGFsVmFsdWVzOjpDb25zdHJh aW50cyYgaG9yaXpvbnRhbENvbnN0cmFpbnRzKQogewotICAgIGF1dG8mIGNvbnRhaW5pbmdCbG9j a0dlb21ldHJ5ID0gZ2VvbWV0cnlGb3JCb3goKmxheW91dEJveC5jb250YWluaW5nQmxvY2soKSk7 Ci0gICAgYXV0byB1c2VkSG9yaXpvbnRhbFZhbHVlcyA9IFVzZWRIb3Jpem9udGFsVmFsdWVzIHsg R2VvbWV0cnk6Omhvcml6b250YWxDb25zdHJhaW50c0ZvckluRmxvdyhjb250YWluaW5nQmxvY2tH ZW9tZXRyeSkgfTsKKyAgICBhdXRvIHVzZWRIb3Jpem9udGFsVmFsdWVzID0gVXNlZEhvcml6b250 YWxWYWx1ZXMgeyBob3Jpem9udGFsQ29uc3RyYWludHMgfTsKICAgICBhdXRvIGNvbXB1dGUgPSBb Jl0oYXV0byB1c2VkVmVydGljYWxWYWx1ZXMpIC0+IENvbnRlbnRIZWlnaHRBbmRNYXJnaW4gewog ICAgICAgICBpZiAobGF5b3V0Qm94LmlzSW5GbG93KCkpCiAgICAgICAgICAgICByZXR1cm4gZ2Vv bWV0cnkoKS5pbkZsb3dIZWlnaHRBbmRNYXJnaW4obGF5b3V0Qm94LCB1c2VkSG9yaXpvbnRhbFZh bHVlcywgdXNlZFZlcnRpY2FsVmFsdWVzKTsKQEAgLTQyOSw3ICs0MTgsNyBAQCB2b2lkIEJsb2Nr Rm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVIZWlnaHRBbmRNYXJnaW4oY29uc3QgQm94JiBsYXlv dXRCb3gpCiAgICAgICAgIHJldHVybiB7IH07CiAgICAgfTsKIAotICAgIGF1dG8gdmVydGljYWxD b25zdHJhaW50cyA9IFVzZWRWZXJ0aWNhbFZhbHVlczo6Q29uc3RyYWludHMgeyBjb250YWluaW5n QmxvY2tHZW9tZXRyeS5jb250ZW50Qm94VG9wKCkgfTsKKyAgICBhdXRvIHZlcnRpY2FsQ29uc3Ry YWludHMgPSBVc2VkVmVydGljYWxWYWx1ZXM6OkNvbnN0cmFpbnRzIHsgZ2VvbWV0cnlGb3JCb3go KmxheW91dEJveC5jb250YWluaW5nQmxvY2soKSkuY29udGVudEJveFRvcCgpIH07CiAgICAgYXV0 byBjb250ZW50SGVpZ2h0QW5kTWFyZ2luID0gY29tcHV0ZShVc2VkVmVydGljYWxWYWx1ZXMgeyB2 ZXJ0aWNhbENvbnN0cmFpbnRzIH0pOwogICAgIGlmIChhdXRvIG1heEhlaWdodCA9IGdlb21ldHJ5 KCkuY29tcHV0ZWRNYXhIZWlnaHQobGF5b3V0Qm94KSkgewogICAgICAgICBpZiAoY29udGVudEhl aWdodEFuZE1hcmdpbi5jb250ZW50SGVpZ2h0ID4gKm1heEhlaWdodCkgewpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250 ZXh0LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0 dGluZ0NvbnRleHQuaAppbmRleCA4NzQ1YjY0N2NmZTlkMzc4NTI2MDkwY2M4NDI0ZTRkYzBlMjcw MDdlLi45NjIxZjAzYzZmNTk4NmU5ZGEzNTZiYTIwYjQ1NWQ0ZWMzMTU5Y2U0IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0Nv bnRleHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2Nr Rm9ybWF0dGluZ0NvbnRleHQuaApAQCAtNTIsMTAgKzUyLDEwIEBAIHB1YmxpYzoKIAogcHJpdmF0 ZToKICAgICB2b2lkIGxheW91dEZvcm1hdHRpbmdDb250ZXh0Um9vdChjb25zdCBCb3gmLCBGbG9h dGluZ0NvbnRleHQmLCBJbnZhbGlkYXRpb25TdGF0ZSYsIGNvbnN0IFVzZWRIb3Jpem9udGFsVmFs dWVzOjpDb25zdHJhaW50cyYpOwotICAgIHZvaWQgcGxhY2VJbkZsb3dQb3NpdGlvbmVkQ2hpbGRy ZW4oY29uc3QgQm94Jik7CisgICAgdm9pZCBwbGFjZUluRmxvd1Bvc2l0aW9uZWRDaGlsZHJlbihj b25zdCBCb3gmLCBPcHRpb25hbDxVc2VkSG9yaXpvbnRhbFZhbHVlczo6Q29uc3RyYWludHM+ID0g V1RGOjpudWxsb3B0KTsKIAogICAgIHZvaWQgY29tcHV0ZVdpZHRoQW5kTWFyZ2luKGNvbnN0IEJv eCYsIGNvbnN0IFVzZWRIb3Jpem9udGFsVmFsdWVzOjpDb25zdHJhaW50cyYpOwotICAgIHZvaWQg Y29tcHV0ZUhlaWdodEFuZE1hcmdpbihjb25zdCBCb3gmKTsKKyAgICB2b2lkIGNvbXB1dGVIZWln aHRBbmRNYXJnaW4oY29uc3QgQm94JiwgY29uc3QgVXNlZEhvcml6b250YWxWYWx1ZXM6OkNvbnN0 cmFpbnRzJik7CiAKICAgICB2b2lkIGNvbXB1dGVTdGF0aWNIb3Jpem9udGFsUG9zaXRpb24oY29u c3QgQm94JiwgY29uc3QgVXNlZEhvcml6b250YWxWYWx1ZXM6OkNvbnN0cmFpbnRzJik7CiAgICAg dm9pZCBjb21wdXRlU3RhdGljVmVydGljYWxQb3NpdGlvbihjb25zdCBGbG9hdGluZ0NvbnRleHQm LCBjb25zdCBCb3gmKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9kaXNwbGF5 dHJlZS9EaXNwbGF5Qm94LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZGlzcGxheXRyZWUvRGlz cGxheUJveC5oCmluZGV4IGFhOTM0ZWFiNjA1Zjk5YWZiNTRiODY3YTA1M2M0MzcxNjY5YTg4MTYu LjIwYjc5NzljN2E2YjAwODExNDcwMDAyM2IxODMyZWYyOWZhMTU5MzIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9kaXNwbGF5dHJlZS9EaXNwbGF5Qm94LmgKKysrIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2Rpc3BsYXl0cmVlL0Rpc3BsYXlCb3guaApAQCAtMTIxLDYgKzEyMSw3 IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldExlZnQoTGF5b3V0VW5pdCk7CiAgICAgdm9pZCBtb3Zl SG9yaXpvbnRhbGx5KExheW91dFVuaXQgb2Zmc2V0KSB7IG1fdG9wTGVmdC5tb3ZlKG9mZnNldCwg MF9sdSk7IH0KICAgICB2b2lkIG1vdmVWZXJ0aWNhbGx5KExheW91dFVuaXQgb2Zmc2V0KSB7IG1f dG9wTGVmdC5tb3ZlKDBfbHUsIG9mZnNldCk7IH0KKyAgICB2b2lkIG1vdmUoY29uc3QgTGF5b3V0 U2l6ZSYgc2l6ZSkgeyBtX3RvcExlZnQubW92ZShzaXplKTsgfQogICAgIHZvaWQgbW92ZUJ5KExh eW91dFBvaW50IG9mZnNldCkgeyBtX3RvcExlZnQubW92ZUJ5KG9mZnNldCk7IH0KIAogICAgIHZv aWQgc2V0Q29udGVudEJveEhlaWdodChMYXlvdXRVbml0KTsK