205937 2020-01-08 10:11:10 -0800 [LFC] FormattingContext::layoutInFlowContent should take UsedVerticalValues::Constraints 2020-01-09 10:14: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 1604141 0 zalan 2020-01-08 10:11:10 -0800 ssia 1604142 1 webkit-bug-importer 2020-01-08 10:11:29 -0800 <rdar://problem/58412170> 1604144 2 387111 zalan 2020-01-08 10:14:05 -0800 Created attachment 387111 Patch 1604690 3 zalan 2020-01-09 10:14:39 -0800 Committed r254269: <https://trac.webkit.org/changeset/254269> 387111 2020-01-08 10:14:05 -0800 2020-01-08 10:27:39 -0800 Patch bug-205937-20200108101404.patch text/plain 15199 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjU0MTg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDg0ZGVlNTUyNzdmMDBh MjQ2MTk5M2Y4NTNhY2Q3MDIzM2RhNDA5NS4uMDZhZTczY2IyMGYzZTBiNmI4M2MxZDk2OTgwNjFj MWJhYjFiMmE2ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDIwLTAxLTA4ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ10gRm9ybWF0dGluZ0Nv bnRleHQ6OmxheW91dEluRmxvd0NvbnRlbnQgc2hvdWxkIHRha2UgVXNlZFZlcnRpY2FsVmFsdWVz OjpDb25zdHJhaW50cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjA1OTM3CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81ODQxMjE3MD4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGlzIGluIHByZXBh cmF0aW9uIGZvciBub3QgbmVlZGluZyB0byBxdWVyeSB0aGUgY29udGFpbmluZyBibG9jayBmb3Ig Y29uc3RyYWludCBpbmZvcm1hdGlvbi4KKworICAgICAgICAqIGxheW91dC9Gb3JtYXR0aW5nQ29u dGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkZvcm1hdHRpbmdDb250ZXh0Ojps YXlvdXRPdXRPZkZsb3dDb250ZW50KToKKyAgICAgICAgKiBsYXlvdXQvRm9ybWF0dGluZ0NvbnRl eHQuaDoKKyAgICAgICAgKiBsYXlvdXQvTGF5b3V0Q29udGV4dC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpMYXlvdXQ6OkxheW91dENvbnRleHQ6OmxheW91dEZvcm1hdHRpbmdDb250ZXh0U3VidHJl ZSk6CisgICAgICAgICogbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250 ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6QmxvY2tGb3JtYXR0aW5nQ29udGV4 dDo6bGF5b3V0SW5GbG93Q29udGVudCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJsb2Nr Rm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dEZvcm1hdHRpbmdDb250ZXh0Um9vdCk6CisgICAgICAg ICogbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0Lmg6CisgICAg ICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6bGF5 b3V0SW5GbG93Q29udGVudCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUZvcm1h dHRpbmdDb250ZXh0OjpsYXlvdXRGb3JtYXR0aW5nQ29udGV4dFJvb3QpOgorICAgICAgICAqIGxh eW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0Lmg6CisgICAgICAg ICogbGF5b3V0L3RhYmxlZm9ybWF0dGluZy9UYWJsZUZvcm1hdHRpbmdDb250ZXh0LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkxheW91dDo6VGFibGVGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0SW5G bG93Q29udGVudCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OlRhYmxlRm9ybWF0dGluZ0Nv bnRleHQ6OmxheW91dFRhYmxlQ2VsbEJveCk6CisgICAgICAgICogbGF5b3V0L3RhYmxlZm9ybWF0 dGluZy9UYWJsZUZvcm1hdHRpbmdDb250ZXh0Lmg6CisKIDIwMjAtMDEtMDggIFphbGFuIEJ1anRh cyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtCRkNdIFN0YXJ0IHBhc3Npbmcg aW4gdmVydGljYWwgY29uc3RyYWludHMgdG8gY29tcHV0ZSogZnVuY3Rpb25zCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHQuY3BwIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0LmNwcAppbmRleCA3ZWY3NDNlOTliMTFmM2Ux NWQwZjRhZWY0ZjE1OTkzZWM5M2U4NmY3Li44MzI4NDEyZmE3MDVkNmU4OTU3NWQzNDNjOTE1YmZl YTQ4YmJjNDNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0Nv bnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dC5j cHAKQEAgLTE3MCw3ICsxNzAsNyBAQCB2b2lkIEZvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXRPdXRP ZkZsb3dDb250ZW50KEludmFsaWRhdGlvblN0YXRlJiBpbnZhbGlkYXRpb25TdAogICAgICAgICBp ZiAoaXM8Q29udGFpbmVyPigqb3V0T2ZGbG93Qm94KSkgewogICAgICAgICAgICAgYXV0byYgb3V0 T2ZGbG93Um9vdENvbnRhaW5lciA9IGRvd25jYXN0PENvbnRhaW5lcj4oKm91dE9mRmxvd0JveCk7 CiAgICAgICAgICAgICBhdXRvIGZvcm1hdHRpbmdDb250ZXh0ID0gTGF5b3V0Q29udGV4dDo6Y3Jl YXRlRm9ybWF0dGluZ0NvbnRleHQob3V0T2ZGbG93Um9vdENvbnRhaW5lciwgbGF5b3V0U3RhdGUo KSk7Ci0gICAgICAgICAgICBmb3JtYXR0aW5nQ29udGV4dC0+bGF5b3V0SW5GbG93Q29udGVudChp bnZhbGlkYXRpb25TdGF0ZSwgR2VvbWV0cnk6Omhvcml6b250YWxDb25zdHJhaW50c0ZvckluRmxv dyhvdXRPZkZsb3dSb290RGlzcGxheUJveCkpOworICAgICAgICAgICAgZm9ybWF0dGluZ0NvbnRl eHQtPmxheW91dEluRmxvd0NvbnRlbnQoaW52YWxpZGF0aW9uU3RhdGUsIEdlb21ldHJ5Ojpob3Jp em9udGFsQ29uc3RyYWludHNGb3JJbkZsb3cob3V0T2ZGbG93Um9vdERpc3BsYXlCb3gpLCBHZW9t ZXRyeTo6dmVydGljYWxDb25zdHJhaW50c0ZvckluRmxvdyhvdXRPZkZsb3dSb290RGlzcGxheUJv eCkpOwogICAgICAgICAgICAgY29tcHV0ZU91dE9mRmxvd1ZlcnRpY2FsR2VvbWV0cnkob3V0T2ZG bG93Um9vdENvbnRhaW5lciwgaG9yaXpvbnRhbENvbnN0cmFpbnRzLCB2ZXJ0aWNhbENvbnN0cmFp bnRzKTsKIAogICAgICAgICAgICAgZm9ybWF0dGluZ0NvbnRleHQtPmxheW91dE91dE9mRmxvd0Nv bnRlbnQoaW52YWxpZGF0aW9uU3RhdGUsIEdlb21ldHJ5Ojpob3Jpem9udGFsQ29uc3RyYWludHNG b3JJbkZsb3cob3V0T2ZGbG93Um9vdERpc3BsYXlCb3gpLCBHZW9tZXRyeTo6dmVydGljYWxDb25z dHJhaW50c0ZvckluRmxvdyhvdXRPZkZsb3dSb290RGlzcGxheUJveCkpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0LmggYi9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHQuaAppbmRleCA3MmIwY2FlMzMwMTU2YmY1OTNiZjUx NGYzYzBkYzhlZjMxOGE1MmI1Li5lMzM3MmNkZTNkZDNjNGIxMWRkMTI4Njg4NTNkYWY1NWU1NWQ1 NWQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHQu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHQuaApAQCAtNjQs NyArNjQsNyBAQCBwdWJsaWM6CiAgICAgRm9ybWF0dGluZ0NvbnRleHQoY29uc3QgQ29udGFpbmVy JiBmb3JtYXR0aW5nQ29udGV4dFJvb3QsIEZvcm1hdHRpbmdTdGF0ZSYpOwogICAgIHZpcnR1YWwg fkZvcm1hdHRpbmdDb250ZXh0KCk7CiAKLSAgICB2aXJ0dWFsIHZvaWQgbGF5b3V0SW5GbG93Q29u dGVudChJbnZhbGlkYXRpb25TdGF0ZSYsIGNvbnN0IFVzZWRIb3Jpem9udGFsVmFsdWVzOjpDb25z dHJhaW50cyYpID0gMDsKKyAgICB2aXJ0dWFsIHZvaWQgbGF5b3V0SW5GbG93Q29udGVudChJbnZh bGlkYXRpb25TdGF0ZSYsIGNvbnN0IFVzZWRIb3Jpem9udGFsVmFsdWVzOjpDb25zdHJhaW50cyYs IGNvbnN0IFVzZWRWZXJ0aWNhbFZhbHVlczo6Q29uc3RyYWludHMmKSA9IDA7CiAgICAgdm9pZCBs YXlvdXRPdXRPZkZsb3dDb250ZW50KEludmFsaWRhdGlvblN0YXRlJiwgY29uc3QgVXNlZEhvcml6 b250YWxWYWx1ZXM6OkNvbnN0cmFpbnRzJiwgY29uc3QgVXNlZFZlcnRpY2FsVmFsdWVzOjpDb25z dHJhaW50cyYpOwogCiAgICAgc3RydWN0IEludHJpbnNpY1dpZHRoQ29uc3RyYWludHMgewpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L0xheW91dENvbnRleHQuY3BwIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L0xheW91dENvbnRleHQuY3BwCmluZGV4IDEyMzhlOWIzMzM2YjZkOGY0 YTVlYzMwODZhNzNjNGIzNGY1NWFlYTUuLmFiYzIyMzEwZWMzODI5MmNhNDM1NmQyYjgyZDAxNjM3 OWE5YzA5M2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9MYXlvdXRDb250ZXh0 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvTGF5b3V0Q29udGV4dC5jcHAKQEAgLTk1 LDcgKzk1LDkgQEAgdm9pZCBMYXlvdXRDb250ZXh0OjpsYXlvdXRGb3JtYXR0aW5nQ29udGV4dFN1 YnRyZWUoY29uc3QgQ29udGFpbmVyJiBmb3JtYXR0aW5nQ28KICAgICBhdXRvIGZvcm1hdHRpbmdD b250ZXh0ID0gY3JlYXRlRm9ybWF0dGluZ0NvbnRleHQoZm9ybWF0dGluZ0NvbnRleHRSb290LCBs YXlvdXRTdGF0ZSgpKTsKICAgICBhdXRvJiBkaXNwbGF5Qm94ID0gbGF5b3V0U3RhdGUoKS5kaXNw bGF5Qm94Rm9yTGF5b3V0Qm94KGZvcm1hdHRpbmdDb250ZXh0Um9vdCk7CiAKLSAgICBmb3JtYXR0 aW5nQ29udGV4dC0+bGF5b3V0SW5GbG93Q29udGVudChpbnZhbGlkYXRpb25TdGF0ZSwgVXNlZEhv cml6b250YWxWYWx1ZXM6OkNvbnN0cmFpbnRzIHsgZGlzcGxheUJveC5jb250ZW50Qm94TGVmdCgp LCBkaXNwbGF5Qm94LmNvbnRlbnRCb3hXaWR0aCgpIH0pOworICAgIGF1dG8gaG9yaXpvbnRhbENv bnN0cmFpbnRzID0gVXNlZEhvcml6b250YWxWYWx1ZXM6OkNvbnN0cmFpbnRzIHsgZGlzcGxheUJv eC5jb250ZW50Qm94TGVmdCgpLCBkaXNwbGF5Qm94LmNvbnRlbnRCb3hXaWR0aCgpIH07CisgICAg YXV0byB2ZXJ0aWNhbENvbnN0cmFpbnRzID0gVXNlZFZlcnRpY2FsVmFsdWVzOjpDb25zdHJhaW50 cyB7IGRpc3BsYXlCb3guY29udGVudEJveFRvcCgpLCB7IH0gfTsKKyAgICBmb3JtYXR0aW5nQ29u dGV4dC0+bGF5b3V0SW5GbG93Q29udGVudChpbnZhbGlkYXRpb25TdGF0ZSwgaG9yaXpvbnRhbENv bnN0cmFpbnRzLCB2ZXJ0aWNhbENvbnN0cmFpbnRzKTsKIAogICAgIC8vIEZJWE1FOiBsYXlvdXRG b3JtYXR0aW5nQ29udGV4dFN1YnRyZWUoKSBkb2VzIG5vdCBwZXJmb3JtIGxheW91dCBvbiB0aGUg cm9vdCwgcmF0aGVyIGl0IGxheXMgb3V0IHRoZSByb290J3MgY29udGVudC4KICAgICAvLyBJdCBj b25zdHJ1Y3RzIGFuIEZDIGZvciBkZXNjZW5kYW50IGJveGVzIGFuZCBydW5zIGxheW91dCBvbiB0 aGVtLiBUaGUgZm9ybWF0dGluZ0NvbnRleHRSb290IGlzIGxhaWVkIG91dCBpbiB0aGUgRkMgaW4g d2hpY2ggaXQgbGl2ZXMgKHBhcmVudCBmb3JtYXR0aW5nIGNvbnRleHQpLgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250 ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3Jt YXR0aW5nQ29udGV4dC5jcHAKaW5kZXggYzAxODBmYmI0OTAzYTc3OTg0MzlkMjUyYjNlYWE2NDVi NzFjZmM2NS4uZDgzZGM5Y2ViMTFjYTI4N2NjYzlhMGE5NTc5YzEwZjM3ZDg5MDRkMiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRp bmdDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5n L0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwCkBAIC01Miw3ICs1Miw3IEBAIEJsb2NrRm9ybWF0 dGluZ0NvbnRleHQ6OkJsb2NrRm9ybWF0dGluZ0NvbnRleHQoY29uc3QgQ29udGFpbmVyJiBmb3Jt YXR0aW5nQ29udGV4CiB9CiAKIGVudW0gY2xhc3MgTGF5b3V0RGlyZWN0aW9uIHsgQ2hpbGQsIFNp YmxpbmcgfTsKLXZvaWQgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0SW5GbG93Q29udGVu dChJbnZhbGlkYXRpb25TdGF0ZSYgaW52YWxpZGF0aW9uU3RhdGUsIGNvbnN0IFVzZWRIb3Jpem9u dGFsVmFsdWVzOjpDb25zdHJhaW50cyYgcm9vdEhvcml6b250YWxDb25zdHJhaW50cykKK3ZvaWQg QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0SW5GbG93Q29udGVudChJbnZhbGlkYXRpb25T dGF0ZSYgaW52YWxpZGF0aW9uU3RhdGUsIGNvbnN0IFVzZWRIb3Jpem9udGFsVmFsdWVzOjpDb25z dHJhaW50cyYgcm9vdEhvcml6b250YWxDb25zdHJhaW50cywgY29uc3QgVXNlZFZlcnRpY2FsVmFs dWVzOjpDb25zdHJhaW50cyYgcm9vdFZlcnRpY2FsQ29uc3RyYWludHMpCiB7CiAgICAgLy8gOS40 LjEgQmxvY2sgZm9ybWF0dGluZyBjb250ZXh0cwogICAgIC8vIEluIGEgYmxvY2sgZm9ybWF0dGlu ZyBjb250ZXh0LCBib3hlcyBhcmUgbGFpZCBvdXQgb25lIGFmdGVyIHRoZSBvdGhlciwgdmVydGlj YWxseSwgYmVnaW5uaW5nIGF0IHRoZSB0b3Agb2YgYSBjb250YWluaW5nIGJsb2NrLgpAQCAtOTgs NiArOTgsMTAgQEAgdm9pZCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXRJbkZsb3dDb250 ZW50KEludmFsaWRhdGlvblN0YXRlJiBpbnZhbGlkYXRpb24KICAgICB9OwogCiAgICAgYXV0byB2 ZXJ0aWNhbENvbnN0cmFpbnRzRm9yTGF5b3V0Qm94ID0gWyZdIChjb25zdCBhdXRvJiBsYXlvdXRC b3gpIHsKKyAgICAgICAgYXV0byogY29udGFpbmluZ0Jsb2NrID0gbGF5b3V0Qm94LmNvbnRhaW5p bmdCbG9jaygpOworICAgICAgICBBU1NFUlQoY29udGFpbmluZ0Jsb2NrKTsKKyAgICAgICAgaWYg KGNvbnRhaW5pbmdCbG9jayA9PSAmZm9ybWF0dGluZ1Jvb3QpCisgICAgICAgICAgICByZXR1cm4g cm9vdFZlcnRpY2FsQ29uc3RyYWludHM7CiAgICAgICAgIHJldHVybiBHZW9tZXRyeTo6dmVydGlj YWxDb25zdHJhaW50c0ZvckluRmxvdyhnZW9tZXRyeUZvckJveCgqbGF5b3V0Qm94LmNvbnRhaW5p bmdCbG9jaygpKSk7CiAgICAgfTsKICAgICAvLyBUaGlzIGlzIGEgcG9zdC1vcmRlciB0cmVlIHRy YXZlcnNhbCBsYXlvdXQuCkBAIC0yMDMsNyArMjA3LDcgQEAgdm9pZCBCbG9ja0Zvcm1hdHRpbmdD b250ZXh0OjpsYXlvdXRGb3JtYXR0aW5nQ29udGV4dFJvb3QoY29uc3QgQm94JiBsYXlvdXRCb3gs IEYKICAgICAgICAgYXV0byYgcm9vdENvbnRhaW5lciA9IGRvd25jYXN0PENvbnRhaW5lcj4obGF5 b3V0Qm94KTsKICAgICAgICAgYXV0byYgcm9vdENvbnRhaW5lckRpc3BsYXlCb3ggPSBnZW9tZXRy eUZvckJveChyb290Q29udGFpbmVyKTsKICAgICAgICAgYXV0byBmb3JtYXR0aW5nQ29udGV4dCA9 IExheW91dENvbnRleHQ6OmNyZWF0ZUZvcm1hdHRpbmdDb250ZXh0KHJvb3RDb250YWluZXIsIGxh eW91dFN0YXRlKCkpOwotICAgICAgICBmb3JtYXR0aW5nQ29udGV4dC0+bGF5b3V0SW5GbG93Q29u dGVudChpbnZhbGlkYXRpb25TdGF0ZSwgR2VvbWV0cnk6Omhvcml6b250YWxDb25zdHJhaW50c0Zv ckluRmxvdyhyb290Q29udGFpbmVyRGlzcGxheUJveCkpOworICAgICAgICBmb3JtYXR0aW5nQ29u dGV4dC0+bGF5b3V0SW5GbG93Q29udGVudChpbnZhbGlkYXRpb25TdGF0ZSwgR2VvbWV0cnk6Omhv cml6b250YWxDb25zdHJhaW50c0ZvckluRmxvdyhyb290Q29udGFpbmVyRGlzcGxheUJveCksIEdl b21ldHJ5Ojp2ZXJ0aWNhbENvbnN0cmFpbnRzRm9ySW5GbG93KHJvb3RDb250YWluZXJEaXNwbGF5 Qm94KSk7CiAgICAgICAgIC8vIENvbWUgYmFjayBhbmQgZmluYWxpemUgdGhlIHJvb3QncyBnZW9t ZXRyeS4KICAgICAgICAgY29tcHV0ZUhlaWdodEFuZE1hcmdpbihyb290Q29udGFpbmVyLCBhZGp1 c3RlZEhvcml6b250YWxDb25zdHJhaW50cywgdmVydGljYWxDb25zdHJhaW50cyk7CiAgICAgICAg IC8vIE5vdyB0aGF0IHdlIGNvbXB1dGVkIHRoZSByb290J3MgaGVpZ2h0LCB3ZSBjYW4gZ28gYmFj ayBhbmQgbGF5b3V0IHRoZSBvdXQtb2YtZmxvdyBjb250ZW50LgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0Lmgg Yi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0Nv bnRleHQuaAppbmRleCA2MTU0NTlkZDJkOTIwZjdhNWUwN2RlNzVlN2I1YjQ5MzRhMmU5MjU5Li5m OWQ5MzFkMTcxZDc4MTUxMTNlYzA3MTZiYTc1MmQ1MmQ0ODc2NTQzIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0 dGluZ0NvbnRleHQuaApAQCAtNDgsNyArNDgsNyBAQCBjbGFzcyBCbG9ja0Zvcm1hdHRpbmdDb250 ZXh0IDogcHVibGljIEZvcm1hdHRpbmdDb250ZXh0IHsKIHB1YmxpYzoKICAgICBCbG9ja0Zvcm1h dHRpbmdDb250ZXh0KGNvbnN0IENvbnRhaW5lciYgZm9ybWF0dGluZ0NvbnRleHRSb290LCBCbG9j a0Zvcm1hdHRpbmdTdGF0ZSYpOwogCi0gICAgdm9pZCBsYXlvdXRJbkZsb3dDb250ZW50KEludmFs aWRhdGlvblN0YXRlJiwgY29uc3QgVXNlZEhvcml6b250YWxWYWx1ZXM6OkNvbnN0cmFpbnRzJikg b3ZlcnJpZGU7CisgICAgdm9pZCBsYXlvdXRJbkZsb3dDb250ZW50KEludmFsaWRhdGlvblN0YXRl JiwgY29uc3QgVXNlZEhvcml6b250YWxWYWx1ZXM6OkNvbnN0cmFpbnRzJiwgY29uc3QgVXNlZFZl cnRpY2FsVmFsdWVzOjpDb25zdHJhaW50cyYpIG92ZXJyaWRlOwogCiBwcml2YXRlOgogICAgIHZv aWQgbGF5b3V0Rm9ybWF0dGluZ0NvbnRleHRSb290KGNvbnN0IEJveCYsIEZsb2F0aW5nQ29udGV4 dCYsIEludmFsaWRhdGlvblN0YXRlJiwgY29uc3QgVXNlZEhvcml6b250YWxWYWx1ZXM6OkNvbnN0 cmFpbnRzJiwgY29uc3QgVXNlZFZlcnRpY2FsVmFsdWVzOjpDb25zdHJhaW50cyYpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0 dGluZ0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcv SW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwCmluZGV4IDVjNjRkNzY1ZjA5Y2Y1MTk4MzFmZjNl NGJhYWU1M2Q4YTUxNDk0MzUuLjI0MjExYjc3OTQ5OTNkMWUxNjkxYWQyMmM0OTZlYzFlOWNlNjY4 NDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lu bGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5s aW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKQEAgLTY0LDcgKzY0LDcg QEAgc3RhdGljIGlubGluZSBjb25zdCBCb3gqIG5leHRJblByZU9yZGVyKGNvbnN0IEJveCYgbGF5 b3V0Qm94LCBjb25zdCBDb250YWluZXImIHMKICAgICByZXR1cm4gbnVsbHB0cjsKIH0KIAotdm9p ZCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0SW5GbG93Q29udGVudChJbnZhbGlkYXRp b25TdGF0ZSYgaW52YWxpZGF0aW9uU3RhdGUsIGNvbnN0IFVzZWRIb3Jpem9udGFsVmFsdWVzOjpD b25zdHJhaW50cyYgaG9yaXp0b25hbENvbnN0cmFpbnRzKQordm9pZCBJbmxpbmVGb3JtYXR0aW5n Q29udGV4dDo6bGF5b3V0SW5GbG93Q29udGVudChJbnZhbGlkYXRpb25TdGF0ZSYgaW52YWxpZGF0 aW9uU3RhdGUsIGNvbnN0IFVzZWRIb3Jpem9udGFsVmFsdWVzOjpDb25zdHJhaW50cyYgaG9yaXp0 b25hbENvbnN0cmFpbnRzLCBjb25zdCBVc2VkVmVydGljYWxWYWx1ZXM6OkNvbnN0cmFpbnRzJiB2 ZXJ0aWNhbENvbnN0cmFpbnRzKQogewogICAgIGlmICghcm9vdCgpLmhhc0luRmxvd09yRmxvYXRp bmdDaGlsZCgpKQogICAgICAgICByZXR1cm47CkBAIC03Miw3ICs3Miw3IEBAIHZvaWQgSW5saW5l Rm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dEluRmxvd0NvbnRlbnQoSW52YWxpZGF0aW9uU3RhdGUm IGludmFsaWRhdGlvCiAgICAgaW52YWxpZGF0ZUZvcm1hdHRpbmdTdGF0ZShpbnZhbGlkYXRpb25T dGF0ZSk7CiAgICAgTE9HX1dJVEhfU1RSRUFNKEZvcm1hdHRpbmdDb250ZXh0TGF5b3V0LCBzdHJl YW0gPDwgIltTdGFydF0gLT4gaW5saW5lIGZvcm1hdHRpbmcgY29udGV4dCAtPiBmb3JtYXR0aW5n IHJvb3QoIiA8PCAmcm9vdCgpIDw8ICIpIik7CiAgICAgYXV0byB1c2VkSG9yaXpvbnRhbFZhbHVl cyA9IFVzZWRIb3Jpem9udGFsVmFsdWVzIHsgaG9yaXp0b25hbENvbnN0cmFpbnRzIH07Ci0gICAg YXV0byB1c2VkVmVydGljYWxWYWx1ZXMgPSBVc2VkVmVydGljYWxWYWx1ZXMgeyBVc2VkVmVydGlj YWxWYWx1ZXM6OkNvbnN0cmFpbnRzIHsgZ2VvbWV0cnlGb3JCb3gocm9vdCgpKS5jb250ZW50Qm94 VG9wKCkgfSB9OworICAgIGF1dG8gdXNlZFZlcnRpY2FsVmFsdWVzID0gVXNlZFZlcnRpY2FsVmFs dWVzIHsgdmVydGljYWxDb25zdHJhaW50cyB9OwogICAgIGF1dG8qIGxheW91dEJveCA9IHJvb3Qo KS5maXJzdEluRmxvd09yRmxvYXRpbmdDaGlsZCgpOwogICAgIC8vIDEuIFZpc2l0IGVhY2ggaW5s aW5lIGJveCBhbmQgcGFydGlhbGx5IGNvbXB1dGUgdGhlaXIgZ2VvbWV0cnkgKG1hcmdpbnMsIHBh ZGRpbmdzIGFuZCBib3JkZXJzKS4KICAgICAvLyAyLiBDb2xsZWN0IHRoZSBpbmxpbmUgaXRlbXMg KGZsYXR0ZW4gdGhlIHRoZSBsYXlvdXQgdHJlZSkgYW5kIHBsYWNlIHRoZW0gb24gbGluZXMgaW4g YmlkaXJlY3Rpb25hbCBvcmRlci4gCkBAIC0xMzksNyArMTM5LDcgQEAgdm9pZCBJbmxpbmVGb3Jt YXR0aW5nQ29udGV4dDo6bGF5b3V0Rm9ybWF0dGluZ0NvbnRleHRSb290KGNvbnN0IEJveCYgZm9y bWF0dGluZ0MKICAgICBpZiAoaXM8Q29udGFpbmVyPihmb3JtYXR0aW5nQ29udGV4dFJvb3QpKSB7 CiAgICAgICAgIGF1dG8mIHJvb3RDb250YWluZXIgPSBkb3duY2FzdDxDb250YWluZXI+KGZvcm1h dHRpbmdDb250ZXh0Um9vdCk7CiAgICAgICAgIGF1dG8gZm9ybWF0dGluZ0NvbnRleHQgPSBMYXlv dXRDb250ZXh0OjpjcmVhdGVGb3JtYXR0aW5nQ29udGV4dChyb290Q29udGFpbmVyLCBsYXlvdXRT dGF0ZSgpKTsKLSAgICAgICAgZm9ybWF0dGluZ0NvbnRleHQtPmxheW91dEluRmxvd0NvbnRlbnQo aW52YWxpZGF0aW9uU3RhdGUsIHVzZWRIb3Jpem9udGFsVmFsdWVzLmNvbnN0cmFpbnRzKTsKKyAg ICAgICAgZm9ybWF0dGluZ0NvbnRleHQtPmxheW91dEluRmxvd0NvbnRlbnQoaW52YWxpZGF0aW9u U3RhdGUsIHVzZWRIb3Jpem9udGFsVmFsdWVzLmNvbnN0cmFpbnRzLCB1c2VkVmVydGljYWxWYWx1 ZXMuY29uc3RyYWludHMpOwogICAgICAgICAvLyBDb21lIGJhY2sgYW5kIGZpbmFsaXplIHRoZSBy b290J3MgaGVpZ2h0IGFuZCBtYXJnaW4uCiAgICAgICAgIGNvbXB1dGVIZWlnaHRBbmRNYXJnaW4o cm9vdENvbnRhaW5lciwgdXNlZEhvcml6b250YWxWYWx1ZXMsIHVzZWRWZXJ0aWNhbFZhbHVlcyk7 CiAgICAgICAgIC8vIE5vdyB0aGF0IHdlIGNvbXB1dGVkIHRoZSByb290J3MgaGVpZ2h0LCB3ZSBj YW4gZ28gYmFjayBhbmQgbGF5b3V0IHRoZSBvdXQtb2YtZmxvdyBjb250ZW50LgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGlu Z0NvbnRleHQuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGlu ZUZvcm1hdHRpbmdDb250ZXh0LmgKaW5kZXggZDY2OWFjMmE1NWZkNjJmZmQ4NGViYTM4YzZjZjU0 Mzg3NTkyNjQyNy4uZjZiYjBmYzc0ZGZlZjU3MWQyNzc1YjA4MDkyMGJkOGFiYmMwN2QxOCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9y bWF0dGluZ0NvbnRleHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0 dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5oCkBAIC00Myw3ICs0Myw3IEBAIGNsYXNzIElu bGluZUZvcm1hdHRpbmdDb250ZXh0IDogcHVibGljIEZvcm1hdHRpbmdDb250ZXh0IHsKICAgICBX VEZfTUFLRV9JU09fQUxMT0NBVEVEKElubGluZUZvcm1hdHRpbmdDb250ZXh0KTsKIHB1YmxpYzoK ICAgICBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dChjb25zdCBDb250YWluZXImIGZvcm1hdHRpbmdD b250ZXh0Um9vdCwgSW5saW5lRm9ybWF0dGluZ1N0YXRlJik7Ci0gICAgdm9pZCBsYXlvdXRJbkZs b3dDb250ZW50KEludmFsaWRhdGlvblN0YXRlJiwgY29uc3QgVXNlZEhvcml6b250YWxWYWx1ZXM6 OkNvbnN0cmFpbnRzJikgb3ZlcnJpZGU7CisgICAgdm9pZCBsYXlvdXRJbkZsb3dDb250ZW50KElu dmFsaWRhdGlvblN0YXRlJiwgY29uc3QgVXNlZEhvcml6b250YWxWYWx1ZXM6OkNvbnN0cmFpbnRz JiwgY29uc3QgVXNlZFZlcnRpY2FsVmFsdWVzOjpDb25zdHJhaW50cyYpIG92ZXJyaWRlOwogCiBw cml2YXRlOgogICAgIEludHJpbnNpY1dpZHRoQ29uc3RyYWludHMgY29tcHV0ZWRJbnRyaW5zaWNX aWR0aENvbnN0cmFpbnRzKCkgb3ZlcnJpZGU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvdGFibGVmb3JtYXR0aW5nL1RhYmxlRm9ybWF0dGluZ0NvbnRleHQuY3BwIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L3RhYmxlZm9ybWF0dGluZy9UYWJsZUZvcm1hdHRpbmdDb250ZXh0LmNw cAppbmRleCAyNmI4ZmMyNjc0NjMzYjI2ZWUxZTA5Njk3ZjBlNjg0Y2VkM2ZjODAyLi4zMDAyNjQx M2M1Mjc2NDhjZjFjZmFjNGI4OGM2YmMzZjhmNjQ5NjUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvdGFibGVmb3JtYXR0aW5nL1RhYmxlRm9ybWF0dGluZ0NvbnRleHQuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC90YWJsZWZvcm1hdHRpbmcvVGFibGVGb3JtYXR0aW5n Q29udGV4dC5jcHAKQEAgLTU4LDcgKzU4LDcgQEAgVGFibGVGb3JtYXR0aW5nQ29udGV4dDo6VGFi bGVGb3JtYXR0aW5nQ29udGV4dChjb25zdCBDb250YWluZXImIGZvcm1hdHRpbmdDb250ZXgKIHsK IH0KIAotdm9pZCBUYWJsZUZvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXRJbkZsb3dDb250ZW50KElu dmFsaWRhdGlvblN0YXRlJiBpbnZhbGlkYXRpb25TdGF0ZSwgY29uc3QgVXNlZEhvcml6b250YWxW YWx1ZXM6OkNvbnN0cmFpbnRzJikKK3ZvaWQgVGFibGVGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0 SW5GbG93Q29udGVudChJbnZhbGlkYXRpb25TdGF0ZSYgaW52YWxpZGF0aW9uU3RhdGUsIGNvbnN0 IFVzZWRIb3Jpem9udGFsVmFsdWVzOjpDb25zdHJhaW50cyYsIGNvbnN0IFVzZWRWZXJ0aWNhbFZh bHVlczo6Q29uc3RyYWludHMmKQogewogICAgIGF1dG8mIGdyaWQgPSBmb3JtYXR0aW5nU3RhdGUo KS50YWJsZUdyaWQoKTsKICAgICBhdXRvJiBjb2x1bW5zQ29udGV4dCA9IGdyaWQuY29sdW1uc0Nv bnRleHQoKTsKQEAgLTExMSw3ICsxMTEsNyBAQCB2b2lkIFRhYmxlRm9ybWF0dGluZ0NvbnRleHQ6 OmxheW91dFRhYmxlQ2VsbEJveChjb25zdCBCb3gmIGNlbGxMYXlvdXRCb3gsIGNvbnN0CiAKICAg ICBBU1NFUlQoY2VsbExheW91dEJveC5lc3RhYmxpc2hlc0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQo KSk7CiAgICAgaWYgKGlzPENvbnRhaW5lcj4oY2VsbExheW91dEJveCkpCi0gICAgICAgIExheW91 dENvbnRleHQ6OmNyZWF0ZUZvcm1hdHRpbmdDb250ZXh0KGRvd25jYXN0PENvbnRhaW5lcj4oY2Vs bExheW91dEJveCksIGxheW91dFN0YXRlKCkpLT5sYXlvdXRJbkZsb3dDb250ZW50KGludmFsaWRh dGlvblN0YXRlLCBHZW9tZXRyeTo6aG9yaXpvbnRhbENvbnN0cmFpbnRzRm9ySW5GbG93KGNlbGxE aXNwbGF5Qm94KSk7CisgICAgICAgIExheW91dENvbnRleHQ6OmNyZWF0ZUZvcm1hdHRpbmdDb250 ZXh0KGRvd25jYXN0PENvbnRhaW5lcj4oY2VsbExheW91dEJveCksIGxheW91dFN0YXRlKCkpLT5s YXlvdXRJbkZsb3dDb250ZW50KGludmFsaWRhdGlvblN0YXRlLCBHZW9tZXRyeTo6aG9yaXpvbnRh bENvbnN0cmFpbnRzRm9ySW5GbG93KGNlbGxEaXNwbGF5Qm94KSwgR2VvbWV0cnk6OnZlcnRpY2Fs Q29uc3RyYWludHNGb3JJbkZsb3coY2VsbERpc3BsYXlCb3gpKTsKICAgICBjZWxsRGlzcGxheUJv eC5zZXRWZXJ0aWNhbE1hcmdpbih7IHsgfSwgeyB9IH0pOwogICAgIGNlbGxEaXNwbGF5Qm94LnNl dENvbnRlbnRCb3hIZWlnaHQoZ2VvbWV0cnkoKS50YWJsZUNlbGxIZWlnaHRBbmRNYXJnaW4oY2Vs bExheW91dEJveCkuY29udGVudEhlaWdodCk7CiAgICAgLy8gRklYTUU6IENoZWNrIHdoYXQgdG8g ZG8gd2l0aCBvdXQtb2YtZmxvdyBjb250ZW50LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L3RhYmxlZm9ybWF0dGluZy9UYWJsZUZvcm1hdHRpbmdDb250ZXh0LmggYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvdGFibGVmb3JtYXR0aW5nL1RhYmxlRm9ybWF0dGluZ0NvbnRleHQuaApp bmRleCBlNmVmMTIyOGMxNjk5MzE2ZWY4ZDViZGRkYWIzZTE4NjA5ZmJiMTVhLi4yMDFmYzE3NWIz ZGYxYWM4NjNkMzA1ZjliYjllNDQ0Yjg0NDU5ZmRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvdGFibGVmb3JtYXR0aW5nL1RhYmxlRm9ybWF0dGluZ0NvbnRleHQuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvdGFibGVmb3JtYXR0aW5nL1RhYmxlRm9ybWF0dGluZ0NvbnRl eHQuaApAQCAtNDIsNyArNDIsNyBAQCBjbGFzcyBUYWJsZUZvcm1hdHRpbmdDb250ZXh0IDogcHVi bGljIEZvcm1hdHRpbmdDb250ZXh0IHsKICAgICBXVEZfTUFLRV9JU09fQUxMT0NBVEVEKFRhYmxl Rm9ybWF0dGluZ0NvbnRleHQpOwogcHVibGljOgogICAgIFRhYmxlRm9ybWF0dGluZ0NvbnRleHQo Y29uc3QgQ29udGFpbmVyJiBmb3JtYXR0aW5nQ29udGV4dFJvb3QsIFRhYmxlRm9ybWF0dGluZ1N0 YXRlJik7Ci0gICAgdm9pZCBsYXlvdXRJbkZsb3dDb250ZW50KEludmFsaWRhdGlvblN0YXRlJiwg Y29uc3QgVXNlZEhvcml6b250YWxWYWx1ZXM6OkNvbnN0cmFpbnRzJikgb3ZlcnJpZGU7CisgICAg dm9pZCBsYXlvdXRJbkZsb3dDb250ZW50KEludmFsaWRhdGlvblN0YXRlJiwgY29uc3QgVXNlZEhv cml6b250YWxWYWx1ZXM6OkNvbnN0cmFpbnRzJiwgY29uc3QgVXNlZFZlcnRpY2FsVmFsdWVzOjpD b25zdHJhaW50cyYpIG92ZXJyaWRlOwogCiBwcml2YXRlOgogICAgIGNsYXNzIEdlb21ldHJ5IDog cHVibGljIEZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeSB7Cg==