209717 2020-03-29 08:44:02 -0700 [LFC] Replace parent() calls with containingBlock() where applicable. 2020-03-29 10:31:12 -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 1635336 0 zalan 2020-03-29 08:44:02 -0700 while they return the same layout box (parent), it's more correct to call containingBlock on them. 1635338 1 394866 zalan 2020-03-29 08:55:35 -0700 Created attachment 394866 Patch 1635346 2 394868 zalan 2020-03-29 09:47:35 -0700 Created attachment 394868 Patch 1635349 3 ews-feeder 2020-03-29 10:30:04 -0700 Committed r259181: <https://trac.webkit.org/changeset/259181> All reviewed patches have been landed. Closing bug and clearing flags on attachment 394868. 1635350 4 webkit-bug-importer 2020-03-29 10:31:12 -0700 <rdar://problem/61029530> 394866 2020-03-29 08:55:35 -0700 2020-03-29 09:47:34 -0700 Patch bug-209717-20200329085534.patch text/plain 7214 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5MTYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTk1ZGQ2YmMyNzIzNjQ2 NjJkMzk1NzQ0MzAzMmJlNDYzNzVmMzdkYi4uOWY2OTgzNjFmZDBkNzQ0NzZiNDU2MWVjY2E2YWIy ODM2NDNiOGNhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIwLTAzLTI5ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ10gUmVwbGFjZSBwYXJl bnQoKSBjYWxscyB3aXRoIGNvbnRhaW5pbmdCbG9jaygpIHdoZXJlIGFwcGxpY2FibGUuCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDk3MTcKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaGlsZSB0aGV5IGJv dGggcmV0dXJuIHRoZSBzYW1lIGxheW91dCBib3ggKHBhcmVudCksIGl0J3MgbW9yZSBjb3JyZWN0 IHRvIGNhbGwgY29udGluaW5nQmxvY2soKS4KKworICAgICAgICAqIGxheW91dC9ibG9ja2Zvcm1h dHRpbmcvQmxvY2tNYXJnaW5Db2xsYXBzZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6 OkJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Ok1hcmdpbkNvbGxhcHNlOjptYXJnaW5CZWZvcmVDb2xs YXBzZXNXaXRoUGFyZW50TWFyZ2luQWZ0ZXIgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5 b3V0OjpCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpNYXJnaW5Db2xsYXBzZTo6bWFyZ2luQmVmb3Jl Q29sbGFwc2VzV2l0aFBhcmVudE1hcmdpbkJlZm9yZSBjb25zdCk6CisgICAgICAgIChXZWJDb3Jl OjpMYXlvdXQ6OkJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Ok1hcmdpbkNvbGxhcHNlOjptYXJnaW5B ZnRlckNvbGxhcHNlc1dpdGhQYXJlbnRNYXJnaW5CZWZvcmUgY29uc3QpOgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0OjpCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpNYXJnaW5Db2xsYXBzZTo6bWFy Z2luQWZ0ZXJDb2xsYXBzZXNXaXRoUGFyZW50TWFyZ2luQWZ0ZXIgY29uc3QpOgorICAgICAgICAq IGxheW91dC9sYXlvdXR0cmVlL0xheW91dEJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlv dXQ6OkJveDo6aXNPdmVyZmxvd1Zpc2libGUgY29uc3QpOgorICAgICAgICAqIGxheW91dC90YWJs ZWZvcm1hdHRpbmcvVGFibGVHcmlkLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6VGFi bGVHcmlkOjphcHBlbmRDZWxsKToKKwogMjAyMC0wMy0yOCAgWmFsYW4gQnVqdGFzICA8emFsYW5A YXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdIExheW91dDo6Qm94OjpwYXJlbnQoKSBzaG91bGQg cmV0dXJuIGNvbnN0IENvbnRhaW5lckJveCYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tNYXJnaW5Db2xsYXBzZS5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrTWFyZ2luQ29sbGFwc2UuY3BwCmluZGV4 IDRhNzBmMzJhYWNkOTdmNjI2MjI4MmMzMDgyMWI2NjdkYjkxNTJmZjkuLjlhNjU5ZjNjZWU0YTdj ZDNjMWY2MzI1ZTUwMjJlZDhhNDNhNDYyN2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tNYXJnaW5Db2xsYXBzZS5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja01hcmdpbkNvbGxhcHNlLmNwcApA QCAtOTcsNyArOTcsNyBAQCBib29sIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Ok1hcmdpbkNvbGxh cHNlOjptYXJnaW5CZWZvcmVDb2xsYXBzZXNXaXRoUGFyZW50TWFyZwogICAgIC8vIDEuIFRoaXMg aXMgdGhlIGxhc3QgaW4tZmxvdyBjaGlsZCBhbmQgaXRzIG1hcmdpbnMgY29sbGFwc2UgdGhyb3Vn aCBhbmQgdGhlIG1hcmdpbiBhZnRlciBjb2xsYXBzZXMgd2l0aCBwYXJlbnQncyBtYXJnaW4gYWZ0 ZXIgb3IKICAgICAvLyAyLiBUaGlzIGJveCdzIG1hcmdpbiBhZnRlciBjb2xsYXBzZXMgd2l0aCB0 aGUgbmV4dCBzaWJsaW5nJ3MgbWFyZ2luIGJlZm9yZSBhbmQgdGhhdCBzaWJsaW5nIGNvbGxhcHNl cyB0aHJvdWdoIGFuZAogICAgIC8vIHdlIGNhbiBnZXQgdG8gdGhlIGxhc3QgaW4tZmxvdyBjaGls ZCBsaWtlIHRoYXQuCi0gICAgYXV0byogbGFzdEluRmxvd0NoaWxkID0gbGF5b3V0Qm94LnBhcmVu dCgpLmxhc3RJbkZsb3dDaGlsZCgpOworICAgIGF1dG8qIGxhc3RJbkZsb3dDaGlsZCA9IGxheW91 dEJveC5jb250YWluaW5nQmxvY2soKS5sYXN0SW5GbG93Q2hpbGQoKTsKICAgICBmb3IgKGF1dG8q IGN1cnJlbnRCb3ggPSAmbGF5b3V0Qm94OyBjdXJyZW50Qm94OyBjdXJyZW50Qm94ID0gY3VycmVu dEJveC0+bmV4dEluRmxvd1NpYmxpbmcoKSkgewogICAgICAgICBpZiAoIW1hcmdpbnNDb2xsYXBz ZVRocm91Z2goKmN1cnJlbnRCb3gpKQogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwpAQCAtMTMy LDE1ICsxMzIsMTUgQEAgYm9vbCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpNYXJnaW5Db2xsYXBz ZTo6bWFyZ2luQmVmb3JlQ29sbGFwc2VzV2l0aFBhcmVudE1hcmcKICAgICBpZiAobGF5b3V0Qm94 LnByZXZpb3VzSW5GbG93U2libGluZygpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBh dXRvJiBwYXJlbnQgPSBsYXlvdXRCb3gucGFyZW50KCk7CisgICAgYXV0byYgY29udGFpbmluZ0Js b2NrID0gbGF5b3V0Qm94LmNvbnRhaW5pbmdCbG9jaygpOwogICAgIC8vIE1hcmdpbnMgb2YgZWxl bWVudHMgdGhhdCBlc3RhYmxpc2ggbmV3IGJsb2NrIGZvcm1hdHRpbmcgY29udGV4dHMgZG8gbm90 IGNvbGxhcHNlIHdpdGggdGhlaXIgaW4tZmxvdyBjaGlsZHJlbgotICAgIGlmIChlc3RhYmxpc2hl c0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQocGFyZW50KSkKKyAgICBpZiAoZXN0YWJsaXNoZXNCbG9j a0Zvcm1hdHRpbmdDb250ZXh0KGNvbnRhaW5pbmdCbG9jaykpCiAgICAgICAgIHJldHVybiBmYWxz ZTsKIAotICAgIGlmIChoYXNCb3JkZXJCZWZvcmUocGFyZW50KSkKKyAgICBpZiAoaGFzQm9yZGVy QmVmb3JlKGNvbnRhaW5pbmdCbG9jaykpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIGlm IChoYXNQYWRkaW5nQmVmb3JlKHBhcmVudCkpCisgICAgaWYgKGhhc1BhZGRpbmdCZWZvcmUoY29u dGFpbmluZ0Jsb2NrKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgLy8gLi4uYW5kIHRo ZSBjaGlsZCBoYXMgbm8gY2xlYXJhbmNlLgpAQCAtMjM0LDcgKzIzNCw3IEBAIGJvb2wgQmxvY2tG b3JtYXR0aW5nQ29udGV4dDo6TWFyZ2luQ29sbGFwc2U6Om1hcmdpbkFmdGVyQ29sbGFwc2VzV2l0 aFBhcmVudE1hcmdpCiAgICAgLy8gMS4gVGhpcyBpcyB0aGUgZmlyc3QgaW4tZmxvdyBjaGlsZCBh bmQgaXRzIG1hcmdpbnMgY29sbGFwc2UgdGhyb3VnaCBhbmQgdGhlIG1hcmdpbiBiZWZvcmUgY29s bGFwc2VzIHdpdGggcGFyZW50J3MgbWFyZ2luIGJlZm9yZSBvcgogICAgIC8vIDIuIFRoaXMgYm94 J3MgbWFyZ2luIGJlZm9yZSBjb2xsYXBzZXMgd2l0aCB0aGUgcHJldmlvdXMgc2libGluZydzIG1h cmdpbiBhZnRlciBhbmQgdGhhdCBzaWJsaW5nIGNvbGxhcHNlcyB0aHJvdWdoIGFuZAogICAgIC8v IHdlIGNhbiBnZXQgdG8gdGhlIGZpcnN0IGluLWZsb3cgY2hpbGQgbGlrZSB0aGF0LgotICAgIGF1 dG8qIGZpcnN0SW5GbG93Q2hpbGQgPSBsYXlvdXRCb3gucGFyZW50KCkuZmlyc3RJbkZsb3dDaGls ZCgpOworICAgIGF1dG8qIGZpcnN0SW5GbG93Q2hpbGQgPSBsYXlvdXRCb3guY29udGFpbmluZ0Js b2NrKCkuZmlyc3RJbkZsb3dDaGlsZCgpOwogICAgIGZvciAoYXV0byogY3VycmVudEJveCA9ICZs YXlvdXRCb3g7IGN1cnJlbnRCb3g7IGN1cnJlbnRCb3ggPSBjdXJyZW50Qm94LT5wcmV2aW91c0lu Rmxvd1NpYmxpbmcoKSkgewogICAgICAgICBpZiAoIW1hcmdpbnNDb2xsYXBzZVRocm91Z2goKmN1 cnJlbnRCb3gpKQogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwpAQCAtMjY3LDIxICsyNjcsMjEg QEAgYm9vbCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpNYXJnaW5Db2xsYXBzZTo6bWFyZ2luQWZ0 ZXJDb2xsYXBzZXNXaXRoUGFyZW50TWFyZ2kKICAgICBpZiAobGF5b3V0Qm94Lm5leHRJbkZsb3dT aWJsaW5nKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIGF1dG8mIHBhcmVudCA9IGxh eW91dEJveC5wYXJlbnQoKTsKKyAgICBhdXRvJiBjb250YWluaW5nQmxvY2sgPSBsYXlvdXRCb3gu Y29udGFpbmluZ0Jsb2NrKCk7CiAgICAgLy8gTWFyZ2lucyBvZiBlbGVtZW50cyB0aGF0IGVzdGFi bGlzaCBuZXcgYmxvY2sgZm9ybWF0dGluZyBjb250ZXh0cyBkbyBub3QgY29sbGFwc2Ugd2l0aCB0 aGVpciBpbi1mbG93IGNoaWxkcmVuLgotICAgIGlmIChlc3RhYmxpc2hlc0Jsb2NrRm9ybWF0dGlu Z0NvbnRleHQocGFyZW50KSkKKyAgICBpZiAoZXN0YWJsaXNoZXNCbG9ja0Zvcm1hdHRpbmdDb250 ZXh0KGNvbnRhaW5pbmdCbG9jaykpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIC8vIFRo ZSBib3R0b20gbWFyZ2luIG9mIGFuIGluLWZsb3cgYmxvY2sgYm94IHdpdGggYSAnaGVpZ2h0JyBv ZiAnYXV0bycgY29sbGFwc2VzIHdpdGggaXRzIGxhc3QgaW4tZmxvdyBibG9jay1sZXZlbCBjaGls ZCdzIGJvdHRvbSBtYXJnaW4sIGlmOgotICAgIGlmICghcGFyZW50LnN0eWxlKCkuaGVpZ2h0KCku aXNBdXRvKCkpCisgICAgaWYgKCFjb250YWluaW5nQmxvY2suc3R5bGUoKS5oZWlnaHQoKS5pc0F1 dG8oKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgLy8gdGhlIGJveCBoYXMgbm8gYm90 dG9tIHBhZGRpbmcsIGFuZAotICAgIGlmIChoYXNQYWRkaW5nQWZ0ZXIocGFyZW50KSkKKyAgICBp ZiAoaGFzUGFkZGluZ0FmdGVyKGNvbnRhaW5pbmdCbG9jaykpCiAgICAgICAgIHJldHVybiBmYWxz ZTsKIAogICAgIC8vIHRoZSBib3ggaGFzIG5vIGJvdHRvbSBib3JkZXIsIGFuZAotICAgIGlmICho YXNCb3JkZXJBZnRlcihwYXJlbnQpKQorICAgIGlmIChoYXNCb3JkZXJBZnRlcihjb250YWluaW5n QmxvY2spKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICAvLyB0aGUgY2hpbGQncyBib3R0 b20gbWFyZ2luIG5laXRoZXIgY29sbGFwc2VzIHdpdGggYSB0b3AgbWFyZ2luIHRoYXQgaGFzIGNs ZWFyYW5jZS4uLgpAQCAtMjg5LDcgKzI4OSw3IEBAIGJvb2wgQmxvY2tGb3JtYXR0aW5nQ29udGV4 dDo6TWFyZ2luQ29sbGFwc2U6Om1hcmdpbkFmdGVyQ29sbGFwc2VzV2l0aFBhcmVudE1hcmdpCiAg ICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIC8vIG5vciAoaWYgdGhlIGJveCdzIG1pbi1oZWln aHQgaXMgbm9uLXplcm8pIHdpdGggdGhlIGJveCdzIHRvcCBtYXJnaW4uCi0gICAgYXV0byBjb21w dXRlZE1pbkhlaWdodCA9IHBhcmVudC5zdHlsZSgpLmxvZ2ljYWxNaW5IZWlnaHQoKTsKKyAgICBh dXRvIGNvbXB1dGVkTWluSGVpZ2h0ID0gY29udGFpbmluZ0Jsb2NrLnN0eWxlKCkubG9naWNhbE1p bkhlaWdodCgpOwogICAgIGlmICghY29tcHV0ZWRNaW5IZWlnaHQuaXNBdXRvKCkgJiYgY29tcHV0 ZWRNaW5IZWlnaHQudmFsdWUoKSAmJiBtYXJnaW5BZnRlckNvbGxhcHNlc1dpdGhQYXJlbnRNYXJn aW5CZWZvcmUobGF5b3V0Qm94KSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRCb3guY3BwIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2xheW91dHRyZWUvTGF5b3V0Qm94LmNwcAppbmRleCA1M2M5YWE0NDli Yzg5MGM4MjY4ZmFjYjA2ZGNkYmM1YmNlNzkwNjMwLi5kZmYwOGE0NDkzZDUxMzI1ZjQzMDQwMzhj MDgxMDlkMTZjMWQ0MjRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvbGF5b3V0 dHJlZS9MYXlvdXRCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9sYXlvdXR0cmVl L0xheW91dEJveC5jcHAKQEAgLTM1Miw3ICszNTIsNyBAQCBib29sIEJveDo6aXNPdmVyZmxvd1Zp c2libGUoKSBjb25zdAogICAgIC8vIGlmIHRoZSB2YWx1ZSBvbiB0aGUgcm9vdCBlbGVtZW50IGlz ICd2aXNpYmxlJy4gVGhlICd2aXNpYmxlJyB2YWx1ZSB3aGVuIHVzZWQgZm9yIHRoZSB2aWV3cG9y dCBtdXN0IGJlIGludGVycHJldGVkIGFzICdhdXRvJy4KICAgICAvLyBUaGUgZWxlbWVudCBmcm9t IHdoaWNoIHRoZSB2YWx1ZSBpcyBwcm9wYWdhdGVkIG11c3QgaGF2ZSBhIHVzZWQgdmFsdWUgZm9y ICdvdmVyZmxvdycgb2YgJ3Zpc2libGUnLgogICAgIGlmIChpc0JvZHlCb3goKSkgewotICAgICAg ICBhdXRvJiBkb2N1bWVudEJveCA9IHBhcmVudCgpOworICAgICAgICBhdXRvJiBkb2N1bWVudEJv eCA9IGNvbnRhaW5pbmdCbG9jaygpOwogICAgICAgICBpZiAoIWRvY3VtZW50Qm94LmlzRG9jdW1l bnRCb3goKSkKICAgICAgICAgICAgIHJldHVybiBpc092ZXJmbG93VmlzaWJsZTsKICAgICAgICAg aWYgKCFkb2N1bWVudEJveC5pc092ZXJmbG93VmlzaWJsZSgpKQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L3RhYmxlZm9ybWF0dGluZy9UYWJsZUdyaWQuY3BwIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L3RhYmxlZm9ybWF0dGluZy9UYWJsZUdyaWQuY3BwCmluZGV4IDgwMTg4Nzk4 MjIxNDQ5ZDNmNTgzOTIxMzkwYjEyOGU4MmY5NTc4YmIuLjY5OGY2ZmNhZTRjNmFhNWNhMGM4ZjNl ZDFjMDcwMjlkMDI0MWVkZTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC90YWJs ZWZvcm1hdHRpbmcvVGFibGVHcmlkLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvdGFi bGVmb3JtYXR0aW5nL1RhYmxlR3JpZC5jcHAKQEAgLTE1Nyw3ICsxNTcsNyBAQCB2b2lkIFRhYmxl R3JpZDo6YXBwZW5kQ2VsbChjb25zdCBCb3gmIHRhYmxlQ2VsbEJveCkKICAgICAgICAgbV9jb2x1 bW5zQ29udGV4dC5hZGRDb2x1bW4oKTsKIAogICAgIGlmIChpc0luTmV3Um93KQotICAgICAgICBt X3Jvd3MuYXBwZW5kKHsgdGFibGVDZWxsQm94LnBhcmVudCgpIH0pOworICAgICAgICBtX3Jvd3Mu YXBwZW5kKHsgdGFibGVDZWxsQm94LmNvbnRhaW5pbmdCbG9jaygpIH0pOwogCiAgICAgbV9jZWxs TGlzdC5hZGQoV1RGTW92ZShjZWxsSW5mbykpOwogfQo= 394868 2020-03-29 09:47:35 -0700 2020-03-29 10:30:04 -0700 Patch bug-209717-20200329094735.patch text/plain 6593 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5MTYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTk1ZGQ2YmMyNzIzNjQ2 NjJkMzk1NzQ0MzAzMmJlNDYzNzVmMzdkYi4uODc2NmY0NDg4ZTA3Y2Y5MWI1MDhkY2U3ZjQ1NThm MmVkN2UzMDc2MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIwLTAzLTI5ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ10gUmVwbGFjZSBwYXJl bnQoKSBjYWxscyB3aXRoIGNvbnRhaW5pbmdCbG9jaygpIHdoZXJlIGFwcGxpY2FibGUuCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDk3MTcKKworICAg ICAgICBSZXZpZXdlZCBieSBBbnR0aSBLb2l2aXN0by4KKworICAgICAgICBXaGlsZSB0aGV5IGJv dGggcmV0dXJuIHRoZSBzYW1lIGxheW91dCBib3ggKHBhcmVudCksIGl0J3MgbW9yZSBjb3JyZWN0 IHRvIGNhbGwgY29udGluaW5nQmxvY2soKS4KKworICAgICAgICAqIGxheW91dC9ibG9ja2Zvcm1h dHRpbmcvQmxvY2tNYXJnaW5Db2xsYXBzZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6 OkJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Ok1hcmdpbkNvbGxhcHNlOjptYXJnaW5CZWZvcmVDb2xs YXBzZXNXaXRoUGFyZW50TWFyZ2luQWZ0ZXIgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5 b3V0OjpCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpNYXJnaW5Db2xsYXBzZTo6bWFyZ2luQmVmb3Jl Q29sbGFwc2VzV2l0aFBhcmVudE1hcmdpbkJlZm9yZSBjb25zdCk6CisgICAgICAgIChXZWJDb3Jl OjpMYXlvdXQ6OkJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Ok1hcmdpbkNvbGxhcHNlOjptYXJnaW5B ZnRlckNvbGxhcHNlc1dpdGhQYXJlbnRNYXJnaW5CZWZvcmUgY29uc3QpOgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0OjpCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpNYXJnaW5Db2xsYXBzZTo6bWFy Z2luQWZ0ZXJDb2xsYXBzZXNXaXRoUGFyZW50TWFyZ2luQWZ0ZXIgY29uc3QpOgorICAgICAgICAq IGxheW91dC9sYXlvdXR0cmVlL0xheW91dEJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlv dXQ6OkJveDo6aXNPdmVyZmxvd1Zpc2libGUgY29uc3QpOgorICAgICAgICAqIGxheW91dC90YWJs ZWZvcm1hdHRpbmcvVGFibGVHcmlkLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6VGFi bGVHcmlkOjphcHBlbmRDZWxsKToKKwogMjAyMC0wMy0yOCAgWmFsYW4gQnVqdGFzICA8emFsYW5A YXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdIExheW91dDo6Qm94OjpwYXJlbnQoKSBzaG91bGQg cmV0dXJuIGNvbnN0IENvbnRhaW5lckJveCYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tNYXJnaW5Db2xsYXBzZS5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrTWFyZ2luQ29sbGFwc2UuY3BwCmluZGV4 IDRhNzBmMzJhYWNkOTdmNjI2MjI4MmMzMDgyMWI2NjdkYjkxNTJmZjkuLjlhNjU5ZjNjZWU0YTdj ZDNjMWY2MzI1ZTUwMjJlZDhhNDNhNDYyN2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tNYXJnaW5Db2xsYXBzZS5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja01hcmdpbkNvbGxhcHNlLmNwcApA QCAtOTcsNyArOTcsNyBAQCBib29sIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Ok1hcmdpbkNvbGxh cHNlOjptYXJnaW5CZWZvcmVDb2xsYXBzZXNXaXRoUGFyZW50TWFyZwogICAgIC8vIDEuIFRoaXMg aXMgdGhlIGxhc3QgaW4tZmxvdyBjaGlsZCBhbmQgaXRzIG1hcmdpbnMgY29sbGFwc2UgdGhyb3Vn aCBhbmQgdGhlIG1hcmdpbiBhZnRlciBjb2xsYXBzZXMgd2l0aCBwYXJlbnQncyBtYXJnaW4gYWZ0 ZXIgb3IKICAgICAvLyAyLiBUaGlzIGJveCdzIG1hcmdpbiBhZnRlciBjb2xsYXBzZXMgd2l0aCB0 aGUgbmV4dCBzaWJsaW5nJ3MgbWFyZ2luIGJlZm9yZSBhbmQgdGhhdCBzaWJsaW5nIGNvbGxhcHNl cyB0aHJvdWdoIGFuZAogICAgIC8vIHdlIGNhbiBnZXQgdG8gdGhlIGxhc3QgaW4tZmxvdyBjaGls ZCBsaWtlIHRoYXQuCi0gICAgYXV0byogbGFzdEluRmxvd0NoaWxkID0gbGF5b3V0Qm94LnBhcmVu dCgpLmxhc3RJbkZsb3dDaGlsZCgpOworICAgIGF1dG8qIGxhc3RJbkZsb3dDaGlsZCA9IGxheW91 dEJveC5jb250YWluaW5nQmxvY2soKS5sYXN0SW5GbG93Q2hpbGQoKTsKICAgICBmb3IgKGF1dG8q IGN1cnJlbnRCb3ggPSAmbGF5b3V0Qm94OyBjdXJyZW50Qm94OyBjdXJyZW50Qm94ID0gY3VycmVu dEJveC0+bmV4dEluRmxvd1NpYmxpbmcoKSkgewogICAgICAgICBpZiAoIW1hcmdpbnNDb2xsYXBz ZVRocm91Z2goKmN1cnJlbnRCb3gpKQogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwpAQCAtMTMy LDE1ICsxMzIsMTUgQEAgYm9vbCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpNYXJnaW5Db2xsYXBz ZTo6bWFyZ2luQmVmb3JlQ29sbGFwc2VzV2l0aFBhcmVudE1hcmcKICAgICBpZiAobGF5b3V0Qm94 LnByZXZpb3VzSW5GbG93U2libGluZygpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBh dXRvJiBwYXJlbnQgPSBsYXlvdXRCb3gucGFyZW50KCk7CisgICAgYXV0byYgY29udGFpbmluZ0Js b2NrID0gbGF5b3V0Qm94LmNvbnRhaW5pbmdCbG9jaygpOwogICAgIC8vIE1hcmdpbnMgb2YgZWxl bWVudHMgdGhhdCBlc3RhYmxpc2ggbmV3IGJsb2NrIGZvcm1hdHRpbmcgY29udGV4dHMgZG8gbm90 IGNvbGxhcHNlIHdpdGggdGhlaXIgaW4tZmxvdyBjaGlsZHJlbgotICAgIGlmIChlc3RhYmxpc2hl c0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQocGFyZW50KSkKKyAgICBpZiAoZXN0YWJsaXNoZXNCbG9j a0Zvcm1hdHRpbmdDb250ZXh0KGNvbnRhaW5pbmdCbG9jaykpCiAgICAgICAgIHJldHVybiBmYWxz ZTsKIAotICAgIGlmIChoYXNCb3JkZXJCZWZvcmUocGFyZW50KSkKKyAgICBpZiAoaGFzQm9yZGVy QmVmb3JlKGNvbnRhaW5pbmdCbG9jaykpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIGlm IChoYXNQYWRkaW5nQmVmb3JlKHBhcmVudCkpCisgICAgaWYgKGhhc1BhZGRpbmdCZWZvcmUoY29u dGFpbmluZ0Jsb2NrKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgLy8gLi4uYW5kIHRo ZSBjaGlsZCBoYXMgbm8gY2xlYXJhbmNlLgpAQCAtMjM0LDcgKzIzNCw3IEBAIGJvb2wgQmxvY2tG b3JtYXR0aW5nQ29udGV4dDo6TWFyZ2luQ29sbGFwc2U6Om1hcmdpbkFmdGVyQ29sbGFwc2VzV2l0 aFBhcmVudE1hcmdpCiAgICAgLy8gMS4gVGhpcyBpcyB0aGUgZmlyc3QgaW4tZmxvdyBjaGlsZCBh bmQgaXRzIG1hcmdpbnMgY29sbGFwc2UgdGhyb3VnaCBhbmQgdGhlIG1hcmdpbiBiZWZvcmUgY29s bGFwc2VzIHdpdGggcGFyZW50J3MgbWFyZ2luIGJlZm9yZSBvcgogICAgIC8vIDIuIFRoaXMgYm94 J3MgbWFyZ2luIGJlZm9yZSBjb2xsYXBzZXMgd2l0aCB0aGUgcHJldmlvdXMgc2libGluZydzIG1h cmdpbiBhZnRlciBhbmQgdGhhdCBzaWJsaW5nIGNvbGxhcHNlcyB0aHJvdWdoIGFuZAogICAgIC8v IHdlIGNhbiBnZXQgdG8gdGhlIGZpcnN0IGluLWZsb3cgY2hpbGQgbGlrZSB0aGF0LgotICAgIGF1 dG8qIGZpcnN0SW5GbG93Q2hpbGQgPSBsYXlvdXRCb3gucGFyZW50KCkuZmlyc3RJbkZsb3dDaGls ZCgpOworICAgIGF1dG8qIGZpcnN0SW5GbG93Q2hpbGQgPSBsYXlvdXRCb3guY29udGFpbmluZ0Js b2NrKCkuZmlyc3RJbkZsb3dDaGlsZCgpOwogICAgIGZvciAoYXV0byogY3VycmVudEJveCA9ICZs YXlvdXRCb3g7IGN1cnJlbnRCb3g7IGN1cnJlbnRCb3ggPSBjdXJyZW50Qm94LT5wcmV2aW91c0lu Rmxvd1NpYmxpbmcoKSkgewogICAgICAgICBpZiAoIW1hcmdpbnNDb2xsYXBzZVRocm91Z2goKmN1 cnJlbnRCb3gpKQogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwpAQCAtMjY3LDIxICsyNjcsMjEg QEAgYm9vbCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpNYXJnaW5Db2xsYXBzZTo6bWFyZ2luQWZ0 ZXJDb2xsYXBzZXNXaXRoUGFyZW50TWFyZ2kKICAgICBpZiAobGF5b3V0Qm94Lm5leHRJbkZsb3dT aWJsaW5nKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIGF1dG8mIHBhcmVudCA9IGxh eW91dEJveC5wYXJlbnQoKTsKKyAgICBhdXRvJiBjb250YWluaW5nQmxvY2sgPSBsYXlvdXRCb3gu Y29udGFpbmluZ0Jsb2NrKCk7CiAgICAgLy8gTWFyZ2lucyBvZiBlbGVtZW50cyB0aGF0IGVzdGFi bGlzaCBuZXcgYmxvY2sgZm9ybWF0dGluZyBjb250ZXh0cyBkbyBub3QgY29sbGFwc2Ugd2l0aCB0 aGVpciBpbi1mbG93IGNoaWxkcmVuLgotICAgIGlmIChlc3RhYmxpc2hlc0Jsb2NrRm9ybWF0dGlu Z0NvbnRleHQocGFyZW50KSkKKyAgICBpZiAoZXN0YWJsaXNoZXNCbG9ja0Zvcm1hdHRpbmdDb250 ZXh0KGNvbnRhaW5pbmdCbG9jaykpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIC8vIFRo ZSBib3R0b20gbWFyZ2luIG9mIGFuIGluLWZsb3cgYmxvY2sgYm94IHdpdGggYSAnaGVpZ2h0JyBv ZiAnYXV0bycgY29sbGFwc2VzIHdpdGggaXRzIGxhc3QgaW4tZmxvdyBibG9jay1sZXZlbCBjaGls ZCdzIGJvdHRvbSBtYXJnaW4sIGlmOgotICAgIGlmICghcGFyZW50LnN0eWxlKCkuaGVpZ2h0KCku aXNBdXRvKCkpCisgICAgaWYgKCFjb250YWluaW5nQmxvY2suc3R5bGUoKS5oZWlnaHQoKS5pc0F1 dG8oKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgLy8gdGhlIGJveCBoYXMgbm8gYm90 dG9tIHBhZGRpbmcsIGFuZAotICAgIGlmIChoYXNQYWRkaW5nQWZ0ZXIocGFyZW50KSkKKyAgICBp ZiAoaGFzUGFkZGluZ0FmdGVyKGNvbnRhaW5pbmdCbG9jaykpCiAgICAgICAgIHJldHVybiBmYWxz ZTsKIAogICAgIC8vIHRoZSBib3ggaGFzIG5vIGJvdHRvbSBib3JkZXIsIGFuZAotICAgIGlmICho YXNCb3JkZXJBZnRlcihwYXJlbnQpKQorICAgIGlmIChoYXNCb3JkZXJBZnRlcihjb250YWluaW5n QmxvY2spKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICAvLyB0aGUgY2hpbGQncyBib3R0 b20gbWFyZ2luIG5laXRoZXIgY29sbGFwc2VzIHdpdGggYSB0b3AgbWFyZ2luIHRoYXQgaGFzIGNs ZWFyYW5jZS4uLgpAQCAtMjg5LDcgKzI4OSw3IEBAIGJvb2wgQmxvY2tGb3JtYXR0aW5nQ29udGV4 dDo6TWFyZ2luQ29sbGFwc2U6Om1hcmdpbkFmdGVyQ29sbGFwc2VzV2l0aFBhcmVudE1hcmdpCiAg ICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIC8vIG5vciAoaWYgdGhlIGJveCdzIG1pbi1oZWln aHQgaXMgbm9uLXplcm8pIHdpdGggdGhlIGJveCdzIHRvcCBtYXJnaW4uCi0gICAgYXV0byBjb21w dXRlZE1pbkhlaWdodCA9IHBhcmVudC5zdHlsZSgpLmxvZ2ljYWxNaW5IZWlnaHQoKTsKKyAgICBh dXRvIGNvbXB1dGVkTWluSGVpZ2h0ID0gY29udGFpbmluZ0Jsb2NrLnN0eWxlKCkubG9naWNhbE1p bkhlaWdodCgpOwogICAgIGlmICghY29tcHV0ZWRNaW5IZWlnaHQuaXNBdXRvKCkgJiYgY29tcHV0 ZWRNaW5IZWlnaHQudmFsdWUoKSAmJiBtYXJnaW5BZnRlckNvbGxhcHNlc1dpdGhQYXJlbnRNYXJn aW5CZWZvcmUobGF5b3V0Qm94KSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRCb3guY3BwIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2xheW91dHRyZWUvTGF5b3V0Qm94LmNwcAppbmRleCA1M2M5YWE0NDli Yzg5MGM4MjY4ZmFjYjA2ZGNkYmM1YmNlNzkwNjMwLi5kZmYwOGE0NDkzZDUxMzI1ZjQzMDQwMzhj MDgxMDlkMTZjMWQ0MjRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvbGF5b3V0 dHJlZS9MYXlvdXRCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9sYXlvdXR0cmVl L0xheW91dEJveC5jcHAKQEAgLTM1Miw3ICszNTIsNyBAQCBib29sIEJveDo6aXNPdmVyZmxvd1Zp c2libGUoKSBjb25zdAogICAgIC8vIGlmIHRoZSB2YWx1ZSBvbiB0aGUgcm9vdCBlbGVtZW50IGlz ICd2aXNpYmxlJy4gVGhlICd2aXNpYmxlJyB2YWx1ZSB3aGVuIHVzZWQgZm9yIHRoZSB2aWV3cG9y dCBtdXN0IGJlIGludGVycHJldGVkIGFzICdhdXRvJy4KICAgICAvLyBUaGUgZWxlbWVudCBmcm9t IHdoaWNoIHRoZSB2YWx1ZSBpcyBwcm9wYWdhdGVkIG11c3QgaGF2ZSBhIHVzZWQgdmFsdWUgZm9y ICdvdmVyZmxvdycgb2YgJ3Zpc2libGUnLgogICAgIGlmIChpc0JvZHlCb3goKSkgewotICAgICAg ICBhdXRvJiBkb2N1bWVudEJveCA9IHBhcmVudCgpOworICAgICAgICBhdXRvJiBkb2N1bWVudEJv eCA9IGNvbnRhaW5pbmdCbG9jaygpOwogICAgICAgICBpZiAoIWRvY3VtZW50Qm94LmlzRG9jdW1l bnRCb3goKSkKICAgICAgICAgICAgIHJldHVybiBpc092ZXJmbG93VmlzaWJsZTsKICAgICAgICAg aWYgKCFkb2N1bWVudEJveC5pc092ZXJmbG93VmlzaWJsZSgpKQo=