193719 2019-01-23 07:51:33 -0800 [LFC][BFC] computeStaticPosition should include estimated computation as well. 2019-01-23 08:30:29 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham commit-queue koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1497328 0 zalan 2019-01-23 07:51:33 -0800 float related estimations. 1497333 1 359886 zalan 2019-01-23 07:59:29 -0800 Created attachment 359886 Patch 1497349 2 359886 commit-queue 2019-01-23 08:29:59 -0800 Comment on attachment 359886 Patch Clearing flags on attachment: 359886 Committed r240337: <https://trac.webkit.org/changeset/240337> 1497350 3 commit-queue 2019-01-23 08:30:01 -0800 All reviewed patches have been landed. Closing bug. 1497351 4 webkit-bug-importer 2019-01-23 08:30:29 -0800 <rdar://problem/47481555> 359886 2019-01-23 07:59:29 -0800 2019-01-23 08:29:59 -0800 Patch bug-193719-20190123075922.patch text/plain 14883 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQwMjUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmVhZTc5ZjM5NTA2NmFm N2UyYzkwM2Q3NjI4MDQ5ODJkMjNmZGIyZC4uMTk0OTQ3M2MxYWY5YjQ3NzI4N2RjMTMyMTM1NGQ3 MGM1Njg0ZmYzNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDE5LTAxLTIzICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bQkZDXSBjb21wdXRl U3RhdGljUG9zaXRpb24gc2hvdWxkIGluY2x1ZGUgZXN0aW1hdGVkIGNvbXB1dGF0aW9uIGFzIHdl bGwuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTM3 MTkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDb25z b2xpZGF0ZSBhbGwgc3RhdGljIHBvc2l0aW9uIChub24tZXN0aW1hdGVkLCBlc3RpbWF0ZWQpIGNv bXB1dGF0aW9uIGluIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVTdGF0aWNQb3NpdGlv bi4KKyAgICAgICAgSXQgcmVxdWlyZXMgdG8gY29tcHV0ZSB3aWR0aC9ob3Jpem9udGFsIG1hcmdp biBmaXJzdCwgc2luY2UgdmVydGljYWwgdG9wIGVzdGltYXRpb24gbmVlZHMgdmFsaWQgaG9yaXpv bnRhbCB3aWR0aHMgKG1hcmdpbi10b3A6IDUlIGlzIGNvbXB1dGVkIHVzaW5nCisgICAgICAgIHRo ZSBjb250YWluaW5nIGJsb2NrJ3Mgd2lkdGgpLgorICAgICAgICBUaGlzIGlzIGFsc28gaW4gcHJl cGFyYXRpb24gZm9yIG1vdmluZyAnY2xlYXInIHBvc2l0aW9uaW5nIHRvIGNvbXB1dGVTdGF0aWNQ b3NpdGlvbi4KKworICAgICAgICAqIGxheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0 aW5nQ29udGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJsb2NrRm9ybWF0dGlu Z0NvbnRleHQ6OmxheW91dCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJsb2Nr Rm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dEZvcm1hdHRpbmdDb250ZXh0Um9vdCBjb25zdCk6Cisg ICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVT dGF0aWNQb3NpdGlvbiBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJsb2NrRm9y bWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVFc3RpbWF0ZWRWZXJ0aWNhbFBvc2l0aW9uIGNvbnN0KToK KyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0 ZUVzdGltYXRlZFZlcnRpY2FsUG9zaXRpb25Gb3JBbmNlc3RvcnMgY29uc3QpOgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpCbG9ja0Zvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlRXN0aW1hdGVk VmVydGljYWxQb3NpdGlvbkZvckZvcm1hdHRpbmdSb290IGNvbnN0KToKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dDo6QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUVzdGltYXRlZFZlcnRp Y2FsUG9zaXRpb25Gb3JGbG9hdENsZWFyIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZVZlcnRpY2FsUG9zaXRpb25Gb3JGbG9h dENsZWFyIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6QmxvY2tGb3JtYXR0aW5n Q29udGV4dDo6Y29tcHV0ZVdpZHRoQW5kTWFyZ2luIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6 OkxheW91dDo6QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUhlaWdodEFuZE1hcmdpbiBj b25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6 OmFkanVzdGVkVmVydGljYWxQb3NpdGlvbkFmdGVyTWFyZ2luQ29sbGFwc2luZyBjb25zdCk6Cisg ICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVF c3RpbWF0ZWRNYXJnaW5CZWZvcmUgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6 TGF5b3V0OjpCbG9ja0Zvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlRXN0aW1hdGVkTWFyZ2luQmVm b3JlRm9yQW5jZXN0b3JzIGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6cHJlY29tcHV0ZVZlcnRpY2FsUG9zaXRpb25Gb3JG b3JtYXR0aW5nUm9vdElmTmVlZGVkIGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKiBsYXlvdXQv YmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuaDoKKyAgICAgICAgKiBsYXlv dXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5 OjpzdGF0aWNQb3NpdGlvbik6CisgICAgICAgICogbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9j a01hcmdpbkNvbGxhcHNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6QmxvY2tGb3Jt YXR0aW5nQ29udGV4dDo6TWFyZ2luQ29sbGFwc2U6Om1hcmdpbkJlZm9yZUNvbGxhcHNlc1dpdGhG aXJzdEluRmxvd0NoaWxkTWFyZ2luQmVmb3JlKToKKwogMjAxOS0wMS0yMiAgWmFsYW4gQnVqdGFz ICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0Zsb2F0c10gRGVjb3VwbGUgY2xl YXJhbmNlIGNvbXB1dGF0aW9uIGFuZCBtYXJnaW4gY29sbGFwc2luZyByZXNldC4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5n Q29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2Nr Rm9ybWF0dGluZ0NvbnRleHQuY3BwCmluZGV4IDUzMTdkNzVjNjkwYjI4YWQwMGI0MWJkM2FjZjEx MTFmODI5ZWYxMzYuLmI3ZmFlNzIxM2U4YjgxODA5NzE2ZWU3ODU0MGY4MDdjMzNkNTU2NjcgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3Jt YXR0aW5nQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0 dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmNwcApAQCAtODgsOSArODgsOSBAQCB2b2lkIEJs b2NrRm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dCgpIGNvbnN0CiAgICAgICAgICAgICB9CiAKICAg ICAgICAgICAgIExPR19XSVRIX1NUUkVBTShGb3JtYXR0aW5nQ29udGV4dExheW91dCwgc3RyZWFt IDw8ICJbQ29tcHV0ZV0gLT4gW1Bvc2l0aW9uXVtCb3JkZXJdW1BhZGRpbmddW1dpZHRoXVtNYXJn aW5dIC0+IGZvciBsYXlvdXRCb3goIiA8PCAmbGF5b3V0Qm94IDw8ICIpIik7Ci0gICAgICAgICAg ICBjb21wdXRlU3RhdGljUG9zaXRpb24obGF5b3V0Qm94KTsKICAgICAgICAgICAgIGNvbXB1dGVC b3JkZXJBbmRQYWRkaW5nKGxheW91dEJveCk7CiAgICAgICAgICAgICBjb21wdXRlV2lkdGhBbmRN YXJnaW4obGF5b3V0Qm94KTsKKyAgICAgICAgICAgIGNvbXB1dGVTdGF0aWNQb3NpdGlvbihsYXlv dXRCb3gpOwogICAgICAgICAgICAgaWYgKCFpczxDb250YWluZXI+KGxheW91dEJveCkgfHwgIWRv d25jYXN0PENvbnRhaW5lcj4obGF5b3V0Qm94KS5oYXNJbkZsb3dPckZsb2F0aW5nQ2hpbGQoKSkK ICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIGxheW91dFF1ZXVlLmFwcGVuZChk b3duY2FzdDxDb250YWluZXI+KGxheW91dEJveCkuZmlyc3RJbkZsb3dPckZsb2F0aW5nQ2hpbGQo KSk7CkBAIC0xMjgsMTEgKzEyOCw5IEBAIHZvaWQgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6bGF5 b3V0Rm9ybWF0dGluZ0NvbnRleHRSb290KEZsb2F0aW5nQ29udGV4dCYgZmxvYXRpCiB7CiAgICAg Ly8gU3RhcnQgbGF5aW5nIG91dCB0aGlzIGZvcm1hdHRpbmcgcm9vdCBpbiB0aGUgZm9ybWF0dGlu ZyBjb250ZW54dCBpdCBsaXZlcyBpbi4KICAgICBMT0dfV0lUSF9TVFJFQU0oRm9ybWF0dGluZ0Nv bnRleHRMYXlvdXQsIHN0cmVhbSA8PCAiW0NvbXB1dGVdIC0+IFtQb3NpdGlvbl1bQm9yZGVyXVtQ YWRkaW5nXVtXaWR0aF1bTWFyZ2luXSAtPiBmb3IgbGF5b3V0Qm94KCIgPDwgJmxheW91dEJveCA8 PCAiKSIpOwotICAgIGNvbXB1dGVTdGF0aWNQb3NpdGlvbihsYXlvdXRCb3gpOwogICAgIGNvbXB1 dGVCb3JkZXJBbmRQYWRkaW5nKGxheW91dEJveCk7CiAgICAgY29tcHV0ZVdpZHRoQW5kTWFyZ2lu KGxheW91dEJveCk7Ci0KLSAgICBwcmVjb21wdXRlVmVydGljYWxQb3NpdGlvbkZvckZvcm1hdHRp bmdSb290SWZOZWVkZWQobGF5b3V0Qm94KTsKKyAgICBjb21wdXRlU3RhdGljUG9zaXRpb24obGF5 b3V0Qm94KTsKICAgICAvLyBTd2ljaCBvdmVyIHRvIHRoZSBuZXcgZm9ybWF0dGluZyBjb250ZXh0 ICh0aGUgb25lIHRoYXQgdGhlIHJvb3QgY3JlYXRlcykuCiAgICAgYXV0byBmb3JtYXR0aW5nQ29u dGV4dCA9IGxheW91dFN0YXRlKCkuY3JlYXRlRm9ybWF0dGluZ0NvbnRleHQobGF5b3V0Qm94KTsK ICAgICBmb3JtYXR0aW5nQ29udGV4dC0+bGF5b3V0KCk7CkBAIC0xODIsOSArMTgwLDEzIEBAIHZv aWQgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZVN0YXRpY1Bvc2l0aW9uKGNvbnN0IEJv eCYgbGF5b3V0Qm94KSBjb25zdAogewogICAgIGF1dG8mIGxheW91dFN0YXRlID0gdGhpcy0+bGF5 b3V0U3RhdGUoKTsKICAgICBsYXlvdXRTdGF0ZS5kaXNwbGF5Qm94Rm9yTGF5b3V0Qm94KGxheW91 dEJveCkuc2V0VG9wTGVmdChHZW9tZXRyeTo6c3RhdGljUG9zaXRpb24obGF5b3V0U3RhdGUsIGxh eW91dEJveCkpOworICAgIGlmIChsYXlvdXRCb3guaGFzRmxvYXRDbGVhcigpKQorICAgICAgICBj b21wdXRlRXN0aW1hdGVkVmVydGljYWxQb3NpdGlvbkZvckZsb2F0Q2xlYXIobGF5b3V0Qm94KTsK KyAgICBlbHNlIGlmIChsYXlvdXRCb3guZXN0YWJsaXNoZXNGb3JtYXR0aW5nQ29udGV4dCgpKQor ICAgICAgICBjb21wdXRlRXN0aW1hdGVkVmVydGljYWxQb3NpdGlvbkZvckZvcm1hdHRpbmdSb290 KGxheW91dEJveCk7CiB9CiAKLXZvaWQgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUVz dGltYXRlZE1hcmdpbkJlZm9yZShjb25zdCBCb3gmIGxheW91dEJveCkgY29uc3QKK3ZvaWQgQmxv Y2tGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUVzdGltYXRlZFZlcnRpY2FsUG9zaXRpb24oY29u c3QgQm94JiBsYXlvdXRCb3gpIGNvbnN0CiB7CiAgICAgYXV0byYgbGF5b3V0U3RhdGUgPSB0aGlz LT5sYXlvdXRTdGF0ZSgpOwogICAgIGF1dG8gZXN0aW1hdGVkTWFyZ2luQmVmb3JlID0gTWFyZ2lu Q29sbGFwc2U6OmVzdGltYXRlZE1hcmdpbkJlZm9yZShsYXlvdXRTdGF0ZSwgbGF5b3V0Qm94KTsK QEAgLTE5NCwxMyArMTk2LDE0IEBAIHZvaWQgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0 ZUVzdGltYXRlZE1hcmdpbkJlZm9yZShjb25zdCBCb3gmIGxheW91dEJveCkKICAgICBhdXRvIG5v bkNvbGxhcHNlZFZhbHVlcyA9IFVzZWRWZXJ0aWNhbE1hcmdpbjo6Tm9uQ29sbGFwc2VkVmFsdWVz IHsgZXN0aW1hdGVkTWFyZ2luQmVmb3JlLm5vbkNvbGxhcHNlZFZhbHVlLCB7IH0gfTsKICAgICBh dXRvIGNvbGxhcHNlZFZhbHVlcyA9IFVzZWRWZXJ0aWNhbE1hcmdpbjo6Q29sbGFwc2VkVmFsdWVz IHsgZXN0aW1hdGVkTWFyZ2luQmVmb3JlLmNvbGxhcHNlZFZhbHVlLCB7IH0sIGVzdGltYXRlZE1h cmdpbkJlZm9yZS5pc0NvbGxhcHNlZFRocm91Z2ggfTsKICAgICBhdXRvIHZlcnRpY2FsTWFyZ2lu ID0gVXNlZFZlcnRpY2FsTWFyZ2luIHsgbm9uQ29sbGFwc2VkVmFsdWVzLCBjb2xsYXBzZWRWYWx1 ZXMgfTsKKyAgICBkaXNwbGF5Qm94LnNldFZlcnRpY2FsTWFyZ2luKHZlcnRpY2FsTWFyZ2luKTsK ICAgICBkaXNwbGF5Qm94LnNldFRvcChhZGp1c3RlZFZlcnRpY2FsUG9zaXRpb25BZnRlck1hcmdp bkNvbGxhcHNpbmcobGF5b3V0Qm94LCB2ZXJ0aWNhbE1hcmdpbikpOwogI2lmICFBU1NFUlRfRElT QUJMRUQKICAgICBkaXNwbGF5Qm94LnNldEhhc0VzdGltYXRlZE1hcmdpbkJlZm9yZSgpOwogI2Vu ZGlmCiB9CiAKLXZvaWQgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUVzdGltYXRlZE1h cmdpbkJlZm9yZUZvckFuY2VzdG9ycyhjb25zdCBCb3gmIGxheW91dEJveCkgY29uc3QKK3ZvaWQg QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUVzdGltYXRlZFZlcnRpY2FsUG9zaXRpb25G b3JBbmNlc3RvcnMoY29uc3QgQm94JiBsYXlvdXRCb3gpIGNvbnN0CiB7CiAgICAgLy8gV2Ugb25s eSBuZWVkIHRvIGVzdGltYXRlIG1hcmdpbiB0b3AgZm9yIGZsb2F0IHJlbGF0ZWQgbGF5b3V0IChm b3JtYXR0aW5nIGNvbnRleHQgcm9vdHMgYXZvaWQgZmxvYXRzKS4KICAgICBBU1NFUlQobGF5b3V0 Qm94LmlzRmxvYXRpbmdQb3NpdGlvbmVkKCkgfHwgbGF5b3V0Qm94Lmhhc0Zsb2F0Q2xlYXIoKSB8 fCBsYXlvdXRCb3guZXN0YWJsaXNoZXNCbG9ja0Zvcm1hdHRpbmdDb250ZXh0KCkgfHwgbGF5b3V0 Qm94LmVzdGFibGlzaGVzSW5saW5lRm9ybWF0dGluZ0NvbnRleHQoKSk7CkBAIC0yMTMsMzMgKzIx NiwzNyBAQCB2b2lkIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVFc3RpbWF0ZWRNYXJn aW5CZWZvcmVGb3JBbmNlc3RvcnMoY29uc3QgQm94JgogICAgIC8vIChhbmQgdGhlIGhlaWdodCBt aWdodCBiZSBiYXNlZCBvbiB0aGUgY29udGVudCkuCiAgICAgLy8gU28gd2hlbiB3ZSBnZXQgdG8g dGhlIHBvaW50IHdoZXJlIHdlIGludGVyc2VjdCB0aGUgYm94IHdpdGggdGhlIGZsb2F0IHRvIGRl Y2lkZSBpZiB0aGUgYm94IG5lZWRzIHRvIG1vdmUsIHdlIGRvbid0IHlldCBoYXZlIHRoZSBmaW5h bCB2ZXJ0aWNhbCBwb3NpdGlvbi4KICAgICAvLwotICAgIC8vIFRoZSBpZGVhIGhlcmUgaXMgdGhh dCBhcyBsb25nIGFzIHdlIGRvbid0IGNyb3NzIHRoZSBibG9jayBmb3JtYXR0aW5nIGNvbnRleHQg Ym91bmRhcnksIHdlIHNob3VsZCBiZSBhYmxlIHRvIHByZS1jb21wdXRlIHRoZSBmaW5hbCB0b3Ag bWFyZ2luLgorICAgIC8vIFRoZSBpZGVhIGhlcmUgaXMgdGhhdCBhcyBsb25nIGFzIHdlIGRvbid0 IGNyb3NzIHRoZSBibG9jayBmb3JtYXR0aW5nIGNvbnRleHQgYm91bmRhcnksIHdlIHNob3VsZCBi ZSBhYmxlIHRvIHByZS1jb21wdXRlIHRoZSBmaW5hbCB0b3AgcG9zaXRpb24uCiAgICAgZm9yIChh dXRvKiBhbmNlc3RvciA9IGxheW91dEJveC5jb250YWluaW5nQmxvY2soKTsgYW5jZXN0b3IgJiYg IWFuY2VzdG9yLT5lc3RhYmxpc2hlc0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQoKTsgYW5jZXN0b3Ig PSBhbmNlc3Rvci0+Y29udGFpbmluZ0Jsb2NrKCkpIHsKICAgICAgICAgLy8gRklYTUU6IHdpdGgg aW5jcmVtZW50YWwgbGF5b3V0LCB3ZSBtaWdodCBhY3R1YWxseSBoYXZlIGEgdmFsaWQgKG5vbi1l c3RpbWF0ZWQpIG1hcmdpbiB0b3AgYXMgd2VsbC4KICAgICAgICAgaWYgKGhhc0VzdGltYXRlZE1h cmdpbkJlZm9yZSgqYW5jZXN0b3IpKQogICAgICAgICAgICAgcmV0dXJuOwotCi0gICAgICAgIGNv bXB1dGVFc3RpbWF0ZWRNYXJnaW5CZWZvcmUoKmFuY2VzdG9yKTsKKyAgICAgICAgY29tcHV0ZUVz dGltYXRlZFZlcnRpY2FsUG9zaXRpb24oKmFuY2VzdG9yKTsKICAgICB9CiB9CiAKLXZvaWQgQmxv Y2tGb3JtYXR0aW5nQ29udGV4dDo6cHJlY29tcHV0ZVZlcnRpY2FsUG9zaXRpb25Gb3JGb3JtYXR0 aW5nUm9vdElmTmVlZGVkKGNvbnN0IEJveCYgbGF5b3V0Qm94KSBjb25zdAordm9pZCBCbG9ja0Zv cm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlRXN0aW1hdGVkVmVydGljYWxQb3NpdGlvbkZvckZvcm1h dHRpbmdSb290KGNvbnN0IEJveCYgbGF5b3V0Qm94KSBjb25zdAogewogICAgIEFTU0VSVChsYXlv dXRCb3guZXN0YWJsaXNoZXNGb3JtYXR0aW5nQ29udGV4dCgpKTsKKyAgICBBU1NFUlQoIWxheW91 dEJveC5oYXNGbG9hdENsZWFyKCkpOwogCi0gICAgYXV0byBhdm9pZHNGbG9hdHMgPSBsYXlvdXRC b3guaXNGbG9hdGluZ1Bvc2l0aW9uZWQoKSB8fCBsYXlvdXRCb3guZXN0YWJsaXNoZXNCbG9ja0Zv cm1hdHRpbmdDb250ZXh0KCkgfHwgbGF5b3V0Qm94Lmhhc0Zsb2F0Q2xlYXIoKTsKKyAgICBhdXRv IGF2b2lkc0Zsb2F0cyA9IGxheW91dEJveC5pc0Zsb2F0aW5nUG9zaXRpb25lZCgpIHx8IGxheW91 dEJveC5lc3RhYmxpc2hlc0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQoKTsKICAgICBpZiAoYXZvaWRz RmxvYXRzKQotICAgICAgICBjb21wdXRlRXN0aW1hdGVkTWFyZ2luQmVmb3JlRm9yQW5jZXN0b3Jz KGxheW91dEJveCk7CisgICAgICAgIGNvbXB1dGVFc3RpbWF0ZWRWZXJ0aWNhbFBvc2l0aW9uRm9y QW5jZXN0b3JzKGxheW91dEJveCk7CiAKICAgICAvLyBJZiB0aGUgaW5saW5lIGZvcm1hdHRpbmcg cm9vdCBpcyBhbHNvIHRoZSByb290IGZvciB0aGUgZmxvYXRzIChoYXBwZW5zIHdoZW4gdGhlIHJv b3QgYm94IGFsc28gZXN0YWJsaXNoZXMgYSBibG9jayBmb3JtYXR0aW5nIGNvbnRleHQpCiAgICAg Ly8gdGhlIGZsb2F0cyBhcmUgaW4gdGhlIGNvb3JkaW5hdGUgc3lzdGVtIG9mIHRoaXMgcm9vdC4g Tm8gbmVlZCB0byBmaW5kIHRoZSBmaW5hbCB2ZXJ0aWNhbCBwb3NpdGlvbi4KICAgICBhdXRvIGlu bGluZUNvbnRleHRJbmhlcml0c0Zsb2F0cyA9IGxheW91dEJveC5lc3RhYmxpc2hlc0lubGluZUZv cm1hdHRpbmdDb250ZXh0KCkgJiYgIWxheW91dEJveC5lc3RhYmxpc2hlc0Jsb2NrRm9ybWF0dGlu Z0NvbnRleHQoKTsKICAgICBpZiAoaW5saW5lQ29udGV4dEluaGVyaXRzRmxvYXRzKSB7Ci0gICAg ICAgIGNvbXB1dGVFc3RpbWF0ZWRNYXJnaW5CZWZvcmUobGF5b3V0Qm94KTsKLSAgICAgICAgY29t cHV0ZUVzdGltYXRlZE1hcmdpbkJlZm9yZUZvckFuY2VzdG9ycyhsYXlvdXRCb3gpOworICAgICAg ICBjb21wdXRlRXN0aW1hdGVkVmVydGljYWxQb3NpdGlvbihsYXlvdXRCb3gpOworICAgICAgICBj b21wdXRlRXN0aW1hdGVkVmVydGljYWxQb3NpdGlvbkZvckFuY2VzdG9ycyhsYXlvdXRCb3gpOwog ICAgIH0KIH0KIAordm9pZCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlRXN0aW1hdGVk VmVydGljYWxQb3NpdGlvbkZvckZsb2F0Q2xlYXIoY29uc3QgQm94JikgY29uc3QKK3sKK30KKwog I2lmbmRlZiBOREVCVUcKIGJvb2wgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6aGFzUHJlY29tcHV0 ZWRNYXJnaW5CZWZvcmUoY29uc3QgQm94JiBsYXlvdXRCb3gpIGNvbnN0CiB7CkBAIC0yOTMsNyAr MzAwLDcgQEAgdm9pZCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlVmVydGljYWxQb3Np dGlvbkZvckZsb2F0Q2xlYXIoY29uc3QgRmxvYXRpbmcKIAogICAgIC8vIEZvciBmb3JtYXR0aW5n IHJvb3RzLCB3ZSBhbHJlYWR5IHByZWNvbXB1dGVkIGZpbmFsIHBvc2l0aW9uLgogICAgIGlmICgh bGF5b3V0Qm94LmVzdGFibGlzaGVzRm9ybWF0dGluZ0NvbnRleHQoKSkKLSAgICAgICAgY29tcHV0 ZUVzdGltYXRlZE1hcmdpbkJlZm9yZUZvckFuY2VzdG9ycyhsYXlvdXRCb3gpOworICAgICAgICBj b21wdXRlRXN0aW1hdGVkVmVydGljYWxQb3NpdGlvbkZvckFuY2VzdG9ycyhsYXlvdXRCb3gpOwog ICAgIEFTU0VSVChoYXNQcmVjb21wdXRlZE1hcmdpbkJlZm9yZShsYXlvdXRCb3gpKTsKIAogICAg IC8vIDEuIENvbXB1dGUgYW5kIGFkanVzdCB0aGUgdmVydGljYWwgcG9zaXRpb24gd2l0aCBjbGVh cmFuY2UuCkBAIC0zNjUsNyArMzcyLDYgQEAgdm9pZCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0Ojpj b21wdXRlV2lkdGhBbmRNYXJnaW4oY29uc3QgQm94JiBsYXlvdXRCb3gpIGNvbnN0CiAKICAgICBh dXRvJiBkaXNwbGF5Qm94ID0gbGF5b3V0U3RhdGUuZGlzcGxheUJveEZvckxheW91dEJveChsYXlv dXRCb3gpOwogICAgIGRpc3BsYXlCb3guc2V0Q29udGVudEJveFdpZHRoKHdpZHRoQW5kTWFyZ2lu LndpZHRoKTsKLSAgICBkaXNwbGF5Qm94Lm1vdmVIb3Jpem9udGFsbHkod2lkdGhBbmRNYXJnaW4u dXNlZE1hcmdpbi5zdGFydCk7CiAgICAgZGlzcGxheUJveC5zZXRIb3Jpem9udGFsTWFyZ2luKHdp ZHRoQW5kTWFyZ2luLnVzZWRNYXJnaW4pOwogICAgIGRpc3BsYXlCb3guc2V0SG9yaXpvbnRhbENv bXB1dGVkTWFyZ2luKHdpZHRoQW5kTWFyZ2luLmNvbXB1dGVkTWFyZ2luKTsKIH0KQEAgLTQwNiw3 ICs0MTIsNyBAQCB2b2lkIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVIZWlnaHRBbmRN YXJnaW4oY29uc3QgQm94JiBsYXlvdXRCb3gpIGNvbnN0CiAgICAgfQogCiAgICAgLy8gMS4gQ29t cHV0ZSBjb2xsYXBzZWQgbWFyZ2lucy4KLSAgICAvLyAyLiBBZGp1c3QgdmVydGljYWwgcG9zaXRp b24gdXNpbmcgdGhlIGNvbGxhcGVkIHZhbHVlcworICAgIC8vIDIuIEFkanVzdCB2ZXJ0aWNhbCBw b3NpdGlvbiB1c2luZyB0aGUgY29sbGFwc2VkIHZhbHVlcwogICAgIC8vIDMuIEFkanVzdCBwcmV2 aW91cyBpbi1mbG93IHNpYmxpbmcgbWFyZ2luIGFmdGVyIHVzaW5nIHRoaXMgbWFyZ2luLgogICAg IGF1dG8gY29sbGFwc2VkTWFyZ2luID0gTWFyZ2luQ29sbGFwc2U6OmNvbGxhcHNlZFZlcnRpY2Fs VmFsdWVzKGxheW91dFN0YXRlLCBsYXlvdXRCb3gsIGhlaWdodEFuZE1hcmdpbi5ub25Db2xsYXBz ZWRNYXJnaW4pOwogICAgIGF1dG8gdmVydGljYWxNYXJnaW4gPSBVc2VkVmVydGljYWxNYXJnaW4g eyBoZWlnaHRBbmRNYXJnaW4ubm9uQ29sbGFwc2VkTWFyZ2luLCBjb2xsYXBzZWRNYXJnaW4gfTsK QEAgLTQ5OSw3ICs1MDUsNyBAQCBMYXlvdXRVbml0IEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6OmFk anVzdGVkVmVydGljYWxQb3NpdGlvbkFmdGVyTWFyZ2luQ29sbGFwc2luZwogewogICAgIEFTU0VS VCghbGF5b3V0Qm94LmlzT3V0T2ZGbG93UG9zaXRpb25lZCgpKTsKICAgICAvLyBOb3cgdGhhdCB3 ZSd2ZSBjb21wdXRlZCB0aGUgZmluYWwgbWFyZ2luIGJlZm9yZSwgbGV0J3Mgc2hpZnQgdGhlIGJv eCdzIHZlcnRpY2FsIHBvc2l0aW9uLgotICAgIC8vIDEuIENoZWNrIGlmIHRoZSBtYXJnaW4gYmVm b3JlIGNvbGxhcHNlcyB3aXRoIHRoZSBwcmV2aW91cyBib3gncyBtYXJnaW4gYWZ0ZXIuIGlmIG5v dCAtPiByZXR1cm4gcHJldmlvdXMgYm94J3MgYm90dG9tIGlubGN1ZGluZyBtYXJnaW4gYWZ0ZXIg KyBtYXJnaW5CZWZvcmUKKyAgICAvLyAxLiBDaGVjayBpZiB0aGUgbWFyZ2luIGJlZm9yZSBjb2xs YXBzZXMgd2l0aCB0aGUgcHJldmlvdXMgYm94J3MgbWFyZ2luIGFmdGVyLiBpZiBub3QgLT4gcmV0 dXJuIHByZXZpb3VzIGJveCdzIGJvdHRvbSBpbmNsdWRpbmcgbWFyZ2luIGFmdGVyICsgbWFyZ2lu QmVmb3JlCiAgICAgLy8gMi4gQ2hlY2sgaWYgdGhlIHByZXZpb3VzIGJveCdzIG1hcmdpbnMgY29s bGFwc2UgdGhyb3VnaC4gSWYgbm90IC0+IHJldHVybiBwcmV2aW91cyBib3gnIGJvdHRvbSBleGNs dWRpbmcgbWFyZ2luIGFmdGVyICsgbWFyZ2luQmVmb3JlICh0aGV5IGFyZSBzdXBwb3NlZCB0byBi ZSBlcXVhbCkKICAgICAvLyAzLiBHbyB0byBwcmV2aW91cyBib3ggYW5kIHN0YXJ0IGZyb20gc3Rl cCAjMSB1bnRpbCB3ZSBoaXQgdGhlIHBhcmVudCBib3guCiAgICAgYXV0byYgbGF5b3V0U3RhdGUg PSB0aGlzLT5sYXlvdXRTdGF0ZSgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmggYi9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuaAppbmRleCBm OThlZjJjMWI1ZTEwZmIwNzNhMTBjMThlZjliNzMwYTgwMzVhMzZkLi5jM2U1OGYzMmE5MzY1OTUx Y2M3MjQwMWVlZmM5YzMwMDljMzZkYzdkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuaApA QCAtNjMsMTAgKzYzLDEwIEBAIHByaXZhdGU6CiAgICAgdm9pZCBjb21wdXRlUG9zaXRpb25Ub0F2 b2lkRmxvYXRzKGNvbnN0IEZsb2F0aW5nQ29udGV4dCYsIGNvbnN0IEJveCYpIGNvbnN0OwogICAg IHZvaWQgY29tcHV0ZVZlcnRpY2FsUG9zaXRpb25Gb3JGbG9hdENsZWFyKGNvbnN0IEZsb2F0aW5n Q29udGV4dCYsIGNvbnN0IEJveCYpIGNvbnN0OwogCi0gICAgdm9pZCBjb21wdXRlRXN0aW1hdGVk TWFyZ2luQmVmb3JlRm9yQW5jZXN0b3JzKGNvbnN0IEJveCYpIGNvbnN0OwotICAgIHZvaWQgY29t cHV0ZUVzdGltYXRlZE1hcmdpbkJlZm9yZShjb25zdCBCb3gmKSBjb25zdDsKLQotICAgIHZvaWQg cHJlY29tcHV0ZVZlcnRpY2FsUG9zaXRpb25Gb3JGb3JtYXR0aW5nUm9vdElmTmVlZGVkKGNvbnN0 IEJveCYpIGNvbnN0OworICAgIHZvaWQgY29tcHV0ZUVzdGltYXRlZFZlcnRpY2FsUG9zaXRpb24o Y29uc3QgQm94JikgY29uc3Q7CisgICAgdm9pZCBjb21wdXRlRXN0aW1hdGVkVmVydGljYWxQb3Np dGlvbkZvckFuY2VzdG9ycyhjb25zdCBCb3gmKSBjb25zdDsKKyAgICB2b2lkIGNvbXB1dGVFc3Rp bWF0ZWRWZXJ0aWNhbFBvc2l0aW9uRm9yRm9ybWF0dGluZ1Jvb3QoY29uc3QgQm94JikgY29uc3Q7 CisgICAgdm9pZCBjb21wdXRlRXN0aW1hdGVkVmVydGljYWxQb3NpdGlvbkZvckZsb2F0Q2xlYXIo Y29uc3QgQm94JikgY29uc3Q7CiAKICAgICBJbnN0cmluc2ljV2lkdGhDb25zdHJhaW50cyBpbnN0 cmluc2ljV2lkdGhDb25zdHJhaW50cygpIGNvbnN0IG92ZXJyaWRlOwogICAgIExheW91dFVuaXQg YWRqdXN0ZWRWZXJ0aWNhbFBvc2l0aW9uQWZ0ZXJNYXJnaW5Db2xsYXBzaW5nKGNvbnN0IEJveCYs IGNvbnN0IFVzZWRWZXJ0aWNhbE1hcmdpbiYpIGNvbnN0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0 cnkuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1h dHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCmluZGV4IGY2OGRkYTNjYmQzMTdlZDgwMTQxMDQxOGI4 YWQ3Y2E0OTdiNWNkMTguLjY3N2EwZWIxYjg1NTQzNGQ2ZmQwMzc2MTc1ODE3MTRlNTIzZjZmNDAg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tG b3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv YmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAKQEAgLTIz Niw3ICsyMzYsNyBAQCBQb2ludCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6c3Rh dGljUG9zaXRpb24oY29uc3QgTGF5b3V0U3RhdGUmIGxheW91dAogICAgIH0gZWxzZQogICAgICAg ICB0b3AgPSBjb250YWluaW5nQmxvY2tEaXNwbGF5Qm94LmNvbnRlbnRCb3hUb3AoKTsKIAotICAg IGF1dG8gbGVmdCA9IGNvbnRhaW5pbmdCbG9ja0Rpc3BsYXlCb3guY29udGVudEJveExlZnQoKTsK KyAgICBhdXRvIGxlZnQgPSBjb250YWluaW5nQmxvY2tEaXNwbGF5Qm94LmNvbnRlbnRCb3hMZWZ0 KCkgKyBsYXlvdXRTdGF0ZS5kaXNwbGF5Qm94Rm9yTGF5b3V0Qm94KGxheW91dEJveCkubWFyZ2lu U3RhcnQoKTsKICAgICBMT0dfV0lUSF9TVFJFQU0oRm9ybWF0dGluZ0NvbnRleHRMYXlvdXQsIHN0 cmVhbSA8PCAiW1Bvc2l0aW9uXSAtPiBzdGF0aWMgLT4gdG9wKCIgPDwgdG9wIDw8ICJweCkgbGVm dCgiIDw8IGxlZnQgPDwgInB4KSBsYXlvdXRCb3goIiA8PCAmbGF5b3V0Qm94IDw8ICIpIik7CiAg ICAgcmV0dXJuIHsgbGVmdCwgdG9wIH07CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrTWFyZ2luQ29sbGFwc2UuY3BwIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja01hcmdpbkNvbGxhcHNlLmNwcAppbmRl eCAyZWYzNGRmNWE0YzIxMjdlMWUxY2NmMjUxOTA0ZWMzOGY3OWUzMmVkLi44Yzg5M2NlOGU3ZGUw NzI1NmI1MzEwMmNkYzYyN2MwZTUxYjU2MmE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrTWFyZ2luQ29sbGFwc2UuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tNYXJnaW5Db2xsYXBzZS5jcHAK QEAgLTE4NywxMCArMTg3LDYgQEAgYm9vbCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpNYXJnaW5D b2xsYXBzZTo6bWFyZ2luQmVmb3JlQ29sbGFwc2VzV2l0aEZpcnN0SW5GbG8KICAgICBpZiAoZXN0 YWJsaXNoZXNCbG9ja0Zvcm1hdHRpbmdDb250ZXh0KGxheW91dEJveCkpCiAgICAgICAgIHJldHVy biBmYWxzZTsKIAotICAgIC8vIE1hcmdpbnMgb2YgZWxlbWVudHMgdGhhdCBlc3RhYmxpc2ggbmV3 IGJsb2NrIGZvcm1hdHRpbmcgY29udGV4dHMgZG8gbm90IGNvbGxhcHNlIHdpdGggdGhlaXIgaW4t ZmxvdyBjaGlsZHJlbi4KLSAgICBpZiAoZXN0YWJsaXNoZXNCbG9ja0Zvcm1hdHRpbmdDb250ZXh0 KGxheW91dEJveCkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQogICAgIC8vIFRoZSB0b3AgbWFy Z2luIG9mIGFuIGluLWZsb3cgYmxvY2sgZWxlbWVudCBjb2xsYXBzZXMgd2l0aCBpdHMgZmlyc3Qg aW4tZmxvdyBibG9jay1sZXZlbAogICAgIC8vIGNoaWxkJ3MgdG9wIG1hcmdpbiBpZiB0aGUgZWxl bWVudCBoYXMgbm8gdG9wIGJvcmRlci4uLgogICAgIGlmIChoYXNCb3JkZXJCZWZvcmUobGF5b3V0 Qm94KSkK