213926 2020-07-03 08:28:17 -0700 [LFC][TFC][Quirk] Inflow child box quirk vertical margins should collapse with table cell. 2020-07-03 11:33:16 -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 1668584 0 zalan 2020-07-03 08:28:17 -0700 <table><tr><td><p>text content</p></td></tr></table> <- p's vertical margin is collapsed and then ignored. 1668586 1 403463 zalan 2020-07-03 08:51:06 -0700 Created attachment 403463 Patch 1668587 2 403463 koivisto 2020-07-03 08:56:42 -0700 Comment on attachment 403463 Patch Very quirky. 1668607 3 ews-feeder 2020-07-03 11:32:45 -0700 Committed r263902: <https://trac.webkit.org/changeset/263902> All reviewed patches have been landed. Closing bug and clearing flags on attachment 403463. 1668608 4 webkit-bug-importer 2020-07-03 11:33:16 -0700 <rdar://problem/65080754> 403463 2020-07-03 08:51:06 -0700 2020-07-03 11:32:45 -0700 Patch bug-213926-20200703085105.patch text/plain 19858 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyNDE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGE1YzhjZGJmOGMwN2Zi YTc2ZDMyMDNlMjg3NWM2NDUwMThlOTY1Yy4uYjE2MTRmYTJmZjlkOTE2NmM2YTFhZDc0NzcxYWQ4 ODMzMjQwZjM5NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDIwLTA3LTAzICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bVEZDXVtRdWlya10g SW5mbG93IGNoaWxkIGJveCBxdWlyayB2ZXJ0aWNhbCBtYXJnaW5zIHNob3VsZCBjb2xsYXBzZSB3 aXRoIHRhYmxlIGNlbGwuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMTM5MjYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBUaGUgQkZDIHJvb3RkICh0YWJsZSBjZWxsIGJveCBpbiB0aGlzIGNhc2UpIG5vcm5h bGx5IGRvIG5vdCBjb2xsYXBzZSB0aGVpciBtYXJnaW5zIHdpdGggdGhlIGZpcnN0L2xhc3QgaW5m bG93IGNoaWxkLgorICAgICAgICBIb3dldmVyIGluIHF1aXJrcyBtb2RlLCBjZWxsIGJveGVzIGNv bGxhcHNlIHRoZWlyIChub24tZXhpc3RpbmcpbWFyZ2lucyB3aXRoIGluZmxvdyBxdWlyayBtYXJn aW5zLgorCisgICAgICAgIDx0YWJsZT48dHI+PHRkPjxwPnRleHQgY29udGVudDwvdGQ+PC90cj48 L3RhYmxlPiA8LSA8cD4gYm94J3MgdG9wIHBvc2l0aW9uIGlzIGF0IDBweCBpbiBxdWlya3MgbW9k ZSwgd2hpbGUgYXQgMTZweCAoMWVtKSBpbiBzdHJpY3QgbW9kZS4KKworICAgICAgICBUaGlzIHBh dGNoIGVuc3VyZXMgdGhhdCB3ZSBjb2xsYXBzZSB0aGUgcXVpcmsgbWFyZ2lucyBhbmQgdGFrZSB0 aGVtIGludG8gYWNjb3VudCB3aGVuIGNvbXB1dGluZyB0aGUgY2VsbCdzIGNvbnRlbnQgaGVpZ2h0 LgorCisgICAgICAgIFRlc3Q6IGZhc3QvbGF5b3V0Zm9ybWF0dGluZ2NvbnRleHQvdGFibGUtcXVp cmstdmVydGljYWwtbWFyZ2luLXNpbXBsZS5odG1sCisKKyAgICAgICAgKiBTb3VyY2VzLnR4dDoK KyAgICAgICAgKiBXZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6CisgICAgICAgICog bGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkxheW91dDo6QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUhlaWdo dEFuZE1hcmdpbik6CisgICAgICAgICogbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1h dHRpbmdDb250ZXh0Lmg6CisgICAgICAgICogbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zv cm1hdHRpbmdDb250ZXh0UXVpcmtzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6Qmxv Y2tGb3JtYXR0aW5nQ29udGV4dDo6UXVpcmtzOjpzaG91bGRDb2xsYXBzZU1hcmdpbkJlZm9yZVdp dGhQYXJlbnRNYXJnaW5CZWZvcmUgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpC bG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpRdWlya3M6OnNob3VsZENvbGxhcHNlTWFyZ2luQWZ0ZXJX aXRoUGFyZW50TWFyZ2luQWZ0ZXIgY29uc3QpOgorICAgICAgICAqIGxheW91dC9ibG9ja2Zvcm1h dHRpbmcvQmxvY2tNYXJnaW5Db2xsYXBzZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6 OkJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Ok1hcmdpbkNvbGxhcHNlOjptYXJnaW5CZWZvcmVDb2xs YXBzZXNXaXRoUGFyZW50TWFyZ2luQmVmb3JlIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6Okxh eW91dDo6QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6TWFyZ2luQ29sbGFwc2U6Om1hcmdpbkFmdGVy Q29sbGFwc2VzV2l0aFBhcmVudE1hcmdpbkFmdGVyIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6 OkxheW91dDo6QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6TWFyZ2luQ29sbGFwc2U6OmNvbGxhcHNl ZFZlcnRpY2FsVmFsdWVzKToKKyAgICAgICAgKiBsYXlvdXQvdGFibGVmb3JtYXR0aW5nL1RhYmxl Rm9ybWF0dGluZ0NvbnRleHQuaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6VGFibGVGb3Jt YXR0aW5nQ29udGV4dDo6UXVpcmtzOjpRdWlya3MpOgorICAgICAgICAqIGxheW91dC90YWJsZWZv cm1hdHRpbmcvVGFibGVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkxheW91dDo6VGFibGVGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmNlbGxIZWln aCBjb25zdCk6CisgICAgICAgICogbGF5b3V0L3RhYmxlZm9ybWF0dGluZy9UYWJsZUZvcm1hdHRp bmdDb250ZXh0UXVpcmtzLmNwcDogQWRkZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OlRh YmxlRm9ybWF0dGluZ0NvbnRleHQ6OlF1aXJrczo6c2hvdWxkSWdub3JlQ2hpbGRDb250ZW50VmVy dGljYWxNYXJnaW4gY29uc3QpOgorCiAyMDIwLTA3LTAyICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBh cHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bQkZDXSBSZW1vdmUgcmVkdW5kYW50IG1hcmdpbi1i b3JkZXItcGFkZGluZyB3aGVuIGNvbXB1dGluZyB0aGUgaW50cmluc2ljIHdpZHRoCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9Tb3VyY2VzLnR4dCBiL1NvdXJjZS9XZWJDb3JlL1NvdXJjZXMu dHh0CmluZGV4IDljMmFmNzlkNWM0N2M1OTBiOTNlMGFlY2Y4Mjg0Y2NkODUwNGYwYzAuLjQ2NTU1 YWZhYmVhNGI2NGU0MjdjMzY1ZjA4ZjBjMmVkMGIzNGExODAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL1NvdXJjZXMudHh0CisrKyBiL1NvdXJjZS9XZWJDb3JlL1NvdXJjZXMudHh0CkBAIC0x NDkzLDYgKzE0OTMsNyBAQCBsYXlvdXQvbGF5b3V0dHJlZS9MYXlvdXRSZXBsYWNlZEJveC5jcHAK IGxheW91dC9sYXlvdXR0cmVlL0xheW91dFRyZWVCdWlsZGVyLmNwcAogbGF5b3V0L3RhYmxlZm9y bWF0dGluZy9UYWJsZUZvcm1hdHRpbmdDb250ZXh0LmNwcAogbGF5b3V0L3RhYmxlZm9ybWF0dGlu Zy9UYWJsZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCitsYXlvdXQvdGFibGVmb3JtYXR0 aW5nL1RhYmxlRm9ybWF0dGluZ0NvbnRleHRRdWlya3MuY3BwCiBsYXlvdXQvdGFibGVmb3JtYXR0 aW5nL1RhYmxlRm9ybWF0dGluZ1N0YXRlLmNwcAogbGF5b3V0L3RhYmxlZm9ybWF0dGluZy9UYWJs ZUdyaWQuY3BwCiBsYXlvdXQvdGFibGVmb3JtYXR0aW5nL1RhYmxlTGF5b3V0LmNwcApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qIGIv U291cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCmluZGV4IGUz ZjNmN2I1N2YzYmEyZWJiOTFiN2Q1N2U4MWJjYWRkMTA5ODdjMjIuLjA1ODMzYTk5OWY2YTcxNTAy YTA5ZTgxZTU4N2U0YmZjOTA2NzVhODIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1dlYkNv cmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagorKysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3Jl Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKQEAgLTk0NzUsNiArOTQ3NSw3IEBACiAJCTZGQjQ3 RTYxMjI3NzQyNUEwMEM3QkNCMCAvKiBEaXNwbGF5TGluZUJveC5oICovID0ge2lzYSA9IFBCWEZp bGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNl Y29kZS5jLmg7IHBhdGggPSBEaXNwbGF5TGluZUJveC5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4i OyB9OwogCQk2RkI1RTIxMjIyMUYyNDQ3MDAzOTg5Q0YgLyogQ29udGVudENoYW5nZU9ic2VydmVy LmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3Vy Y2Vjb2RlLmMuaDsgcGF0aCA9IENvbnRlbnRDaGFuZ2VPYnNlcnZlci5oOyBzb3VyY2VUcmVlID0g Ijxncm91cD4iOyB9OwogCQk2RkJCODYwNTIwQjQ2NEI2MDBEQUQ5MzggLyogRm9ybWF0dGluZ0Nv bnRleHRHZW9tZXRyeS5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgbGFzdEtub3du RmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBGb3JtYXR0aW5nQ29udGV4dEdl b21ldHJ5LmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKKwkJNkZDNTNBRUIyNEFGN0E4 RTAwNjA1OUZFIC8qIFRhYmxlRm9ybWF0dGluZ0NvbnRleHRRdWlya3MuY3BwICovID0ge2lzYSA9 IFBCWEZpbGVSZWZlcmVuY2U7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3Bw OyBwYXRoID0gVGFibGVGb3JtYXR0aW5nQ29udGV4dFF1aXJrcy5jcHA7IHNvdXJjZVRyZWUgPSAi PGdyb3VwPiI7IH07CiAJCTZGQzVDQTkyMjJFMzU5OTMwMEIxM0UxMSAvKiBUYWJsZUZvcm1hdHRp bmdTdGF0ZS5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgbGFzdEtub3duRmlsZVR5 cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBUYWJsZUZvcm1hdHRpbmdTdGF0ZS5jcHA7 IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTZGQzVDQTk0MjJFMzU5OTQwMEIxM0UxMSAv KiBUYWJsZUZvcm1hdHRpbmdDb250ZXh0LmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNl OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFRhYmxlRm9y bWF0dGluZ0NvbnRleHQuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk2RkM1Q0E5 NTIyRTM1OTk0MDBCMTNFMTEgLyogVGFibGVGb3JtYXR0aW5nQ29udGV4dC5oICovID0ge2lzYSA9 IFBCWEZpbGVSZWZlcmVuY2U7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBh dGggPSBUYWJsZUZvcm1hdHRpbmdDb250ZXh0Lmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07 CkBAIC0yMTMwNCw2ICsyMTMwNSw3IEBACiAJCQkJNkZDNUNBOTQyMkUzNTk5NDAwQjEzRTExIC8q IFRhYmxlRm9ybWF0dGluZ0NvbnRleHQuY3BwICovLAogCQkJCTZGQzVDQTk1MjJFMzU5OTQwMEIx M0UxMSAvKiBUYWJsZUZvcm1hdHRpbmdDb250ZXh0LmggKi8sCiAJCQkJMTFEMTlDMkUyMzE1OUJB RTAwOEYyNEQzIC8qIFRhYmxlRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAgKi8sCisJCQkJ NkZDNTNBRUIyNEFGN0E4RTAwNjA1OUZFIC8qIFRhYmxlRm9ybWF0dGluZ0NvbnRleHRRdWlya3Mu Y3BwICovLAogCQkJCTZGQzVDQTkyMjJFMzU5OTMwMEIxM0UxMSAvKiBUYWJsZUZvcm1hdHRpbmdT dGF0ZS5jcHAgKi8sCiAJCQkJNkZDNUNBOTYyMkUzNTk5NTAwQjEzRTExIC8qIFRhYmxlRm9ybWF0 dGluZ1N0YXRlLmggKi8sCiAJCQkJNkY1QjdFQUEyMzAwQTc5RTAwNjdEOUMzIC8qIFRhYmxlR3Jp ZC5jcHAgKi8sCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0 aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Js b2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmNwcAppbmRleCBkNzdhZjM0ZDhj YjMxNTYwOWZmY2UzZDlhNTMzYjM0OWM5MDgzMWQ5Li4xYWUwYjM1ZTJmMjUyYjUyZTFiYWI1MGFj MWEyOTk5MDM5NDI3MjcyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tm b3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5jcHAKQEAgLTM2 Myw3ICszNjMsNyBAQCB2b2lkIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVIZWlnaHRB bmRNYXJnaW4oY29uc3QgQm94JiBsYXlvdXRCb3gsIGNvbnN0CiAgICAgfQogCiAgICAgLy8gMS4g Q29tcHV0ZSBjb2xsYXBzZWQgbWFyZ2lucy4KLSAgICAvLyAyLiBBZGp1c3QgdmVydGljYWwgcG9z aXRpb24gdXNpbmcgdGhlIGNvbGxhcHNlZCB2YWx1ZXMKKyAgICAvLyAyLiBBZGp1c3QgdmVydGlj YWwgcG9zaXRpb24gdXNpbmcgdGhlIGNvbGxhcHNlZCB2YWx1ZXMuCiAgICAgLy8gMy4gQWRqdXN0 IHByZXZpb3VzIGluLWZsb3cgc2libGluZyBtYXJnaW4gYWZ0ZXIgdXNpbmcgdGhpcyBtYXJnaW4u CiAgICAgYXV0byBtYXJnaW5Db2xsYXBzZSA9IHRoaXMtPm1hcmdpbkNvbGxhcHNlKCk7CiAgICAg YXV0byBjb2xsYXBzZWRBbmRQb3NpdGl2ZU5lZ2F0aXZlVmFsdWVzID0gbWFyZ2luQ29sbGFwc2Uu Y29sbGFwc2VkVmVydGljYWxWYWx1ZXMobGF5b3V0Qm94LCBjb250ZW50SGVpZ2h0QW5kTWFyZ2lu Lm5vbkNvbGxhcHNlZE1hcmdpbik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv YmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuaCBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5oCmluZGV4IDdj ZmRlYmRkY2M5MTEwOWVkMTQ0ZmUwNTkyNmMxNmVkZTVkM2JlN2YuLjRjNmFlYWQzMDcyMjVjMzlj NDczZTUyOGVjOGM0N2VkMDJjNWJiY2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5oCkBA IC0xNTUsOCArMTU1LDggQEAgcHJvdGVjdGVkOgogICAgICAgICBMYXlvdXRVbml0IHN0cmV0Y2hl ZEluRmxvd0hlaWdodChjb25zdCBCb3gmLCBDb250ZW50SGVpZ2h0QW5kTWFyZ2luKTsKIAogICAg ICAgICBib29sIHNob3VsZElnbm9yZUNvbGxhcHNlZFF1aXJrTWFyZ2luKGNvbnN0IEJveCYpIGNv bnN0OwotICAgICAgICBib29sIHNob3VsZElnbm9yZU1hcmdpbkJlZm9yZShjb25zdCBCb3gmKSBj b25zdDsKLSAgICAgICAgYm9vbCBzaG91bGRJZ25vcmVNYXJnaW5BZnRlcihjb25zdCBCb3gmKSBj b25zdDsKKyAgICAgICAgYm9vbCBzaG91bGRDb2xsYXBzZU1hcmdpbkJlZm9yZVdpdGhQYXJlbnRN YXJnaW5CZWZvcmUoY29uc3QgQm94JikgY29uc3Q7CisgICAgICAgIGJvb2wgc2hvdWxkQ29sbGFw c2VNYXJnaW5BZnRlcldpdGhQYXJlbnRNYXJnaW5BZnRlcihjb25zdCBCb3gmKSBjb25zdDsKIAog ICAgICAgICBjb25zdCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0JiBmb3JtYXR0aW5nQ29udGV4dCgp IGNvbnN0IHsgcmV0dXJuIGRvd25jYXN0PEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ+KEZvcm1hdHRp bmdDb250ZXh0OjpRdWlya3M6OmZvcm1hdHRpbmdDb250ZXh0KCkpOyB9CiAgICAgICAgIEJsb2Nr Rm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5IGdlb21ldHJ5KCkgY29uc3QgeyByZXR1cm4gZm9y bWF0dGluZ0NvbnRleHQoKS5nZW9tZXRyeSgpOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHRRdWlya3MuY3Bw IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdD b250ZXh0UXVpcmtzLmNwcAppbmRleCAzMjU1ODgwNjAxOTZjZTlmMjY5NThkM2Y5Y2IyZDU3MzBj ZGFmYjhmLi5kNDhiMzU0MGE0ZTI4NGZiNWI4ODM1MDAxZTJkMGMyNTkwOGZlOGUyIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGlu Z0NvbnRleHRRdWlya3MuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1h dHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dFF1aXJrcy5jcHAKQEAgLTEwNCw2ICsxMDQsMTYg QEAgYm9vbCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpRdWlya3M6OnNob3VsZElnbm9yZUNvbGxh cHNlZFF1aXJrTWFyZ2luKGNvbnN0IEJveCYKICAgICByZXR1cm4gbGF5b3V0U3RhdGUoKS5pblF1 aXJrc01vZGUoKSAmJiBpc1F1aXJrQ29udGFpbmVyKGxheW91dEJveCk7CiB9CiAKK2Jvb2wgQmxv Y2tGb3JtYXR0aW5nQ29udGV4dDo6UXVpcmtzOjpzaG91bGRDb2xsYXBzZU1hcmdpbkJlZm9yZVdp dGhQYXJlbnRNYXJnaW5CZWZvcmUoY29uc3QgQm94JiBsYXlvdXRCb3gpIGNvbnN0Cit7CisgICAg cmV0dXJuIGxheW91dFN0YXRlKCkuaW5RdWlya3NNb2RlKCkgJiYgbGF5b3V0Qm94LnN0eWxlKCku aGFzTWFyZ2luQmVmb3JlUXVpcmsoKSAmJiBpc1F1aXJrQ29udGFpbmVyKGxheW91dEJveC5jb250 YWluaW5nQmxvY2soKSk7Cit9CisKK2Jvb2wgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6UXVpcmtz OjpzaG91bGRDb2xsYXBzZU1hcmdpbkFmdGVyV2l0aFBhcmVudE1hcmdpbkFmdGVyKGNvbnN0IEJv eCYgbGF5b3V0Qm94KSBjb25zdAoreworICAgIHJldHVybiBsYXlvdXRTdGF0ZSgpLmluUXVpcmtz TW9kZSgpICYmIGxheW91dEJveC5zdHlsZSgpLmhhc01hcmdpbkFmdGVyUXVpcmsoKSAmJiBpc1F1 aXJrQ29udGFpbmVyKGxheW91dEJveC5jb250YWluaW5nQmxvY2soKSk7Cit9CisKIH0KIH0KIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja01h cmdpbkNvbGxhcHNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcv QmxvY2tNYXJnaW5Db2xsYXBzZS5jcHAKaW5kZXggOWE2NTlmM2NlZTRhN2NkM2MxZjYzMjVlNTAy MmVkOGE0M2E0NjI3ZC4uMjJjZWFmYjlmY2MyY2FiMWNhYTBhMTdiMjg1ODdlZGM4ZDU5YzE1ZiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja01h cmdpbkNvbGxhcHNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0 aW5nL0Jsb2NrTWFyZ2luQ29sbGFwc2UuY3BwCkBAIC0xMTYsNiArMTE2LDkgQEAgYm9vbCBCbG9j a0Zvcm1hdHRpbmdDb250ZXh0OjpNYXJnaW5Db2xsYXBzZTo6bWFyZ2luQmVmb3JlQ29sbGFwc2Vz V2l0aFBhcmVudE1hcmcKICAgICAvLyBodHRwczovL3d3dy53My5vcmcvVFIvQ1NTMjEvYm94Lmh0 bWwjY29sbGFwc2luZy1tYXJnaW5zCiAgICAgQVNTRVJUKGxheW91dEJveC5pc0Jsb2NrTGV2ZWxC b3goKSk7CiAKKyAgICBpZiAoZm9ybWF0dGluZ0NvbnRleHQoKS5xdWlya3MoKS5zaG91bGRDb2xs YXBzZU1hcmdpbkJlZm9yZVdpdGhQYXJlbnRNYXJnaW5CZWZvcmUobGF5b3V0Qm94KSkKKyAgICAg ICAgcmV0dXJuIHRydWU7CisKICAgICAvLyBNYXJnaW5zIGJldHdlZW4gYSBmbG9hdGVkIGJveCBh bmQgYW55IG90aGVyIGJveCBkbyBub3QgY29sbGFwc2UuCiAgICAgaWYgKGxheW91dEJveC5pc0Zs b2F0aW5nUG9zaXRpb25lZCgpKQogICAgICAgICByZXR1cm4gZmFsc2U7CkBAIC0yNTEsNiArMjU0 LDkgQEAgYm9vbCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpNYXJnaW5Db2xsYXBzZTo6bWFyZ2lu QWZ0ZXJDb2xsYXBzZXNXaXRoUGFyZW50TWFyZ2kKIHsKICAgICBBU1NFUlQobGF5b3V0Qm94Lmlz QmxvY2tMZXZlbEJveCgpKTsKIAorICAgIGlmIChmb3JtYXR0aW5nQ29udGV4dCgpLnF1aXJrcygp LnNob3VsZENvbGxhcHNlTWFyZ2luQWZ0ZXJXaXRoUGFyZW50TWFyZ2luQWZ0ZXIobGF5b3V0Qm94 KSkKKyAgICAgICAgcmV0dXJuIHRydWU7CisKICAgICAvLyBNYXJnaW5zIGJldHdlZW4gYSBmbG9h dGVkIGJveCBhbmQgYW55IG90aGVyIGJveCBkbyBub3QgY29sbGFwc2UuCiAgICAgaWYgKGxheW91 dEJveC5pc0Zsb2F0aW5nUG9zaXRpb25lZCgpKQogICAgICAgICByZXR1cm4gZmFsc2U7CkBAIC01 OTIsNyArNTk4LDkgQEAgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6TWFyZ2luQ29sbGFwc2U6OkNv bGxhcHNlZEFuZFBvc2l0aXZlTmVnYXRpdmVWYWx1ZXMgQmxvY2sKICAgICAgICAgcmV0dXJuIHsg eyBtYXJnaW5WYWx1ZShwb3NpdGl2ZUFuZE5lZ2F0aXZlVmVydGljYWxNYXJnaW4uYmVmb3JlKSwg bWFyZ2luVmFsdWUocG9zaXRpdmVBbmROZWdhdGl2ZVZlcnRpY2FsTWFyZ2luLmFmdGVyKSwgbWFy Z2luc0NvbGxhcHNlVGhyb3VnaCB9LCBwb3NpdGl2ZUFuZE5lZ2F0aXZlVmVydGljYWxNYXJnaW4g fTsKICAgICBpZiAoaGFzQ29sbGFwc2VkTWFyZ2luQmVmb3JlKQogICAgICAgICByZXR1cm4geyB7 IG1hcmdpblZhbHVlKHBvc2l0aXZlQW5kTmVnYXRpdmVWZXJ0aWNhbE1hcmdpbi5iZWZvcmUpLCB7 IH0sIGZhbHNlIH0sIHBvc2l0aXZlQW5kTmVnYXRpdmVWZXJ0aWNhbE1hcmdpbiB9OwotICAgIHJl dHVybiB7IHsgeyB9LCBtYXJnaW5WYWx1ZShwb3NpdGl2ZUFuZE5lZ2F0aXZlVmVydGljYWxNYXJn aW4uYWZ0ZXIpLCBmYWxzZSB9LCBwb3NpdGl2ZUFuZE5lZ2F0aXZlVmVydGljYWxNYXJnaW4gfTsK KyAgICBpZiAoaGFzQ29sbGFwc2VkTWFyZ2luQWZ0ZXIpCisgICAgICAgIHJldHVybiB7IHsgeyB9 LCBtYXJnaW5WYWx1ZShwb3NpdGl2ZUFuZE5lZ2F0aXZlVmVydGljYWxNYXJnaW4uYWZ0ZXIpLCBm YWxzZSB9LCBwb3NpdGl2ZUFuZE5lZ2F0aXZlVmVydGljYWxNYXJnaW4gfTsKKyAgICByZXR1cm4g eyB7IHsgfSwgeyB9LCBmYWxzZSB9LCBwb3NpdGl2ZUFuZE5lZ2F0aXZlVmVydGljYWxNYXJnaW4g fTsKIH0KIAogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L3RhYmxlZm9ybWF0 dGluZy9UYWJsZUZvcm1hdHRpbmdDb250ZXh0LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvdGFi bGVmb3JtYXR0aW5nL1RhYmxlRm9ybWF0dGluZ0NvbnRleHQuaAppbmRleCBiZmQzMWY5MjA1ZDM5 OWQyNDdlOGRkMjQ5MmNmOTZlNWZiNWU2ZGFkLi4zNDcyNmE4YWZiZTRkMDg4ZDVjMDYyMTQxZTYx ZTc2NzNiYTljZmYzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvdGFibGVmb3Jt YXR0aW5nL1RhYmxlRm9ybWF0dGluZ0NvbnRleHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvdGFibGVmb3JtYXR0aW5nL1RhYmxlRm9ybWF0dGluZ0NvbnRleHQuaApAQCAtNzksNiArNzks MTggQEAgcHJpdmF0ZToKICAgICAgICAgY29uc3QgVGFibGVHcmlkJiBtX2dyaWQ7CiAgICAgfTsK ICAgICBUYWJsZUZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeSBnZW9tZXRyeSgpIGNvbnN0IHsg cmV0dXJuIEdlb21ldHJ5KCp0aGlzLCBmb3JtYXR0aW5nU3RhdGUoKS50YWJsZUdyaWQoKSk7IH0K KworICAgIGNsYXNzIFF1aXJrcyA6IHB1YmxpYyBGb3JtYXR0aW5nQ29udGV4dDo6UXVpcmtzIHsK KyAgICBwdWJsaWM6CisgICAgICAgIFF1aXJrcyhjb25zdCBUYWJsZUZvcm1hdHRpbmdDb250ZXh0 Jik7CisKKyAgICAgICAgYm9vbCBzaG91bGRJZ25vcmVDaGlsZENvbnRlbnRWZXJ0aWNhbE1hcmdp bihjb25zdCBDb250YWluZXJCb3gmKSBjb25zdDsKKworICAgICAgICBjb25zdCBUYWJsZUZvcm1h dHRpbmdDb250ZXh0JiBmb3JtYXR0aW5nQ29udGV4dCgpIGNvbnN0IHsgcmV0dXJuIGRvd25jYXN0 PFRhYmxlRm9ybWF0dGluZ0NvbnRleHQ+KEZvcm1hdHRpbmdDb250ZXh0OjpRdWlya3M6OmZvcm1h dHRpbmdDb250ZXh0KCkpOyB9CisgICAgICAgIFRhYmxlRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21l dHJ5IGdlb21ldHJ5KCkgY29uc3QgeyByZXR1cm4gZm9ybWF0dGluZ0NvbnRleHQoKS5nZW9tZXRy eSgpOyB9CisgICAgfTsKKyAgICBUYWJsZUZvcm1hdHRpbmdDb250ZXh0OjpRdWlya3MgcXVpcmtz KCkgY29uc3QgeyByZXR1cm4gUXVpcmtzKCp0aGlzKTsgfQorCiAgICAgVGFibGVGb3JtYXR0aW5n Q29udGV4dDo6VGFibGVMYXlvdXQgdGFibGVMYXlvdXQoKSBjb25zdCB7IHJldHVybiBUYWJsZUxh eW91dCgqdGhpcywgZm9ybWF0dGluZ1N0YXRlKCkudGFibGVHcmlkKCkpOyB9CiAKICAgICBJbnRy aW5zaWNXaWR0aENvbnN0cmFpbnRzIGNvbXB1dGVkSW50cmluc2ljV2lkdGhDb25zdHJhaW50cygp IG92ZXJyaWRlOwpAQCAtMTAwLDYgKzExMiwxMSBAQCBpbmxpbmUgVGFibGVGb3JtYXR0aW5nQ29u dGV4dDo6R2VvbWV0cnk6Okdlb21ldHJ5KGNvbnN0IFRhYmxlRm9ybWF0dGluZ0NvbnRleHQmCiB7 CiB9CiAKK2lubGluZSBUYWJsZUZvcm1hdHRpbmdDb250ZXh0OjpRdWlya3M6OlF1aXJrcyhjb25z dCBUYWJsZUZvcm1hdHRpbmdDb250ZXh0JiB0YWJsZUZvcm1hdHRpbmdDb250ZXh0KQorICAgIDog Rm9ybWF0dGluZ0NvbnRleHQ6OlF1aXJrcyh0YWJsZUZvcm1hdHRpbmdDb250ZXh0KQoreworfQor CiB9CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC90YWJsZWZvcm1hdHRp bmcvVGFibGVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xh eW91dC90YWJsZWZvcm1hdHRpbmcvVGFibGVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcApp bmRleCAxZDUyNjAzY2Y1M2QzN2FmZGRjZDVhNjI3ZTczYzQ1ZmE3OTFkNWNkLi5kZWExZjE2NzZi MzgzMTM2MmFmNmVjZWVhNjQ0NDdkOWQzYzg5NDUwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvdGFibGVmb3JtYXR0aW5nL1RhYmxlRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L3RhYmxlZm9ybWF0dGluZy9UYWJsZUZvcm1h dHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCkBAIC00MSw3ICs0MSwyMSBAQCBuYW1lc3BhY2UgTGF5 b3V0IHsKIExheW91dFVuaXQgVGFibGVGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmNlbGxI ZWlnaChjb25zdCBDb250YWluZXJCb3gmIGNlbGxCb3gpIGNvbnN0CiB7CiAgICAgQVNTRVJUKGNl bGxCb3guaXNJbkZsb3coKSk7Ci0gICAgcmV0dXJuIHN0ZDo6bWF4KGNvbXB1dGVkSGVpZ2h0KGNl bGxCb3gpLnZhbHVlT3IoMF9sdSksIGNvbnRlbnRIZWlnaHRGb3JGb3JtYXR0aW5nQ29udGV4dFJv b3QoY2VsbEJveCkpOworICAgIGF1dG8gY29udGVudEhlaWdodCA9IExheW91dFVuaXQgeyB9Owor ICAgIGlmIChmb3JtYXR0aW5nQ29udGV4dCgpLnF1aXJrcygpLnNob3VsZElnbm9yZUNoaWxkQ29u dGVudFZlcnRpY2FsTWFyZ2luKGNlbGxCb3gpKSB7CisgICAgICAgIEFTU0VSVChjZWxsQm94LmZp cnN0SW5GbG93Q2hpbGQoKSk7CisgICAgICAgIGF1dG8gZm9ybWF0dGluZ0NvbnRleHQgPSB0aGlz LT5mb3JtYXR0aW5nQ29udGV4dCgpOworICAgICAgICBhdXRvJiBmaXJzdEluRmxvd0NoaWxkID0g KmNlbGxCb3guZmlyc3RJbkZsb3dDaGlsZCgpOworICAgICAgICBhdXRvJiBsYXN0SW5GbG93Q2hp bGQgPSAqY2VsbEJveC5sYXN0SW5GbG93Q2hpbGQoKTsKKyAgICAgICAgYXV0byYgZmlyc3RJbkZs b3dDaGlsZEdlb21ldHJ5ID0gZm9ybWF0dGluZ0NvbnRleHQuZ2VvbWV0cnlGb3JCb3goZmlyc3RJ bkZsb3dDaGlsZCwgRXNjYXBlUmVhc29uOjpOZWVkc0dlb21ldHJ5RnJvbUVzdGFibGlzaGVkRm9y bWF0dGluZ0NvbnRleHQpOworICAgICAgICBhdXRvJiBsYXN0SW5GbG93Q2hpbGRHZW9tZXRyeSA9 IGZvcm1hdHRpbmdDb250ZXh0Lmdlb21ldHJ5Rm9yQm94KGxhc3RJbkZsb3dDaGlsZCwgRXNjYXBl UmVhc29uOjpOZWVkc0dlb21ldHJ5RnJvbUVzdGFibGlzaGVkRm9ybWF0dGluZ0NvbnRleHQpOwor CisgICAgICAgIGF1dG8gdG9wID0gZmlyc3RJbkZsb3dDaGlsZC5zdHlsZSgpLmhhc01hcmdpbkJl Zm9yZVF1aXJrKCkgPyBmaXJzdEluRmxvd0NoaWxkR2VvbWV0cnkudG9wKCkgOiBmaXJzdEluRmxv d0NoaWxkR2VvbWV0cnkucmVjdFdpdGhNYXJnaW4oKS50b3AoKTsKKyAgICAgICAgYXV0byBib3R0 b20gPSBsYXN0SW5GbG93Q2hpbGQuc3R5bGUoKS5oYXNNYXJnaW5BZnRlclF1aXJrKCkgPyBsYXN0 SW5GbG93Q2hpbGRHZW9tZXRyeS5ib3R0b20oKSA6IGxhc3RJbkZsb3dDaGlsZEdlb21ldHJ5LnJl Y3RXaXRoTWFyZ2luKCkuYm90dG9tKCk7CisgICAgICAgIGNvbnRlbnRIZWlnaHQgPSBib3R0b20g LSB0b3A7CisgICAgfSBlbHNlCisgICAgICAgIGNvbnRlbnRIZWlnaHQgPSBjb250ZW50SGVpZ2h0 Rm9yRm9ybWF0dGluZ0NvbnRleHRSb290KGNlbGxCb3gpOworICAgIHJldHVybiBzdGQ6Om1heChj b21wdXRlZEhlaWdodChjZWxsQm94KS52YWx1ZU9yKDBfbHUpLCBjb250ZW50SGVpZ2h0KTsKIH0K IAogRWRnZXMgVGFibGVGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmNvbXB1dGVkQ2VsbEJv cmRlcihjb25zdCBUYWJsZUdyaWQ6OkNlbGwmIGNlbGwpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvdGFibGVmb3JtYXR0aW5nL1RhYmxlRm9ybWF0dGluZ0NvbnRleHRR dWlya3MuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L3RhYmxlZm9ybWF0dGluZy9UYWJsZUZv cm1hdHRpbmdDb250ZXh0UXVpcmtzLmNwcApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5iNjRhNjJkZmYwNzE0YWQ2OGZh Nzg5Njg1ZmJiYjIxMzc0ZmYxNTMyCi0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L3RhYmxlZm9ybWF0dGluZy9UYWJsZUZvcm1hdHRpbmdDb250ZXh0UXVpcmtzLmNwcApA QCAtMCwwICsxLDU3IEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDIwIEFwcGxlIEluYy4gQWxs IHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJj ZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJl IHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucworICogYXJl IG1ldDoKKyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0 aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25z IGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4g YmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90 aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVy IGluIHRoZQorICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3Zp ZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAqCisgKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJ REVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05UUklCVVRPUlMgYGBBUyBJUycnCisgKiBBTkQg QU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElN SVRFRCBUTywKKyAqIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFO RCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKKyAqIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElO IE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IgSVRTIENPTlRSSUJVVE9SUworICogQkUgTElB QkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBM QVJZLCBPUgorICogQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElN SVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YKKyAqIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7 IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUworICogSU5URVJSVVBU SU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRI RVIgSU4KKyAqIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUIChJTkNMVURJTkcg TkVHTElHRU5DRSBPUiBPVEhFUldJU0UpCisgKiBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRI RSBVU0UgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GCisgKiBUSEUgUE9TU0lC SUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKworI2luY2x1ZGUgImNvbmZpZy5oIgorI2luY2x1 ZGUgIlRhYmxlRm9ybWF0dGluZ0NvbnRleHQuaCIKKworI2lmIEVOQUJMRShMQVlPVVRfRk9STUFU VElOR19DT05URVhUKQorCisjaW5jbHVkZSAiTGF5b3V0Qm94LmgiCisjaW5jbHVkZSAiTGF5b3V0 Q29udGFpbmVyQm94LmgiCisjaW5jbHVkZSAiTGF5b3V0U3RhdGUuaCIKKworbmFtZXNwYWNlIFdl YkNvcmUgeworbmFtZXNwYWNlIExheW91dCB7CisKK2Jvb2wgVGFibGVGb3JtYXR0aW5nQ29udGV4 dDo6UXVpcmtzOjpzaG91bGRJZ25vcmVDaGlsZENvbnRlbnRWZXJ0aWNhbE1hcmdpbihjb25zdCBD b250YWluZXJCb3gmIGNlbGxCb3gpIGNvbnN0Cit7CisgICAgLy8gTm9ybWFsbHkgQkZDIHJvb3Qg Y29udGVudCBoZWlnaHQgdGFrZXMgdGhlIG1hcmdpbiBib3ggb2YgdGhlIGNoaWxkIGNvbnRlbnQg YXMgdmVydGljYWwgbWFyZ2lucyBkb24ndCBjb2xsYXBzZSB3aXRoIEJGQyByb290cywKKyAgICAv LyBidXQgdGFibGUgY2VsbCBib3hlcyBkbyBjb2xsYXBzZSB0aGVpciAobm9uLWV4aXN0aW5nKSBt YXJnaW5zIHdpdGggY2hpbGQgcXVpcmsgbWFyZ2lucyAoc28gbXVjaCBxdWlyayksIHNvIGhlcmUg d2UgY2hlY2sKKyAgICAvLyBpZiB0aGUgY29udGVudCBoZWlnaHQgc2hvdWxkIGluY2x1ZGUgbWFy Z2lucyBvciBub3QuCisgICAgLy8gZS5nIDx0YWJsZT48dHI+PHRkPjxwPnRleHQgY29udGVudDwv dGQ+PC90cj48L3RhYmxlPiA8LSA8cD4ncyBxdWlyayBtYXJnaW4gY29sbGFwc2VzIHdpdGggdGhl IDx0ZD4gc28gaXRzIGNvbnRlbnQKKyAgICAvLyBoZWlnaHQgc2hvdWxkIG5vdCBpbmNsdWRlIHZl cnRpY2FsIG1hcmdpbnMuCisgICAgaWYgKCFsYXlvdXRTdGF0ZSgpLmluUXVpcmtzTW9kZSgpKQor ICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgaWYgKGNlbGxCb3guZXN0YWJsaXNoZXNJbmxpbmVG b3JtYXR0aW5nQ29udGV4dCgpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgaWYgKCFjZWxs Qm94Lmhhc0luRmxvd0NoaWxkKCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICByZXR1cm4g Y2VsbEJveC5maXJzdEluRmxvd0NoaWxkKCktPnN0eWxlKCkuaGFzTWFyZ2luQmVmb3JlUXVpcmso KSB8fCBjZWxsQm94Lmxhc3RJbkZsb3dDaGlsZCgpLT5zdHlsZSgpLmhhc01hcmdpbkFmdGVyUXVp cmsoKTsKK30KKworfQorfQorCisjZW5kaWYKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAzYTJlZTRkY2ZlZmVjOTFiNTY5Y2Ri ZDY5Y2JkZjhkMGZjNWEzZmMxLi44ZjcwNTkzOGUyY2M4ZjA3Nzg0MzdkNjlhNTRmN2I5YWI1OTRj NWEyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjAtMDctMDMgIFphbGFuIEJ1anRhcyAgPHph bGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtURkNdW1F1aXJrXSBJbmZsb3cgY2hpbGQg Ym94IHF1aXJrIHZlcnRpY2FsIG1hcmdpbnMgc2hvdWxkIGNvbGxhcHNlIHdpdGggdGFibGUgY2Vs bC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMzky NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogZmFz dC9sYXlvdXRmb3JtYXR0aW5nY29udGV4dC90YWJsZS1xdWlyay12ZXJ0aWNhbC1tYXJnaW4tc2lt cGxlLWV4cGVjdGVkLmh0bWw6IEFkZGVkLgorICAgICAgICAqIGZhc3QvbGF5b3V0Zm9ybWF0dGlu Z2NvbnRleHQvdGFibGUtcXVpcmstdmVydGljYWwtbWFyZ2luLXNpbXBsZS5odG1sOiBBZGRlZC4K KwogMjAyMC0wNy0wMiAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAg IFtMRkNdW0JGQ10gUmVtb3ZlIHJlZHVuZGFudCBtYXJnaW4tYm9yZGVyLXBhZGRpbmcgd2hlbiBj b21wdXRpbmcgdGhlIGludHJpbnNpYyB3aWR0aApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFz dC9sYXlvdXRmb3JtYXR0aW5nY29udGV4dC90YWJsZS1xdWlyay12ZXJ0aWNhbC1tYXJnaW4tc2lt cGxlLWV4cGVjdGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2xheW91dGZvcm1hdHRpbmdjb250 ZXh0L3RhYmxlLXF1aXJrLXZlcnRpY2FsLW1hcmdpbi1zaW1wbGUtZXhwZWN0ZWQuaHRtbApuZXcg ZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwLi4yYzI0Y2M5YjhmODM3N2U4ZjJmZTRlNzA5NzhiYjVhMDNmN2ExMjMzCi0tLSAvZGV2 L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9sYXlvdXRmb3JtYXR0aW5nY29udGV4dC90YWJs ZS1xdWlyay12ZXJ0aWNhbC1tYXJnaW4tc2ltcGxlLWV4cGVjdGVkLmh0bWwKQEAgLTAsMCArMSwx OCBAQAorPCFET0NUWVBFIGh0bWw+PCEtLSB3ZWJraXQtdGVzdC1ydW5uZXIgWyBpbnRlcm5hbDpM YXlvdXRGb3JtYXR0aW5nQ29udGV4dEVuYWJsZWQ9dHJ1ZSBpbnRlcm5hbDpMYXlvdXRGb3JtYXR0 aW5nQ29udGV4dEludGVncmF0aW9uRW5hYmxlZD1mYWxzZSBdIC0tPgorPHN0eWxlPgorLmZpcnN0 IHsKKyAgICB3aWR0aDogMTAwcHg7CisgICAgaGVpZ2h0OiAyMDBweDsKKyAgICBiYWNrZ3JvdW5k LWNvbG9yOiBncmVlbjsKK30KKworLnNlY29uZCB7CisgICAgd2lkdGg6IDEwMHB4OworICAgIGhl aWdodDogNjBweDsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiBibHVlOworICAgIHBvc2l0aW9uOiBy ZWxhdGl2ZTsKKyAgICB0b3A6IC04MHB4OworfQorPC9zdHlsZT4KKzxkaXYgY2xhc3M9Zmlyc3Q+ PC9kaXY+Cis8ZGl2IGNsYXNzPXNlY29uZD48L2Rpdj4KXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBm aWxlCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2xheW91dGZvcm1hdHRpbmdjb250ZXh0 L3RhYmxlLXF1aXJrLXZlcnRpY2FsLW1hcmdpbi1zaW1wbGUuaHRtbCBiL0xheW91dFRlc3RzL2Zh c3QvbGF5b3V0Zm9ybWF0dGluZ2NvbnRleHQvdGFibGUtcXVpcmstdmVydGljYWwtbWFyZ2luLXNp bXBsZS5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAuLjc1NTkwOTQ3MmU1NmM4ODU4ODMwNWQyMzYzMDY0NmZmZjQx YWNhYWQKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2xheW91dGZvcm1hdHRp bmdjb250ZXh0L3RhYmxlLXF1aXJrLXZlcnRpY2FsLW1hcmdpbi1zaW1wbGUuaHRtbApAQCAtMCww ICsxLDMwIEBACis8IS0tIHdlYmtpdC10ZXN0LXJ1bm5lciBbIGludGVybmFsOkxheW91dEZvcm1h dHRpbmdDb250ZXh0RW5hYmxlZD10cnVlIGludGVybmFsOkxheW91dEZvcm1hdHRpbmdDb250ZXh0 SW50ZWdyYXRpb25FbmFibGVkPWZhbHNlIF0gLS0+Cis8c3R5bGU+Cit0YWJsZSB7CisgICAgd2lk dGg6IDEwMHB4OworICAgIGZvbnQtc2l6ZTogMTBweDsKKyAgICBib3JkZXItc3BhY2luZzogMHB4 OworfQorCitwIHsKKyAgICBoZWlnaHQ6IDUwcHg7CisgICAgY29sb3I6IGdyZWVuOworfQorCit0 ZCB7CisgICAgcGFkZGluZzogMHB4OworICAgIGJhY2tncm91bmQtY29sb3I6IGdyZWVuOworfQor CitkaXYgeworICAgIG1hcmdpbi10b3A6IDIwcHg7CisgICAgbWFyZ2luLWJvdHRvbTogMjBweDsK KyAgICBiYWNrZ3JvdW5kLWNvbG9yOiBibHVlOworICAgIGNvbG9yOiBibHVlOworICAgIHdpZHRo OiAxMDBweDsKKyAgICBoZWlnaHQ6IDYwcHg7Cit9Cis8L3N0eWxlPgorCis8dGFibGU+PHRyPjx0 ZD48cD5jb2xsYXBzZSBxdWlyayBtYXJnaW5zPC90ZD48L3RyPjwvdGFibGU+Cis8dGFibGU+PHRy Pjx0ZD48cD5jb2xsYXBzZSBxdWlyayBtYXJnaW5zIG9ubHkgd2l0aCB0aGUgY2VsbDxkaXY+PC9k aXY+PC90ZD48L3RyPjwvdGFibGU+Cg==