193824 2019-01-25 07:39:15 -0800 [LFC][BFC][MarginCollapsing] Add "clear" to static position computation. 2019-01-25 08:51:28 -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 1498233 0 zalan 2019-01-25 07:39:15 -0800 Move it from after vertical margin computation. 1498244 1 360116 zalan 2019-01-25 08:07:33 -0800 Created attachment 360116 Patch 1498258 2 zalan 2019-01-25 08:50:24 -0800 Committed r240475: <https://trac.webkit.org/changeset/240475> 1498259 3 webkit-bug-importer 2019-01-25 08:51:28 -0800 <rdar://problem/47550519> 360116 2019-01-25 08:07:33 -0800 2019-01-25 08:21:45 -0800 Patch Patch.txt text/plain 17780 zalan ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBkMTU4YjcwYzkwYS4uYjhhOWEwZGViNzAgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzNiBAQAorMjAxOS0wMS0yNSAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgor CisgICAgICAgIFtMRkNdW0JGQ11bTWFyZ2luQ29sbGFwc2luZ10gQWRkICJjbGVhciIgdG8gc3Rh dGljIHBvc2l0aW9uIGNvbXB1dGF0aW9uLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTkzODI0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgV2hlbiBjbGVhciBwcm9wZXJ0eSBpcyBzZXQgYW5kIGZsb2F0cyBh cmUgcHJlc2VudCwgd2UgaGF2ZSB0byBlc3RpbWF0ZSBhbmQgc2V0IHRoZSBib3gncyB2ZXJ0aWNh bCBwb3NpdGlvbiBkdXJpbmcKKyAgICAgICAgc3RhdGljIHBvc2l0aW9uaW5nIHRvIGJlIGFibGUg dG8gcHJvcGVybHkgbGF5b3V0IGl0cyBzdWJ0cmVlLgorICAgICAgICAKKyAgICAgICAgPGRpdiBz dHlsZT0iZmxvYXQ6IGxlZnQ7IHdpZHRoOiAxMDBweDsgaGVpZ2h0OiAxMDBweDsiPjwvZGl2Pgor ICAgICAgICA8ZGl2IHN0eWxlPSJjbGVhcjogbGVmdDsiPgorICAgICAgICAgIDxkaXYgc3R5bGU9 ImZsb2F0OiBsZWZ0OyB3aWR0aDogMTAwcHg7IGhlaWdodDogMTAwcHg7Ij48L2Rpdj4KKyAgICAg ICAgPC9kaXY+CisKKyAgICAgICAgSW4gdGhlIGFib3ZlIGV4YW1wbGUgc2luY2UgdGhlIHNlY29u ZCBmbG9hdCdzIHBhcmVudCBjbGVhcnMgdGhlIGZpcnN0IGZsb2F0LCB0aGUgc2Vjb25kIGZsb2F0 IGlzIHBvc2l0aW9uZWQgYmVsb3cKKyAgICAgICAgdGhlIGZpcnN0IGZsb2F0LiBJZiB3ZSBkaWRu J3QgcHVzaCBkb3duIChjbGVhcikgdGhlIGJveCwgdGhlIGZsb2F0IGNoaWxkIHdvdWxkIGdldCBw bGFjZWQgbmV4dCB0byB0aGUgZmlyc3QgZmxvYXQuCisKKyAgICAgICAgKiBsYXlvdXQvYmxvY2tm b3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 TGF5b3V0OjpCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXQgY29uc3QpOgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXRGb3JtYXR0aW5n Q29udGV4dFJvb3QgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpCbG9ja0Zvcm1h dHRpbmdDb250ZXh0Ojpjb21wdXRlU3RhdGljUG9zaXRpb24gY29uc3QpOgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0OjpCbG9ja0Zvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlRXN0aW1hdGVkVmVy dGljYWxQb3NpdGlvbiBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJsb2NrRm9y bWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVFc3RpbWF0ZWRWZXJ0aWNhbFBvc2l0aW9uRm9yRmxvYXRD bGVhciBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJsb2NrRm9ybWF0dGluZ0Nv bnRleHQ6OmNvbXB1dGVIZWlnaHRBbmRNYXJnaW4gY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6 TGF5b3V0OjpCbG9ja0Zvcm1hdHRpbmdDb250ZXh0Ojp2ZXJ0aWNhbFBvc2l0aW9uV2l0aE1hcmdp biBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJsb2NrRm9ybWF0dGluZ0NvbnRl eHQ6OmNvbXB1dGVWZXJ0aWNhbFBvc2l0aW9uRm9yRmxvYXRDbGVhciBjb25zdCk6IERlbGV0ZWQu CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6OmFkanVz dGVkVmVydGljYWxQb3NpdGlvbkFmdGVyTWFyZ2luQ29sbGFwc2luZyBjb25zdCk6IERlbGV0ZWQu CisgICAgICAgICogbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0 Lmg6CisgICAgICAgICogbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja01hcmdpbkNvbGxhcHNl LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6 TWFyZ2luQ29sbGFwc2U6OmVzdGltYXRlZE1hcmdpbkJlZm9yZSk6CisgICAgICAgICogbGF5b3V0 L2Rpc3BsYXl0cmVlL0Rpc3BsYXlCb3guaDoKKwogMjAxOS0wMS0yNCAgWmFsYW4gQnVqdGFzICA8 emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0JGQ11bTWFyZ2luQ29sbGFwc2luZ10g TW92ZSBwb3NpdGl2ZS9uZWdhdGl2ZSBtYXJnaW4gdmFsdWUgdXBkYXRpbmcgdG8gYSBkZWRpY2F0 ZWQgZnVuY3Rpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1h dHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv YmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwCmluZGV4IDdmYzRlYmMz NThkLi4wZjljMWI3NDZhZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2Nr Zm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwCkBAIC05 MCw3ICs5MCw3IEBAIHZvaWQgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0KCkgY29uc3QK ICAgICAgICAgICAgIExPR19XSVRIX1NUUkVBTShGb3JtYXR0aW5nQ29udGV4dExheW91dCwgc3Ry ZWFtIDw8ICJbQ29tcHV0ZV0gLT4gW1Bvc2l0aW9uXVtCb3JkZXJdW1BhZGRpbmddW1dpZHRoXVtN YXJnaW5dIC0+IGZvciBsYXlvdXRCb3goIiA8PCAmbGF5b3V0Qm94IDw8ICIpIik7CiAgICAgICAg ICAgICBjb21wdXRlQm9yZGVyQW5kUGFkZGluZyhsYXlvdXRCb3gpOwogICAgICAgICAgICAgY29t cHV0ZVdpZHRoQW5kTWFyZ2luKGxheW91dEJveCk7Ci0gICAgICAgICAgICBjb21wdXRlU3RhdGlj UG9zaXRpb24obGF5b3V0Qm94KTsKKyAgICAgICAgICAgIGNvbXB1dGVTdGF0aWNQb3NpdGlvbihm bG9hdGluZ0NvbnRleHQsIGxheW91dEJveCk7CiAgICAgICAgICAgICBpZiAoIWlzPENvbnRhaW5l cj4obGF5b3V0Qm94KSB8fCAhZG93bmNhc3Q8Q29udGFpbmVyPihsYXlvdXRCb3gpLmhhc0luRmxv d09yRmxvYXRpbmdDaGlsZCgpKQogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAg bGF5b3V0UXVldWUuYXBwZW5kKGRvd25jYXN0PENvbnRhaW5lcj4obGF5b3V0Qm94KS5maXJzdElu Rmxvd09yRmxvYXRpbmdDaGlsZCgpKTsKQEAgLTEwNSw5ICsxMDUsNiBAQCB2b2lkIEJsb2NrRm9y bWF0dGluZ0NvbnRleHQ6OmxheW91dCgpIGNvbnN0CiAgICAgICAgICAgICAvLyBGb3JtYXR0aW5n IHJvb3QgYm94ZXMgYXJlIHNwZWNpYWwtY2FzZWQgYW5kIHRoZXkgZG9uJ3QgY29tZSBoZXJlLgog ICAgICAgICAgICAgQVNTRVJUKCFsYXlvdXRCb3guZXN0YWJsaXNoZXNGb3JtYXR0aW5nQ29udGV4 dCgpKTsKICAgICAgICAgICAgIGNvbXB1dGVIZWlnaHRBbmRNYXJnaW4obGF5b3V0Qm94KTsKLSAg ICAgICAgICAgIC8vIEZpbmFsaXplIHBvc2l0aW9uIHdpdGggY2xlYXJhbmNlLgotICAgICAgICAg ICAgaWYgKGxheW91dEJveC5oYXNGbG9hdENsZWFyKCkpCi0gICAgICAgICAgICAgICAgY29tcHV0 ZVZlcnRpY2FsUG9zaXRpb25Gb3JGbG9hdENsZWFyKGZsb2F0aW5nQ29udGV4dCwgbGF5b3V0Qm94 KTsKICAgICAgICAgICAgIGlmICghaXM8Q29udGFpbmVyPihsYXlvdXRCb3gpKQogICAgICAgICAg ICAgICAgIGNvbnRpbnVlOwogICAgICAgICAgICAgYXV0byYgY29udGFpbmVyID0gZG93bmNhc3Q8 Q29udGFpbmVyPihsYXlvdXRCb3gpOwpAQCAtMTMwLDcgKzEyNyw3IEBAIHZvaWQgQmxvY2tGb3Jt YXR0aW5nQ29udGV4dDo6bGF5b3V0Rm9ybWF0dGluZ0NvbnRleHRSb290KEZsb2F0aW5nQ29udGV4 dCYgZmxvYXRpCiAgICAgTE9HX1dJVEhfU1RSRUFNKEZvcm1hdHRpbmdDb250ZXh0TGF5b3V0LCBz dHJlYW0gPDwgIltDb21wdXRlXSAtPiBbUG9zaXRpb25dW0JvcmRlcl1bUGFkZGluZ11bV2lkdGhd W01hcmdpbl0gLT4gZm9yIGxheW91dEJveCgiIDw8ICZsYXlvdXRCb3ggPDwgIikiKTsKICAgICBj b21wdXRlQm9yZGVyQW5kUGFkZGluZyhsYXlvdXRCb3gpOwogICAgIGNvbXB1dGVXaWR0aEFuZE1h cmdpbihsYXlvdXRCb3gpOwotICAgIGNvbXB1dGVTdGF0aWNQb3NpdGlvbihsYXlvdXRCb3gpOwor ICAgIGNvbXB1dGVTdGF0aWNQb3NpdGlvbihmbG9hdGluZ0NvbnRleHQsIGxheW91dEJveCk7CiAg ICAgLy8gU3dpY2ggb3ZlciB0byB0aGUgbmV3IGZvcm1hdHRpbmcgY29udGV4dCAodGhlIG9uZSB0 aGF0IHRoZSByb290IGNyZWF0ZXMpLgogICAgIGF1dG8gZm9ybWF0dGluZ0NvbnRleHQgPSBsYXlv dXRTdGF0ZSgpLmNyZWF0ZUZvcm1hdHRpbmdDb250ZXh0KGxheW91dEJveCk7CiAgICAgZm9ybWF0 dGluZ0NvbnRleHQtPmxheW91dCgpOwpAQCAtMTQzLDkgKzE0MCw3IEBAIHZvaWQgQmxvY2tGb3Jt YXR0aW5nQ29udGV4dDo6bGF5b3V0Rm9ybWF0dGluZ0NvbnRleHRSb290KEZsb2F0aW5nQ29udGV4 dCYgZmxvYXRpCiAgICAgaWYgKGxheW91dEJveC5pc0Zsb2F0aW5nUG9zaXRpb25lZCgpKSB7CiAg ICAgICAgIGNvbXB1dGVGbG9hdGluZ1Bvc2l0aW9uKGZsb2F0aW5nQ29udGV4dCwgbGF5b3V0Qm94 KTsKICAgICAgICAgZmxvYXRpbmdDb250ZXh0LmZsb2F0aW5nU3RhdGUoKS5hcHBlbmQobGF5b3V0 Qm94KTsKLSAgICB9IGVsc2UgaWYgKGxheW91dEJveC5oYXNGbG9hdENsZWFyKCkpCi0gICAgICAg IGNvbXB1dGVWZXJ0aWNhbFBvc2l0aW9uRm9yRmxvYXRDbGVhcihmbG9hdGluZ0NvbnRleHQsIGxh eW91dEJveCk7Ci0gICAgZWxzZSBpZiAobGF5b3V0Qm94LmVzdGFibGlzaGVzQmxvY2tGb3JtYXR0 aW5nQ29udGV4dCgpKQorICAgIH0gZWxzZSBpZiAobGF5b3V0Qm94LmVzdGFibGlzaGVzQmxvY2tG b3JtYXR0aW5nQ29udGV4dCgpKQogICAgICAgICBjb21wdXRlUG9zaXRpb25Ub0F2b2lkRmxvYXRz KGZsb2F0aW5nQ29udGV4dCwgbGF5b3V0Qm94KTsKIAogICAgIC8vIE5vdyB0aGF0IHdlIGNvbXB1 dGVkIHRoZSByb290J3MgaGVpZ2h0LCB3ZSBjYW4gZ28gYmFjayBhbmQgbGF5b3V0IHRoZSBvdXQt b2YtZmxvdyBkZXNjZWRhbnRzIChpZiBhbnkpLgpAQCAtMTc2LDEyICsxNzEsMTIgQEAgdm9pZCBC bG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpwbGFjZUluRmxvd1Bvc2l0aW9uZWRDaGlsZHJlbihjb25z dCBDb250YWluZXImIGNvbnQKICAgICBMT0dfV0lUSF9TVFJFQU0oRm9ybWF0dGluZ0NvbnRleHRM YXlvdXQsIHN0cmVhbSA8PCAiRW5kOiBtb3ZlIGluLWZsb3cgcG9zaXRpb25lZCBjaGlsZHJlbiAt PiBwYXJlbnQ6ICIgPDwgJmNvbnRhaW5lcik7CiB9CiAKLXZvaWQgQmxvY2tGb3JtYXR0aW5nQ29u dGV4dDo6Y29tcHV0ZVN0YXRpY1Bvc2l0aW9uKGNvbnN0IEJveCYgbGF5b3V0Qm94KSBjb25zdAor dm9pZCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlU3RhdGljUG9zaXRpb24oY29uc3Qg RmxvYXRpbmdDb250ZXh0JiBmbG9hdGluZ0NvbnRleHQsIGNvbnN0IEJveCYgbGF5b3V0Qm94KSBj b25zdAogewogICAgIGF1dG8mIGxheW91dFN0YXRlID0gdGhpcy0+bGF5b3V0U3RhdGUoKTsKICAg ICBsYXlvdXRTdGF0ZS5kaXNwbGF5Qm94Rm9yTGF5b3V0Qm94KGxheW91dEJveCkuc2V0VG9wTGVm dChHZW9tZXRyeTo6c3RhdGljUG9zaXRpb24obGF5b3V0U3RhdGUsIGxheW91dEJveCkpOwogICAg IGlmIChsYXlvdXRCb3guaGFzRmxvYXRDbGVhcigpKQotICAgICAgICBjb21wdXRlRXN0aW1hdGVk VmVydGljYWxQb3NpdGlvbkZvckZsb2F0Q2xlYXIobGF5b3V0Qm94KTsKKyAgICAgICAgY29tcHV0 ZUVzdGltYXRlZFZlcnRpY2FsUG9zaXRpb25Gb3JGbG9hdENsZWFyKGZsb2F0aW5nQ29udGV4dCwg bGF5b3V0Qm94KTsKICAgICBlbHNlIGlmIChsYXlvdXRCb3guZXN0YWJsaXNoZXNGb3JtYXR0aW5n Q29udGV4dCgpKQogICAgICAgICBjb21wdXRlRXN0aW1hdGVkVmVydGljYWxQb3NpdGlvbkZvckZv cm1hdHRpbmdSb290KGxheW91dEJveCk7CiB9CkBAIC0xOTcsNyArMTkyLDcgQEAgdm9pZCBCbG9j a0Zvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlRXN0aW1hdGVkVmVydGljYWxQb3NpdGlvbihjb25z dCBCb3gmIGxheW91dEIKICAgICBhdXRvIGNvbGxhcHNlZFZhbHVlcyA9IFVzZWRWZXJ0aWNhbE1h cmdpbjo6Q29sbGFwc2VkVmFsdWVzIHsgZXN0aW1hdGVkTWFyZ2luQmVmb3JlLmNvbGxhcHNlZFZh bHVlLCB7IH0sIGVzdGltYXRlZE1hcmdpbkJlZm9yZS5pc0NvbGxhcHNlZFRocm91Z2ggfTsKICAg ICBhdXRvIHZlcnRpY2FsTWFyZ2luID0gVXNlZFZlcnRpY2FsTWFyZ2luIHsgbm9uQ29sbGFwc2Vk VmFsdWVzLCBjb2xsYXBzZWRWYWx1ZXMgfTsKICAgICBkaXNwbGF5Qm94LnNldFZlcnRpY2FsTWFy Z2luKHZlcnRpY2FsTWFyZ2luKTsKLSAgICBkaXNwbGF5Qm94LnNldFRvcChhZGp1c3RlZFZlcnRp Y2FsUG9zaXRpb25BZnRlck1hcmdpbkNvbGxhcHNpbmcobGF5b3V0Qm94LCB2ZXJ0aWNhbE1hcmdp bikpOworICAgIGRpc3BsYXlCb3guc2V0VG9wKHZlcnRpY2FsUG9zaXRpb25XaXRoTWFyZ2luKGxh eW91dEJveCwgdmVydGljYWxNYXJnaW4pKTsKICNpZiAhQVNTRVJUX0RJU0FCTEVECiAgICAgZGlz cGxheUJveC5zZXRIYXNFc3RpbWF0ZWRNYXJnaW5CZWZvcmUoKTsKICNlbmRpZgpAQCAtMjQzLDgg KzIzOCwyNSBAQCB2b2lkIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVFc3RpbWF0ZWRW ZXJ0aWNhbFBvc2l0aW9uRm9yRm9ybWF0dGluZ1Jvb3QoYwogICAgIH0KIH0KIAotdm9pZCBCbG9j a0Zvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlRXN0aW1hdGVkVmVydGljYWxQb3NpdGlvbkZvckZs b2F0Q2xlYXIoY29uc3QgQm94JikgY29uc3QKK3ZvaWQgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6 Y29tcHV0ZUVzdGltYXRlZFZlcnRpY2FsUG9zaXRpb25Gb3JGbG9hdENsZWFyKGNvbnN0IEZsb2F0 aW5nQ29udGV4dCYgZmxvYXRpbmdDb250ZXh0LCBjb25zdCBCb3gmIGxheW91dEJveCkgY29uc3QK IHsKKyAgICBBU1NFUlQobGF5b3V0Qm94Lmhhc0Zsb2F0Q2xlYXIoKSk7CisgICAgaWYgKGZsb2F0 aW5nQ29udGV4dC5mbG9hdGluZ1N0YXRlKCkuaXNFbXB0eSgpKQorICAgICAgICByZXR1cm47Cisg ICAgLy8gVGhlIHN0YXRpYyBwb3NpdGlvbiB3aXRoIGNsZWFyIHJlcXVpcmVzIG1hcmdpbiBlc2l0 bWF0aW9uIHRvIHNlZSBpZiBjbGVhcmFuY2UgaXMgbmVlZGVkLgorICAgIGNvbXB1dGVFc3RpbWF0 ZWRWZXJ0aWNhbFBvc2l0aW9uKGxheW91dEJveCk7CisgICAgY29tcHV0ZUVzdGltYXRlZFZlcnRp Y2FsUG9zaXRpb25Gb3JBbmNlc3RvcnMobGF5b3V0Qm94KTsKKyAgICBhdXRvIHZlcnRpY2FsUG9z aXRpb25BbmRDbGVhcmFuY2UgPSBmbG9hdGluZ0NvbnRleHQudmVydGljYWxQb3NpdGlvbldpdGhD bGVhcmFuY2UobGF5b3V0Qm94KTsKKyAgICBpZiAoIXZlcnRpY2FsUG9zaXRpb25BbmRDbGVhcmFu Y2UucG9zaXRpb24pIHsKKyAgICAgICAgQVNTRVJUKCF2ZXJ0aWNhbFBvc2l0aW9uQW5kQ2xlYXJh bmNlLmNsZWFyYW5jZSk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBhdXRvJiBkaXNw bGF5Qm94ID0gbGF5b3V0U3RhdGUoKS5kaXNwbGF5Qm94Rm9yTGF5b3V0Qm94KGxheW91dEJveCk7 CisgICAgQVNTRVJUKCp2ZXJ0aWNhbFBvc2l0aW9uQW5kQ2xlYXJhbmNlLnBvc2l0aW9uID49IGRp c3BsYXlCb3gudG9wKCkpOworICAgIGRpc3BsYXlCb3guc2V0VG9wKCp2ZXJ0aWNhbFBvc2l0aW9u QW5kQ2xlYXJhbmNlLnBvc2l0aW9uKTsKKyAgICBpZiAodmVydGljYWxQb3NpdGlvbkFuZENsZWFy YW5jZS5jbGVhcmFuY2UpCisgICAgICAgIGRpc3BsYXlCb3guc2V0SGFzQ2xlYXJhbmNlKCk7CiB9 CiAKICNpZm5kZWYgTkRFQlVHCkBAIC0yOTIsNTQgKzMwNCw2IEBAIHZvaWQgQmxvY2tGb3JtYXR0 aW5nQ29udGV4dDo6Y29tcHV0ZVBvc2l0aW9uVG9Bdm9pZEZsb2F0cyhjb25zdCBGbG9hdGluZ0Nv bnRleHQmCiAgICAgICAgIGxheW91dFN0YXRlLmRpc3BsYXlCb3hGb3JMYXlvdXRCb3gobGF5b3V0 Qm94KS5zZXRUb3BMZWZ0KCphZGp1c3RlZFBvc2l0aW9uKTsKIH0KIAotdm9pZCBCbG9ja0Zvcm1h dHRpbmdDb250ZXh0Ojpjb21wdXRlVmVydGljYWxQb3NpdGlvbkZvckZsb2F0Q2xlYXIoY29uc3Qg RmxvYXRpbmdDb250ZXh0JiBmbG9hdGluZ0NvbnRleHQsIGNvbnN0IEJveCYgbGF5b3V0Qm94KSBj b25zdAotewotICAgIEFTU0VSVChsYXlvdXRCb3guaGFzRmxvYXRDbGVhcigpKTsKLSAgICBpZiAo ZmxvYXRpbmdDb250ZXh0LmZsb2F0aW5nU3RhdGUoKS5pc0VtcHR5KCkpCi0gICAgICAgIHJldHVy bjsKLQotICAgIC8vIEZvciBmb3JtYXR0aW5nIHJvb3RzLCB3ZSBhbHJlYWR5IHByZWNvbXB1dGVk IGZpbmFsIHBvc2l0aW9uLgotICAgIGlmICghbGF5b3V0Qm94LmVzdGFibGlzaGVzRm9ybWF0dGlu Z0NvbnRleHQoKSkKLSAgICAgICAgY29tcHV0ZUVzdGltYXRlZFZlcnRpY2FsUG9zaXRpb25Gb3JB bmNlc3RvcnMobGF5b3V0Qm94KTsKLSAgICBBU1NFUlQoaGFzUHJlY29tcHV0ZWRNYXJnaW5CZWZv cmUobGF5b3V0Qm94KSk7Ci0KLSAgICAvLyAxLiBDb21wdXRlIGFuZCBhZGp1c3QgdGhlIHZlcnRp Y2FsIHBvc2l0aW9uIHdpdGggY2xlYXJhbmNlLgotICAgIC8vIDIuIFJlc2V0IG1hcmdpbiBjb2xs YXBzaW5nIHdpdGggcHJldmlvdXMgaW4tZmxvdyBzaWJsaW5nIGlmIGNsZXJhbmNlIGlzIHByZXNl bnQuCi0gICAgYXV0byB2ZXJ0aWNhbFBvc2l0aW9uQW5kQ2xlYXJhbmNlID0gZmxvYXRpbmdDb250 ZXh0LnZlcnRpY2FsUG9zaXRpb25XaXRoQ2xlYXJhbmNlKGxheW91dEJveCk7Ci0gICAgaWYgKCF2 ZXJ0aWNhbFBvc2l0aW9uQW5kQ2xlYXJhbmNlLnBvc2l0aW9uKQotICAgICAgICByZXR1cm47Ci0K LSAgICAvLyBBZGp1c3QgdmVydGljYWwgcG9zaXRpb24gZmlyc3QuCi0gICAgYXV0byYgbGF5b3V0 U3RhdGUgPSB0aGlzLT5sYXlvdXRTdGF0ZSgpOwotICAgIGF1dG8mIGRpc3BsYXlCb3ggPSBsYXlv dXRTdGF0ZS5kaXNwbGF5Qm94Rm9yTGF5b3V0Qm94KGxheW91dEJveCk7Ci0gICAgZGlzcGxheUJv eC5zZXRUb3AoKnZlcnRpY2FsUG9zaXRpb25BbmRDbGVhcmFuY2UucG9zaXRpb24pOwotICAgIGlm ICghdmVydGljYWxQb3NpdGlvbkFuZENsZWFyYW5jZS5jbGVhcmFuY2UpCi0gICAgICAgIHJldHVy bjsKLQotICAgIGRpc3BsYXlCb3guc2V0SGFzQ2xlYXJhbmNlKCk7Ci0gICAgLy8gQWRqdXN0IG1h cmdpbiBjb2xsYXBzaW5nIHdpdGggY2xlYXJhbmNlLgotICAgIGF1dG8qIHByZXZpb3VzSW5GbG93 U2libGluZyA9IGxheW91dEJveC5wcmV2aW91c0luRmxvd1NpYmxpbmcoKTsKLSAgICBpZiAoIXBy ZXZpb3VzSW5GbG93U2libGluZykKLSAgICAgICAgcmV0dXJuOwotCi0gICAgLy8gQ2xlYXJhbmNl IGluaGliaXRzIG1hcmdpbiBjb2xsYXBzaW5nLiBMZXQncyByZXNldCB0aGUgcmVsZXZhbnQgYWRq b2luaW5nIG1hcmdpbnMuCi0gICAgLy8gRG9lcyB0aGlzIGJveCB3aXRoIGNsZWFyYW5jZSBhY3R1 YWxseSBjb2xsYXBzZSBpdHMgbWFyZ2luIGJlZm9yZSB3aXRoIHRoZSBwcmV2aW91cyBpbmZsb3cg Ym94J3MgbWFyZ2luIGFmdGVyPyAKLSAgICBhdXRvIHZlcnRpY2FsTWFyZ2luID0gZGlzcGxheUJv eC52ZXJ0aWNhbE1hcmdpbigpOwotICAgIGlmICghdmVydGljYWxNYXJnaW4uaGFzQ29sbGFwc2Vk VmFsdWVzKCkgfHwgIXZlcnRpY2FsTWFyZ2luLmNvbGxhcHNlZFZhbHVlcygpLmJlZm9yZSkKLSAg ICAgICAgcmV0dXJuOwotCi0gICAgLy8gUmVzZXQgcHJldmlvdXMgYWZ0ZXIgYW5kIGN1cnJlbnQg YmVmb3JlIG1hcmdpbiB2YWx1ZXMgdG8gbm9uLWNvbGxhcHNpbmcuCi0gICAgYXV0byYgcHJldmlv dXNJbkZsb3dEaXNwbGF5Qm94ID0gbGF5b3V0U3RhdGUuZGlzcGxheUJveEZvckxheW91dEJveCgq cHJldmlvdXNJbkZsb3dTaWJsaW5nKTsgCi0gICAgYXV0byBwcmV2aW91c1ZlcnRpY2FsTWFyZ2lu ID0gcHJldmlvdXNJbkZsb3dEaXNwbGF5Qm94LnZlcnRpY2FsTWFyZ2luKCk7Ci0gICAgQVNTRVJU KHByZXZpb3VzVmVydGljYWxNYXJnaW4uaGFzQ29sbGFwc2VkVmFsdWVzKCkgJiYgcHJldmlvdXNW ZXJ0aWNhbE1hcmdpbi5jb2xsYXBzZWRWYWx1ZXMoKS5hZnRlcik7Ci0KLSAgICBwcmV2aW91c1Zl cnRpY2FsTWFyZ2luLnNldENvbGxhcHNlZFZhbHVlcyh7IHByZXZpb3VzVmVydGljYWxNYXJnaW4u Y29sbGFwc2VkVmFsdWVzKCkuYmVmb3JlLCB7IH0gfSk7Ci0gICAgdmVydGljYWxNYXJnaW4uc2V0 Q29sbGFwc2VkVmFsdWVzKHsgeyB9LCB2ZXJ0aWNhbE1hcmdpbi5jb2xsYXBzZWRWYWx1ZXMoKS5h ZnRlciB9KTsKLQotICAgIHByZXZpb3VzSW5GbG93RGlzcGxheUJveC5zZXRWZXJ0aWNhbE1hcmdp bihwcmV2aW91c1ZlcnRpY2FsTWFyZ2luKTsKLSAgICBkaXNwbGF5Qm94LnNldFZlcnRpY2FsTWFy Z2luKHZlcnRpY2FsTWFyZ2luKTsKLX0KLQogdm9pZCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0Ojpj b21wdXRlV2lkdGhBbmRNYXJnaW4oY29uc3QgQm94JiBsYXlvdXRCb3gpIGNvbnN0CiB7CiAgICAg YXV0byYgbGF5b3V0U3RhdGUgPSB0aGlzLT5sYXlvdXRTdGF0ZSgpOwpAQCAtNDI4LDcgKzM5Miw3 IEBAIHZvaWQgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUhlaWdodEFuZE1hcmdpbihj b25zdCBCb3gmIGxheW91dEJveCkgY29uc3QKIAogICAgIEFTU0VSVCghaGFzRXN0aW1hdGVkTWFy Z2luQmVmb3JlKGxheW91dEJveCkgfHwgZXN0aW1hdGVkTWFyZ2luQmVmb3JlKGxheW91dEJveCku dXNlZFZhbHVlKCkgPT0gdmVydGljYWxNYXJnaW4uYmVmb3JlKCkpOwogICAgIHJlbW92ZUVzdGlt YXRlZE1hcmdpbkJlZm9yZShsYXlvdXRCb3gpOwotICAgIGRpc3BsYXlCb3guc2V0VG9wKGFkanVz dGVkVmVydGljYWxQb3NpdGlvbkFmdGVyTWFyZ2luQ29sbGFwc2luZyhsYXlvdXRCb3gsIHZlcnRp Y2FsTWFyZ2luKSk7CisgICAgZGlzcGxheUJveC5zZXRUb3AodmVydGljYWxQb3NpdGlvbldpdGhN YXJnaW4obGF5b3V0Qm94LCB2ZXJ0aWNhbE1hcmdpbikpOwogICAgIGRpc3BsYXlCb3guc2V0Q29u dGVudEJveEhlaWdodChoZWlnaHRBbmRNYXJnaW4uaGVpZ2h0KTsKICAgICBkaXNwbGF5Qm94LnNl dFZlcnRpY2FsTWFyZ2luKHZlcnRpY2FsTWFyZ2luKTsKIApAQCAtNTAxLDE0ICs0NjUsMTkgQEAg Rm9ybWF0dGluZ0NvbnRleHQ6Okluc3RyaW5zaWNXaWR0aENvbnN0cmFpbnRzIEJsb2NrRm9ybWF0 dGluZ0NvbnRleHQ6Omluc3RyaW5zaWMKICAgICByZXR1cm4gaW5zdHJpbnNpY1dpZHRoQ29uc3Ry YWludHM7CiB9CiAKLUxheW91dFVuaXQgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6YWRqdXN0ZWRW ZXJ0aWNhbFBvc2l0aW9uQWZ0ZXJNYXJnaW5Db2xsYXBzaW5nKGNvbnN0IEJveCYgbGF5b3V0Qm94 LCBjb25zdCBVc2VkVmVydGljYWxNYXJnaW4mIHZlcnRpY2FsTWFyZ2luKSBjb25zdAorTGF5b3V0 VW5pdCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0Ojp2ZXJ0aWNhbFBvc2l0aW9uV2l0aE1hcmdpbihj b25zdCBCb3gmIGxheW91dEJveCwgY29uc3QgVXNlZFZlcnRpY2FsTWFyZ2luJiB2ZXJ0aWNhbE1h cmdpbikgY29uc3QKIHsKICAgICBBU1NFUlQoIWxheW91dEJveC5pc091dE9mRmxvd1Bvc2l0aW9u ZWQoKSk7Ci0gICAgLy8gTm93IHRoYXQgd2UndmUgY29tcHV0ZWQgdGhlIGZpbmFsIG1hcmdpbiBi ZWZvcmUsIGxldCdzIHNoaWZ0IHRoZSBib3gncyB2ZXJ0aWNhbCBwb3NpdGlvbi4KLSAgICAvLyAx LiBDaGVjayBpZiB0aGUgbWFyZ2luIGJlZm9yZSBjb2xsYXBzZXMgd2l0aCB0aGUgcHJldmlvdXMg Ym94J3MgbWFyZ2luIGFmdGVyLiBpZiBub3QgLT4gcmV0dXJuIHByZXZpb3VzIGJveCdzIGJvdHRv bSBpbmNsdWRpbmcgbWFyZ2luIGFmdGVyICsgbWFyZ2luQmVmb3JlCi0gICAgLy8gMi4gQ2hlY2sg aWYgdGhlIHByZXZpb3VzIGJveCdzIG1hcmdpbnMgY29sbGFwc2UgdGhyb3VnaC4gSWYgbm90IC0+ IHJldHVybiBwcmV2aW91cyBib3gnIGJvdHRvbSBleGNsdWRpbmcgbWFyZ2luIGFmdGVyICsgbWFy Z2luQmVmb3JlICh0aGV5IGFyZSBzdXBwb3NlZCB0byBiZSBlcXVhbCkKLSAgICAvLyAzLiBHbyB0 byBwcmV2aW91cyBib3ggYW5kIHN0YXJ0IGZyb20gc3RlcCAjMSB1bnRpbCB3ZSBoaXQgdGhlIHBh cmVudCBib3guCisgICAgLy8gTm93IHRoYXQgd2UndmUgY29tcHV0ZWQgdGhlIGZpbmFsIG1hcmdp biBiZWZvcmUsIGxldCdzIHNoaWZ0IHRoZSBib3gncyB2ZXJ0aWNhbCBwb3NpdGlvbiBpZiBuZWVk ZWQuCisgICAgLy8gMS4gQ2hlY2sgaWYgdGhlIGJveCBoYXMgY2xlYXJhbmNlLiBJZiBzbywgd2Un dmUgYWxyZWFkeSBwcmVjb21wdXRlZC9maW5hbGl6ZWQgdGhlIHRvcCB2YWx1ZSBhbmQgdmVydGlj YWwgbWFyZ2luIGRvZXMgbm90IGltcGFjdCBpdCBhbnltb3JlLgorICAgIC8vIDIuIENoZWNrIGlm IHRoZSBtYXJnaW4gYmVmb3JlIGNvbGxhcHNlcyB3aXRoIHRoZSBwcmV2aW91cyBib3gncyBtYXJn aW4gYWZ0ZXIuIGlmIG5vdCAtPiByZXR1cm4gcHJldmlvdXMgYm94J3MgYm90dG9tIGluY2x1ZGlu ZyBtYXJnaW4gYWZ0ZXIgKyBtYXJnaW5CZWZvcmUKKyAgICAvLyAzLiBDaGVjayBpZiB0aGUgcHJl dmlvdXMgYm94J3MgbWFyZ2lucyBjb2xsYXBzZSB0aHJvdWdoLiBJZiBub3QgLT4gcmV0dXJuIHBy ZXZpb3VzIGJveCcgYm90dG9tIGV4Y2x1ZGluZyBtYXJnaW4gYWZ0ZXIgKyBtYXJnaW5CZWZvcmUg KHRoZXkgYXJlIHN1cHBvc2VkIHRvIGJlIGVxdWFsKQorICAgIC8vIDQuIEdvIHRvIHByZXZpb3Vz IGJveCBhbmQgc3RhcnQgZnJvbSBzdGVwICMxIHVudGlsIHdlIGhpdCB0aGUgcGFyZW50IGJveC4K ICAgICBhdXRvJiBsYXlvdXRTdGF0ZSA9IHRoaXMtPmxheW91dFN0YXRlKCk7CisgICAgYXV0byYg ZGlzcGxheUJveCA9IGxheW91dFN0YXRlLmRpc3BsYXlCb3hGb3JMYXlvdXRCb3gobGF5b3V0Qm94 KTsKKyAgICBpZiAoZGlzcGxheUJveC5oYXNDbGVhcmFuY2UoKSkKKyAgICAgICAgcmV0dXJuIGRp c3BsYXlCb3gudG9wKCk7CisKICAgICBhdXRvKiBjdXJyZW50TGF5b3V0Qm94ID0gJmxheW91dEJv eDsKICAgICB3aGlsZSAoY3VycmVudExheW91dEJveCkgewogICAgICAgICBpZiAoIWN1cnJlbnRM YXlvdXRCb3gtPnByZXZpb3VzSW5GbG93U2libGluZygpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmggYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRl eHQuaAppbmRleCAzODJiMmEyZTJlYS4uNTcyY2EyNjVkOWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5n Q29udGV4dC5oCkBAIC01OCwxOCArNTgsMTcgQEAgcHJpdmF0ZToKICAgICB2b2lkIGNvbXB1dGVX aWR0aEFuZE1hcmdpbihjb25zdCBCb3gmKSBjb25zdDsKICAgICB2b2lkIGNvbXB1dGVIZWlnaHRB bmRNYXJnaW4oY29uc3QgQm94JikgY29uc3Q7CiAKLSAgICB2b2lkIGNvbXB1dGVTdGF0aWNQb3Np dGlvbihjb25zdCBCb3gmKSBjb25zdDsKKyAgICB2b2lkIGNvbXB1dGVTdGF0aWNQb3NpdGlvbihj b25zdCBGbG9hdGluZ0NvbnRleHQmLCBjb25zdCBCb3gmKSBjb25zdDsKICAgICB2b2lkIGNvbXB1 dGVGbG9hdGluZ1Bvc2l0aW9uKGNvbnN0IEZsb2F0aW5nQ29udGV4dCYsIGNvbnN0IEJveCYpIGNv bnN0OwogICAgIHZvaWQgY29tcHV0ZVBvc2l0aW9uVG9Bdm9pZEZsb2F0cyhjb25zdCBGbG9hdGlu Z0NvbnRleHQmLCBjb25zdCBCb3gmKSBjb25zdDsKLSAgICB2b2lkIGNvbXB1dGVWZXJ0aWNhbFBv c2l0aW9uRm9yRmxvYXRDbGVhcihjb25zdCBGbG9hdGluZ0NvbnRleHQmLCBjb25zdCBCb3gmKSBj b25zdDsKIAogICAgIHZvaWQgY29tcHV0ZUVzdGltYXRlZFZlcnRpY2FsUG9zaXRpb24oY29uc3Qg Qm94JikgY29uc3Q7CiAgICAgdm9pZCBjb21wdXRlRXN0aW1hdGVkVmVydGljYWxQb3NpdGlvbkZv ckFuY2VzdG9ycyhjb25zdCBCb3gmKSBjb25zdDsKICAgICB2b2lkIGNvbXB1dGVFc3RpbWF0ZWRW ZXJ0aWNhbFBvc2l0aW9uRm9yRm9ybWF0dGluZ1Jvb3QoY29uc3QgQm94JikgY29uc3Q7Ci0gICAg dm9pZCBjb21wdXRlRXN0aW1hdGVkVmVydGljYWxQb3NpdGlvbkZvckZsb2F0Q2xlYXIoY29uc3Qg Qm94JikgY29uc3Q7CisgICAgdm9pZCBjb21wdXRlRXN0aW1hdGVkVmVydGljYWxQb3NpdGlvbkZv ckZsb2F0Q2xlYXIoY29uc3QgRmxvYXRpbmdDb250ZXh0JiwgY29uc3QgQm94JikgY29uc3Q7CiAK ICAgICBJbnN0cmluc2ljV2lkdGhDb25zdHJhaW50cyBpbnN0cmluc2ljV2lkdGhDb25zdHJhaW50 cygpIGNvbnN0IG92ZXJyaWRlOwotICAgIExheW91dFVuaXQgYWRqdXN0ZWRWZXJ0aWNhbFBvc2l0 aW9uQWZ0ZXJNYXJnaW5Db2xsYXBzaW5nKGNvbnN0IEJveCYsIGNvbnN0IFVzZWRWZXJ0aWNhbE1h cmdpbiYpIGNvbnN0OworICAgIExheW91dFVuaXQgdmVydGljYWxQb3NpdGlvbldpdGhNYXJnaW4o Y29uc3QgQm94JiwgY29uc3QgVXNlZFZlcnRpY2FsTWFyZ2luJikgY29uc3Q7CiAKICAgICAvLyBU aGlzIGNsYXNzIGltcGxlbWVudHMgcG9zaXRpb25pbmcgYW5kIHNpemluZyBmb3IgYm94ZXMgcGFy dGljaXBhdGluZyBpbiBhIGJsb2NrIGZvcm1hdHRpbmcgY29udGV4dC4KICAgICBjbGFzcyBHZW9t ZXRyeSA6IHB1YmxpYyBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnkgewpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja01hcmdpbkNvbGxhcHNl LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tNYXJnaW5D b2xsYXBzZS5jcHAKaW5kZXggZDQxNDA1YzM0ZGMuLjAyZjdmMDAxMTRhIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrTWFyZ2luQ29sbGFwc2Uu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tNYXJn aW5Db2xsYXBzZS5jcHAKQEAgLTU4MiwxMSArNTgyLDkgQEAgRXN0aW1hdGVkTWFyZ2luQmVmb3Jl IEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Ok1hcmdpbkNvbGxhcHNlOjplc3RpbWF0ZWRNYXJnaW5C ZWYKICAgICAgICAgcmV0dXJuIHsgfTsKIAogICAgIEFTU0VSVChsYXlvdXRCb3guaXNCbG9ja0xl dmVsQm94KCkpOwotICAgIC8vIENhbid0IGVzdGltYXRlIHZlcnRpY2FsIG1hcmdpbnMgZm9yIG91 dCBvZiBmbG93IGJveGVzIChhbmQgd2Ugc2hvdWxkbid0IG5lZWQgdG8gZG8gaXQgZm9yIGZsb2F0 IGJveGVzKS4KLSAgICBBU1NFUlQobGF5b3V0Qm94LmlzSW5GbG93KCkpOworICAgIC8vIERvbid0 IGVzdGltYXRlIHZlcnRpY2FsIG1hcmdpbnMgZm9yIG91dCBvZiBmbG93IGJveGVzLgorICAgIEFT U0VSVChsYXlvdXRCb3guaXNJbkZsb3coKSB8fCBsYXlvdXRCb3guaXNGbG9hdGluZ1Bvc2l0aW9u ZWQoKSk7CiAgICAgQVNTRVJUKCFsYXlvdXRCb3gucmVwbGFjZWQoKSk7Ci0gICAgLy8gQ2FuJ3Qg Y3Jvc3MgYmxvY2sgZm9ybWF0dGluZyBjb250ZXh0IGJvdW5kYXJ5LgotICAgIEFTU0VSVCghbGF5 b3V0Qm94LmVzdGFibGlzaGVzQmxvY2tGb3JtYXR0aW5nQ29udGV4dCgpKTsKICAgICAKICAgICBh dXRvIGNvbXB1dGVkVmVydGljYWxNYXJnaW4gPSBHZW9tZXRyeTo6Y29tcHV0ZWRWZXJ0aWNhbE1h cmdpbihsYXlvdXRTdGF0ZSwgbGF5b3V0Qm94KTsKICAgICBhdXRvIG5vbkNvbGxhcHNlZE1hcmdp biA9IFVzZWRWZXJ0aWNhbE1hcmdpbjo6Tm9uQ29sbGFwc2VkVmFsdWVzIHsgY29tcHV0ZWRWZXJ0 aWNhbE1hcmdpbi5iZWZvcmUudmFsdWVPcigwKSwgY29tcHV0ZWRWZXJ0aWNhbE1hcmdpbi5hZnRl ci52YWx1ZU9yKDApIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZGlzcGxh eXRyZWUvRGlzcGxheUJveC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Rpc3BsYXl0cmVlL0Rp c3BsYXlCb3guaAppbmRleCBiNzU0OWYxZmM0MC4uZmQzMWRmZTdkMGUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9kaXNwbGF5dHJlZS9EaXNwbGF5Qm94LmgKKysrIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2Rpc3BsYXl0cmVlL0Rpc3BsYXlCb3guaApAQCAtMjQyLDcgKzI0Miw3 IEBAIHByaXZhdGU6CiAgICAgTGF5b3V0OjpVc2VkSG9yaXpvbnRhbE1hcmdpbiBtX2hvcml6b250 YWxNYXJnaW47CiAgICAgTGF5b3V0OjpVc2VkVmVydGljYWxNYXJnaW4gbV92ZXJ0aWNhbE1hcmdp bjsKICAgICBMYXlvdXQ6OkNvbXB1dGVkSG9yaXpvbnRhbE1hcmdpbiBtX2hvcml6b250YWxDb21w dXRlZE1hcmdpbjsKLSAgICBib29sIG1faGFzQ2xlYXJhbmNlOworICAgIGJvb2wgbV9oYXNDbGVh cmFuY2UgeyBmYWxzZSB9OwogCiAgICAgTGF5b3V0OjpFZGdlcyBtX2JvcmRlcjsKICAgICBPcHRp b25hbDxMYXlvdXQ6OkVkZ2VzPiBtX3BhZGRpbmc7CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VM b2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNTI4MmVlNGIwNjAuLjBhNDkzZjg0ZmE1IDEwMDY0 NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MTIgQEAKKzIwMTktMDEtMjUgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAg ICAgICBbTEZDXVtCRkNdW01hcmdpbkNvbGxhcHNpbmddIEFkZCAiY2xlYXIiIHRvIHN0YXRpYyBw b3NpdGlvbiBjb21wdXRhdGlvbi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE5MzgyNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogTGF5b3V0UmVsb2FkZWQvbWlzYy9MRkMtcGFzc2luZy10ZXN0cy50eHQ6 CisKIDIwMTktMDEtMjQgIEZ1amlpIEhpcm9ub3JpICA8SGlyb25vcmkuRnVqaWlAc29ueS5jb20+ CiAKICAgICAgICAgW1dpbl1bV2ViS2l0VGVzdFJ1bm5lcl0gSW1wbGVtZW50IEV2ZW50U2VuZGVy UHJveHkKZGlmZiAtLWdpdCBhL1Rvb2xzL0xheW91dFJlbG9hZGVkL21pc2MvTEZDLXBhc3Npbmct dGVzdHMudHh0IGIvVG9vbHMvTGF5b3V0UmVsb2FkZWQvbWlzYy9MRkMtcGFzc2luZy10ZXN0cy50 eHQKaW5kZXggZTg1OTJiZDBlYjQuLjM5M2M3MTNlMTZlIDEwMDY0NAotLS0gYS9Ub29scy9MYXlv dXRSZWxvYWRlZC9taXNjL0xGQy1wYXNzaW5nLXRlc3RzLnR4dAorKysgYi9Ub29scy9MYXlvdXRS ZWxvYWRlZC9taXNjL0xGQy1wYXNzaW5nLXRlc3RzLnR4dApAQCAtMTMzLDYgKzEzMyw3IEBAIGZh c3QvYmxvY2svbWFyZ2luLWNvbGxhcHNlLzAyOS5odG1sCiBmYXN0L2Jsb2NrL21hcmdpbi1jb2xs YXBzZS8wMzUuaHRtbAogZmFzdC9ibG9jay9tYXJnaW4tY29sbGFwc2UvMDM5Lmh0bWwKIGZhc3Qv YmxvY2svbWFyZ2luLWNvbGxhcHNlLzA0MC5odG1sCitmYXN0L2Jsb2NrL21hcmdpbi1jb2xsYXBz ZS8wNDQuaHRtbAogZmFzdC9ibG9jay9wb3NpdGlvbmluZy8wMDMuaHRtbAogZmFzdC9ibG9jay9w b3NpdGlvbmluZy8wMDQuaHRtbAogZmFzdC9ibG9jay9wb3NpdGlvbmluZy8wMDUuaHRtbAo=