234346 2021-12-15 08:32:48 -0800 [LFC][IFC] Use the physical margin/border/padding values for inline boxes when generating the display content 2021-12-15 10:12:35 -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 1824365 0 zalan 2021-12-15 08:32:48 -0800 ssia 1824378 1 447240 zalan 2021-12-15 09:03:24 -0800 Created attachment 447240 Patch 1824381 2 447241 zalan 2021-12-15 09:18:29 -0800 Created attachment 447241 Patch 1824417 3 ews-feeder 2021-12-15 10:11:04 -0800 Committed r287083 (245278@main): <https://commits.webkit.org/245278@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 447241. 1824418 4 webkit-bug-importer 2021-12-15 10:12:35 -0800 <rdar://problem/86530291> 447240 2021-12-15 09:03:24 -0800 2021-12-15 09:18:27 -0800 Patch bug-234346-20211215090324.patch text/plain 7093 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3MDYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmI3OTRhOGMwYTUzMGVh MGUwNWJkODU0ZTk5ZmNhODQwNmYyMWYzYi4uYzIzMDBmZWY1MTYzZmQ4ZTQwMDA1YmFlZmQxYTI3 ZDZiODYzMTA1MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDIxLTEyLTE1ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIFVzZSB0aGUg cGh5c2ljYWwgbWFyZ2luL2JvcmRlci9wYWRkaW5nIHZhbHVlcyBmb3IgaW5saW5lIGJveGVzIHdo ZW4gZ2VuZXJhdGluZyB0aGUgZGlzcGxheSBjb250ZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzQzNDYKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBEaXNwbGF5IGNvbnRlbnQgaXMgYWx3YXlzIGJhc2Vk IG9uIHZpc3VhbCBvcmRlci4gV2hlbiB3ZSBjb25zdHJ1Y3QgdGhlIGRpc3BsYXkgYm94ZXMKKyAg ICAgICAgICAtIHdlIHZpc2l0IHRoZSBsaW5lIHJ1bnMgaW4gdmlzdWFsIG9yZGVyCisgICAgICAg ICAgLSB3ZSBtYWtlIHNwYWNlIGZvciBtYXJnaW4vYm9yZGVyL3BhZGRpbmcgYnkgbG9va2luZyBh dCB0aGUgcGh5c2ljYWwgc2lkZXMgb2YgdGhlIGNvbnRlbnQgCisgICAgICAgIFRoZSB2aXN1YWxs eSBmaXJzdCBib3ggbWF5IHZlcnkgd2VsbCBiZSBsb2dpY2FsbHkgdGhlIGxhc3QgYW5kIHRoaXMg Zmlyc3QgYm94J3MgbGVmdCBzaWRlIChhZ2FpbiwgdmlzdWFsbHkpCisgICAgICAgIG1heSByZWZl ciB0byB0aGUgbG9naWNhbCBzdGFydC9lbmQgdmFsdWVzIGRlcGVuZGluZyBvbiB0aGUgaW5saW5l IGF4aXMgZGlyZWN0aW9uLiAKKworICAgICAgICBFLmcgaW4gY2FzZSBvZiByaWdodCB0byBsZWZ0 IGlubGluZSBkaXJlY3Rpb24sIHRoZSBib3JkZXItaW5saW5lLWVuZCB2YWx1ZSBvZiBhbiBpbmxp bmUgYm94IHNob3VsZCBiZSB1c2UgYXMgdGhlCisgICAgICAgICJ2aXN1YWxseSBmaXJzdCIgYm9y ZGVyIG9uIHRoZSBsZWZ0IHNpZGUgb2YgdGhlIGlubGluZSBib3ggY29udGVudC4gICAKKworICAg ICAgICBJdCBtZWFucyB0aGF0CisgICAgICAgICAtIHBoeXNpY2FsIHZhbHVlcyBhcmUgdXNlZCB3 aGVuIGNyZWF0aW5nIHRoZSBkaXNwbGF5IHZhbHVlcworICAgICAgICAgLSBhbmQgbG9naWNhbCB2 YWx1ZXMgYXJlIHVzZWQgdGhyb3VnaG91dCB0aGUgbGF5b3V0CisgICAgICAgIHdoaWNoIGluIHBy YWN0aWNlIG1lYW5zIHRoYXQgaXNMZWZ0VG9SaWdodERpcmVjdGlvbiBjaGVjayBzaG91bGQgb25s eSBoYXBwZW4gYmVmb3JlIGFuZCBhZnRlciBsYXlvdXQKKyAgICAgICAgKHBoeXNpY2FsIC0+IGxv Z2ljYWwgYW5kIGxvZ2ljYWwgLT4gcGh5c2ljYWwgcmVzcGVjdGl2ZWx5KSBidXQgbmV2ZXIgZHVy aW5nIGxheW91dC4KKworICAgICAgICAqIGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5l L0lubGluZURpc3BsYXlDb250ZW50QnVpbGRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlv dXQ6Om1hcmdpbkxlZnQpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjptYXJnaW5SaWdodCk6 CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OmJvcmRlckxlZnQpOgorICAgICAgICAoV2ViQ29y ZTo6TGF5b3V0Ojpib3JkZXJSaWdodCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OnBhZGRp bmdMZWZ0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6cGFkZGluZ1JpZ2h0KToKKyAgICAg ICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjphZGp1c3RW aXN1YWxHZW9tZXRyeUZvckRpc3BsYXlCb3gpOgorCiAyMDIxLTEyLTE0ICBKZWFuLVl2ZXMgQXZl bmFyZCAgPGp5YUBhcHBsZS5jb20+CiAKICAgICAgICAgU291cmNlQnVmZmVyUGFyc2VyIHNob3Vs ZCBiZSB1c2luZyBjb250aWd1b3VzIFNoYXJlZEJ1ZmZlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRGlzcGxheUNvbnRl bnRCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMv aW5saW5lL0lubGluZURpc3BsYXlDb250ZW50QnVpbGRlci5jcHAKaW5kZXggYTBmNDlkOGU2YTJh MzFiM2Q5MzJlZDBlZTI0ODUwNzI5YjY2NmUxNi4uNmE5MzJlNjgxYzliNTViN2E3MTE5NDZhOTM5 Y2ZlN2ZiYTBmMTAzNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRp bmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVEaXNw bGF5Q29udGVudEJ1aWxkZXIuY3BwCkBAIC00MSw2ICs0MSwzNiBAQCB1c2luZyBXVEY6OlJhbmdl OwogbmFtZXNwYWNlIFdlYkNvcmUgewogbmFtZXNwYWNlIExheW91dCB7CiAKK3N0YXRpYyBpbmxp bmUgTGF5b3V0VW5pdCBtYXJnaW5MZWZ0KGNvbnN0IExheW91dDo6Qm94R2VvbWV0cnkmIGJveEdl b21ldHJ5LCBib29sIGlzTGVmdFRvUmlnaHREaXJlY3Rpb24pCit7CisgICAgcmV0dXJuIGlzTGVm dFRvUmlnaHREaXJlY3Rpb24gPyBib3hHZW9tZXRyeS5tYXJnaW5TdGFydCgpIDogYm94R2VvbWV0 cnkubWFyZ2luRW5kKCk7Cit9CisKK3N0YXRpYyBpbmxpbmUgTGF5b3V0VW5pdCBtYXJnaW5SaWdo dChjb25zdCBMYXlvdXQ6OkJveEdlb21ldHJ5JiBib3hHZW9tZXRyeSwgYm9vbCBpc0xlZnRUb1Jp Z2h0RGlyZWN0aW9uKQoreworICAgIHJldHVybiBpc0xlZnRUb1JpZ2h0RGlyZWN0aW9uID8gYm94 R2VvbWV0cnkubWFyZ2luRW5kKCkgOiBib3hHZW9tZXRyeS5tYXJnaW5TdGFydCgpOworfQorCitz dGF0aWMgaW5saW5lIExheW91dFVuaXQgYm9yZGVyTGVmdChjb25zdCBMYXlvdXQ6OkJveEdlb21l dHJ5JiBib3hHZW9tZXRyeSwgYm9vbCBpc0xlZnRUb1JpZ2h0RGlyZWN0aW9uKQoreworICAgIHJl dHVybiBpc0xlZnRUb1JpZ2h0RGlyZWN0aW9uID8gYm94R2VvbWV0cnkuYm9yZGVyU3RhcnQoKSA6 IGJveEdlb21ldHJ5LmJvcmRlckVuZCgpOworfQorCitzdGF0aWMgaW5saW5lIExheW91dFVuaXQg Ym9yZGVyUmlnaHQoY29uc3QgTGF5b3V0OjpCb3hHZW9tZXRyeSYgYm94R2VvbWV0cnksIGJvb2wg aXNMZWZ0VG9SaWdodERpcmVjdGlvbikKK3sKKyAgICByZXR1cm4gaXNMZWZ0VG9SaWdodERpcmVj dGlvbiA/IGJveEdlb21ldHJ5LmJvcmRlckVuZCgpIDogYm94R2VvbWV0cnkuYm9yZGVyU3RhcnQo KTsKK30KKworc3RhdGljIGlubGluZSBMYXlvdXRVbml0IHBhZGRpbmdMZWZ0KGNvbnN0IExheW91 dDo6Qm94R2VvbWV0cnkmIGJveEdlb21ldHJ5LCBib29sIGlzTGVmdFRvUmlnaHREaXJlY3Rpb24p Cit7CisgICAgcmV0dXJuIGlzTGVmdFRvUmlnaHREaXJlY3Rpb24gPyBib3hHZW9tZXRyeS5wYWRk aW5nU3RhcnQoKS52YWx1ZV9vcigwX2x1KSA6IGJveEdlb21ldHJ5LnBhZGRpbmdFbmQoKS52YWx1 ZV9vcigwX2x1KTsKK30KKworc3RhdGljIGlubGluZSBMYXlvdXRVbml0IHBhZGRpbmdSaWdodChj b25zdCBMYXlvdXQ6OkJveEdlb21ldHJ5JiBib3hHZW9tZXRyeSwgYm9vbCBpc0xlZnRUb1JpZ2h0 RGlyZWN0aW9uKQoreworICAgIHJldHVybiBpc0xlZnRUb1JpZ2h0RGlyZWN0aW9uID8gYm94R2Vv bWV0cnkucGFkZGluZ0VuZCgpLnZhbHVlX29yKDBfbHUpIDogYm94R2VvbWV0cnkucGFkZGluZ1N0 YXJ0KCkudmFsdWVfb3IoMF9sdSk7Cit9CisKIHN0YXRpYyBpbmxpbmUgT3B0aW9uU2V0PElubGlu ZURpc3BsYXk6OkJveDo6UG9zaXRpb25XaXRoaW5JbmxpbmVMZXZlbEJveD4gaXNGaXJzdExhc3RC b3goY29uc3QgSW5saW5lTGV2ZWxCb3gmIGlubGluZUJveCkKIHsKICAgICBhdXRvIHBvc2l0aW9u V2l0aGluSW5saW5lTGV2ZWxCb3ggPSBPcHRpb25TZXQ8SW5saW5lRGlzcGxheTo6Qm94OjpQb3Np dGlvbldpdGhpbklubGluZUxldmVsQm94PiB7IH07CkBAIC00MjQsNiArNDU0LDcgQEAgc2l6ZV90 IElubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6ZW5zdXJlRGlzcGxheUJveEZvckNvbnRhaW5l cihjb25zdCBDb250YWluZXIKIAogdm9pZCBJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OmFk anVzdFZpc3VhbEdlb21ldHJ5Rm9yRGlzcGxheUJveChzaXplX3QgZGlzcGxheUJveE5vZGVJbmRl eCwgSW5saW5lTGF5b3V0VW5pdCYgY29udGVudFJpZ2h0SW5WaXN1YWxPcmRlciwgSW5saW5lTGF5 b3V0VW5pdCBsaW5lQm94TG9naWNhbFRvcCwgY29uc3QgRGlzcGxheUJveFRyZWUmIGRpc3BsYXlC b3hUcmVlLCBEaXNwbGF5Qm94ZXMmIGJveGVzLCBjb25zdCBMaW5lQm94JiBsaW5lQm94KQogewor ICAgIGF1dG8gaXNMZWZ0VG9SaWdodERpcmVjdGlvbiA9IHJvb3QoKS5zdHlsZSgpLmlzTGVmdFRv UmlnaHREaXJlY3Rpb24oKTsKICAgICAvLyBOb24taW5saW5lIGJveCBkaXNwbGF5IGJveGVzIGp1 c3QgbmVlZCBhIGhvcml6b250YWwgYWRqdXN0bWVudCB3aGlsZQogICAgIC8vIGlubGluZSBib3gg dHlwZSBvZiBkaXNwbGF5IGJveGVzIG5lZWQKICAgICAvLyAxLiBob3Jpem9udGFsIGFkanVzdG1l bnQgYW5kIG1hcmdpbi9ib3JkZXIvcGFkZGluZyBzdGFydCBvZmZzZXR0aW5nIG9uIHRoZSBmaXJz dCBib3gKQEAgLTQzNSw3ICs0NjYsNyBAQCB2b2lkIElubGluZURpc3BsYXlDb250ZW50QnVpbGRl cjo6YWRqdXN0VmlzdWFsR2VvbWV0cnlGb3JEaXNwbGF5Qm94KHNpemVfdCBkaXNwbAogICAgICAg ICBkaXNwbGF5Qm94LnNldExlZnQoY29udGVudFJpZ2h0SW5WaXN1YWxPcmRlcik7CiAgICAgICAg IGNvbnRlbnRSaWdodEluVmlzdWFsT3JkZXIgKz0gZGlzcGxheUJveC53aWR0aCgpOwogICAgICAg ICBpZiAoZGlzcGxheUJveC5pc0F0b21pY0lubGluZUxldmVsQm94KCkgfHwgZGlzcGxheUJveC5p c0dlbmVyaWNJbmxpbmVMZXZlbEJveCgpKQotICAgICAgICAgICAgY29udGVudFJpZ2h0SW5WaXN1 YWxPcmRlciArPSBmb3JtYXR0aW5nU3RhdGUoKS5ib3hHZW9tZXRyeShsYXlvdXRCb3gpLm1hcmdp bkVuZCgpOworICAgICAgICAgICAgY29udGVudFJpZ2h0SW5WaXN1YWxPcmRlciArPSBtYXJnaW5S aWdodChmb3JtYXR0aW5nU3RhdGUoKS5ib3hHZW9tZXRyeShsYXlvdXRCb3gpLCBpc0xlZnRUb1Jp Z2h0RGlyZWN0aW9uKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIApAQCAtNDQ2LDEwICs0Nzcs MTAgQEAgdm9pZCBJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OmFkanVzdFZpc3VhbEdlb21l dHJ5Rm9yRGlzcGxheUJveChzaXplX3QgZGlzcGwKICAgICAgICAgaWYgKCFkaXNwbGF5Qm94Lmlz Rmlyc3RGb3JMYXlvdXRCb3goKSkKICAgICAgICAgICAgIHJldHVybiBkaXNwbGF5Qm94LnNldFJl Y3QodmlzdWFsUmVjdCwgdmlzdWFsUmVjdCk7CiAKLSAgICAgICAgY29udGVudFJpZ2h0SW5WaXN1 YWxPcmRlciArPSBib3hHZW9tZXRyeS5tYXJnaW5TdGFydCgpOwotICAgICAgICBhdXRvIHZpc3Vh bFJlY3RXaXRoTWFyZ2luU3RhcnQgPSBJbmxpbmVSZWN0IHsgdmlzdWFsUmVjdC50b3AoKSwgY29u dGVudFJpZ2h0SW5WaXN1YWxPcmRlciwgdmlzdWFsUmVjdC53aWR0aCgpLCB2aXN1YWxSZWN0Lmhl aWdodCgpIH07Ci0gICAgICAgIGRpc3BsYXlCb3guc2V0UmVjdCh2aXN1YWxSZWN0V2l0aE1hcmdp blN0YXJ0LCB2aXN1YWxSZWN0V2l0aE1hcmdpblN0YXJ0KTsKLSAgICAgICAgY29udGVudFJpZ2h0 SW5WaXN1YWxPcmRlciArPSBib3hHZW9tZXRyeS5ib3JkZXJBbmRQYWRkaW5nU3RhcnQoKTsKKyAg ICAgICAgY29udGVudFJpZ2h0SW5WaXN1YWxPcmRlciArPSBtYXJnaW5MZWZ0KGJveEdlb21ldHJ5 LCBpc0xlZnRUb1JpZ2h0RGlyZWN0aW9uKTsKKyAgICAgICAgYXV0byB2aXN1YWxSZWN0V2l0aE1h cmdpbkxlZnQgPSBJbmxpbmVSZWN0IHsgdmlzdWFsUmVjdC50b3AoKSwgY29udGVudFJpZ2h0SW5W aXN1YWxPcmRlciwgdmlzdWFsUmVjdC53aWR0aCgpLCB2aXN1YWxSZWN0LmhlaWdodCgpIH07Cisg ICAgICAgIGRpc3BsYXlCb3guc2V0UmVjdCh2aXN1YWxSZWN0V2l0aE1hcmdpbkxlZnQsIHZpc3Vh bFJlY3RXaXRoTWFyZ2luTGVmdCk7CisgICAgICAgIGNvbnRlbnRSaWdodEluVmlzdWFsT3JkZXIg Kz0gYm9yZGVyTGVmdChib3hHZW9tZXRyeSwgaXNMZWZ0VG9SaWdodERpcmVjdGlvbikgKyBwYWRk aW5nTGVmdChib3hHZW9tZXRyeSwgaXNMZWZ0VG9SaWdodERpcmVjdGlvbik7CiAgICAgfTsKICAg ICBiZWZvcmVJbmxpbmVCb3hDb250ZW50KCk7CiAKQEAgLTQ2MCw5ICs0OTEsOSBAQCB2b2lkIElu bGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6YWRqdXN0VmlzdWFsR2VvbWV0cnlGb3JEaXNwbGF5 Qm94KHNpemVfdCBkaXNwbAogICAgICAgICBpZiAoIWRpc3BsYXlCb3guaXNMYXN0Rm9yTGF5b3V0 Qm94KCkpCiAgICAgICAgICAgICByZXR1cm4gZGlzcGxheUJveC5zZXRSaWdodChjb250ZW50Umln aHRJblZpc3VhbE9yZGVyKTsKIAotICAgICAgICBjb250ZW50UmlnaHRJblZpc3VhbE9yZGVyICs9 IGJveEdlb21ldHJ5LmJvcmRlckFuZFBhZGRpbmdFbmQoKTsKKyAgICAgICAgY29udGVudFJpZ2h0 SW5WaXN1YWxPcmRlciArPSBib3JkZXJSaWdodChib3hHZW9tZXRyeSwgaXNMZWZ0VG9SaWdodERp cmVjdGlvbikgKyBwYWRkaW5nUmlnaHQoYm94R2VvbWV0cnksIGlzTGVmdFRvUmlnaHREaXJlY3Rp b24pOwogICAgICAgICBkaXNwbGF5Qm94LnNldFJpZ2h0KGNvbnRlbnRSaWdodEluVmlzdWFsT3Jk ZXIpOwotICAgICAgICBjb250ZW50UmlnaHRJblZpc3VhbE9yZGVyICs9IGJveEdlb21ldHJ5Lm1h cmdpbkVuZCgpOworICAgICAgICBjb250ZW50UmlnaHRJblZpc3VhbE9yZGVyICs9IG1hcmdpblJp Z2h0KGJveEdlb21ldHJ5LCBpc0xlZnRUb1JpZ2h0RGlyZWN0aW9uKTsKICAgICB9OwogICAgIGFm dGVySW5saW5lQm94Q29udGVudCgpOwogCg== 447241 2021-12-15 09:18:29 -0800 2021-12-15 10:11:08 -0800 Patch bug-234346-20211215091829.patch text/plain 7092 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3MDYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmI3OTRhOGMwYTUzMGVh MGUwNWJkODU0ZTk5ZmNhODQwNmYyMWYzYi4uYzVjMGI0YmY1ODJhYWYwZTIwODUyYzAzZjg4ZDhi ZTg2ZDRjNDFmOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDIxLTEyLTE1ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIFVzZSB0aGUg cGh5c2ljYWwgbWFyZ2luL2JvcmRlci9wYWRkaW5nIHZhbHVlcyBmb3IgaW5saW5lIGJveGVzIHdo ZW4gZ2VuZXJhdGluZyB0aGUgZGlzcGxheSBjb250ZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzQzNDYKKworICAgICAgICBSZXZpZXdlZCBieSBB bnR0aSBLb2l2aXN0by4KKworICAgICAgICBEaXNwbGF5IGNvbnRlbnQgaXMgYWx3YXlzIGJhc2Vk IG9uIHZpc3VhbCBvcmRlci4gV2hlbiB3ZSBjb25zdHJ1Y3QgdGhlIGRpc3BsYXkgYm94ZXMKKyAg ICAgICAgICAtIHdlIHZpc2l0IHRoZSBsaW5lIHJ1bnMgaW4gdmlzdWFsIG9yZGVyCisgICAgICAg ICAgLSB3ZSBtYWtlIHNwYWNlIGZvciBtYXJnaW4vYm9yZGVyL3BhZGRpbmcgYnkgbG9va2luZyBh dCB0aGUgcGh5c2ljYWwgc2lkZXMgb2YgdGhlIGNvbnRlbnQgCisgICAgICAgIFRoZSB2aXN1YWxs eSBmaXJzdCBib3ggbWF5IHZlcnkgd2VsbCBiZSBsb2dpY2FsbHkgdGhlIGxhc3QgYW5kIHRoaXMg Zmlyc3QgYm94J3MgbGVmdCBzaWRlIChhZ2FpbiwgdmlzdWFsbHkpCisgICAgICAgIG1heSByZWZl ciB0byB0aGUgbG9naWNhbCBzdGFydC9lbmQgdmFsdWVzIGRlcGVuZGluZyBvbiB0aGUgaW5saW5l IGF4aXMgZGlyZWN0aW9uLiAKKworICAgICAgICBFLmcgaW4gY2FzZSBvZiByaWdodCB0byBsZWZ0 IGlubGluZSBkaXJlY3Rpb24sIHRoZSBib3JkZXItaW5saW5lLWVuZCB2YWx1ZSBvZiBhbiBpbmxp bmUgYm94IHNob3VsZCBiZSB1c2UgYXMgdGhlCisgICAgICAgICJ2aXN1YWxseSBmaXJzdCIgYm9y ZGVyIG9uIHRoZSBsZWZ0IHNpZGUgb2YgdGhlIGlubGluZSBib3ggY29udGVudC4gICAKKworICAg ICAgICBJdCBtZWFucyB0aGF0CisgICAgICAgICAtIHBoeXNpY2FsIHZhbHVlcyBhcmUgdXNlZCB3 aGVuIGNyZWF0aW5nIHRoZSBkaXNwbGF5IGJveGVzCisgICAgICAgICAtIGFuZCBsb2dpY2FsIHZh bHVlcyBhcmUgdXNlZCB0aHJvdWdob3V0IHRoZSBsYXlvdXQKKyAgICAgICAgd2hpY2ggaW4gcHJh Y3RpY2UgbWVhbnMgdGhhdCBpc0xlZnRUb1JpZ2h0RGlyZWN0aW9uIGNoZWNrIHNob3VsZCBvbmx5 IGhhcHBlbiBiZWZvcmUgYW5kIGFmdGVyIGxheW91dAorICAgICAgICAocGh5c2ljYWwgLT4gbG9n aWNhbCBhbmQgbG9naWNhbCAtPiBwaHlzaWNhbCByZXNwZWN0aXZlbHkpIGJ1dCBuZXZlciBkdXJp bmcgbGF5b3V0LgorCisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUv SW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6bWFyZ2luTGVmdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6Om1hcmdpblJpZ2h0KToK KyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6Ym9yZGVyTGVmdCk6CisgICAgICAgIChXZWJDb3Jl OjpMYXlvdXQ6OmJvcmRlclJpZ2h0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6cGFkZGlu Z0xlZnQpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpwYWRkaW5nUmlnaHQpOgorICAgICAg ICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OmFkanVzdFZp c3VhbEdlb21ldHJ5Rm9yRGlzcGxheUJveCk6CisKIDIwMjEtMTItMTQgIEplYW4tWXZlcyBBdmVu YXJkICA8anlhQGFwcGxlLmNvbT4KIAogICAgICAgICBTb3VyY2VCdWZmZXJQYXJzZXIgc2hvdWxk IGJlIHVzaW5nIGNvbnRpZ3VvdXMgU2hhcmVkQnVmZmVyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVEaXNwbGF5Q29udGVu dEJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9p bmxpbmUvSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmNwcAppbmRleCBhMGY0OWQ4ZTZhMmEz MWIzZDkzMmVkMGVlMjQ4NTA3MjliNjY2ZTE2Li42YTkzMmU2ODFjOWI1NWI3YTcxMTk0NmE5Mzlj ZmU3ZmJhMGYxMDM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGlu Z0NvbnRleHRzL2lubGluZS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZURpc3Bs YXlDb250ZW50QnVpbGRlci5jcHAKQEAgLTQxLDYgKzQxLDM2IEBAIHVzaW5nIFdURjo6UmFuZ2U7 CiBuYW1lc3BhY2UgV2ViQ29yZSB7CiBuYW1lc3BhY2UgTGF5b3V0IHsKIAorc3RhdGljIGlubGlu ZSBMYXlvdXRVbml0IG1hcmdpbkxlZnQoY29uc3QgTGF5b3V0OjpCb3hHZW9tZXRyeSYgYm94R2Vv bWV0cnksIGJvb2wgaXNMZWZ0VG9SaWdodERpcmVjdGlvbikKK3sKKyAgICByZXR1cm4gaXNMZWZ0 VG9SaWdodERpcmVjdGlvbiA/IGJveEdlb21ldHJ5Lm1hcmdpblN0YXJ0KCkgOiBib3hHZW9tZXRy eS5tYXJnaW5FbmQoKTsKK30KKworc3RhdGljIGlubGluZSBMYXlvdXRVbml0IG1hcmdpblJpZ2h0 KGNvbnN0IExheW91dDo6Qm94R2VvbWV0cnkmIGJveEdlb21ldHJ5LCBib29sIGlzTGVmdFRvUmln aHREaXJlY3Rpb24pCit7CisgICAgcmV0dXJuIGlzTGVmdFRvUmlnaHREaXJlY3Rpb24gPyBib3hH ZW9tZXRyeS5tYXJnaW5FbmQoKSA6IGJveEdlb21ldHJ5Lm1hcmdpblN0YXJ0KCk7Cit9CisKK3N0 YXRpYyBpbmxpbmUgTGF5b3V0VW5pdCBib3JkZXJMZWZ0KGNvbnN0IExheW91dDo6Qm94R2VvbWV0 cnkmIGJveEdlb21ldHJ5LCBib29sIGlzTGVmdFRvUmlnaHREaXJlY3Rpb24pCit7CisgICAgcmV0 dXJuIGlzTGVmdFRvUmlnaHREaXJlY3Rpb24gPyBib3hHZW9tZXRyeS5ib3JkZXJTdGFydCgpIDog Ym94R2VvbWV0cnkuYm9yZGVyRW5kKCk7Cit9CisKK3N0YXRpYyBpbmxpbmUgTGF5b3V0VW5pdCBi b3JkZXJSaWdodChjb25zdCBMYXlvdXQ6OkJveEdlb21ldHJ5JiBib3hHZW9tZXRyeSwgYm9vbCBp c0xlZnRUb1JpZ2h0RGlyZWN0aW9uKQoreworICAgIHJldHVybiBpc0xlZnRUb1JpZ2h0RGlyZWN0 aW9uID8gYm94R2VvbWV0cnkuYm9yZGVyRW5kKCkgOiBib3hHZW9tZXRyeS5ib3JkZXJTdGFydCgp OworfQorCitzdGF0aWMgaW5saW5lIExheW91dFVuaXQgcGFkZGluZ0xlZnQoY29uc3QgTGF5b3V0 OjpCb3hHZW9tZXRyeSYgYm94R2VvbWV0cnksIGJvb2wgaXNMZWZ0VG9SaWdodERpcmVjdGlvbikK K3sKKyAgICByZXR1cm4gaXNMZWZ0VG9SaWdodERpcmVjdGlvbiA/IGJveEdlb21ldHJ5LnBhZGRp bmdTdGFydCgpLnZhbHVlX29yKDBfbHUpIDogYm94R2VvbWV0cnkucGFkZGluZ0VuZCgpLnZhbHVl X29yKDBfbHUpOworfQorCitzdGF0aWMgaW5saW5lIExheW91dFVuaXQgcGFkZGluZ1JpZ2h0KGNv bnN0IExheW91dDo6Qm94R2VvbWV0cnkmIGJveEdlb21ldHJ5LCBib29sIGlzTGVmdFRvUmlnaHRE aXJlY3Rpb24pCit7CisgICAgcmV0dXJuIGlzTGVmdFRvUmlnaHREaXJlY3Rpb24gPyBib3hHZW9t ZXRyeS5wYWRkaW5nRW5kKCkudmFsdWVfb3IoMF9sdSkgOiBib3hHZW9tZXRyeS5wYWRkaW5nU3Rh cnQoKS52YWx1ZV9vcigwX2x1KTsKK30KKwogc3RhdGljIGlubGluZSBPcHRpb25TZXQ8SW5saW5l RGlzcGxheTo6Qm94OjpQb3NpdGlvbldpdGhpbklubGluZUxldmVsQm94PiBpc0ZpcnN0TGFzdEJv eChjb25zdCBJbmxpbmVMZXZlbEJveCYgaW5saW5lQm94KQogewogICAgIGF1dG8gcG9zaXRpb25X aXRoaW5JbmxpbmVMZXZlbEJveCA9IE9wdGlvblNldDxJbmxpbmVEaXNwbGF5OjpCb3g6OlBvc2l0 aW9uV2l0aGluSW5saW5lTGV2ZWxCb3g+IHsgfTsKQEAgLTQyNCw2ICs0NTQsNyBAQCBzaXplX3Qg SW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjplbnN1cmVEaXNwbGF5Qm94Rm9yQ29udGFpbmVy KGNvbnN0IENvbnRhaW5lcgogCiB2b2lkIElubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6YWRq dXN0VmlzdWFsR2VvbWV0cnlGb3JEaXNwbGF5Qm94KHNpemVfdCBkaXNwbGF5Qm94Tm9kZUluZGV4 LCBJbmxpbmVMYXlvdXRVbml0JiBjb250ZW50UmlnaHRJblZpc3VhbE9yZGVyLCBJbmxpbmVMYXlv dXRVbml0IGxpbmVCb3hMb2dpY2FsVG9wLCBjb25zdCBEaXNwbGF5Qm94VHJlZSYgZGlzcGxheUJv eFRyZWUsIERpc3BsYXlCb3hlcyYgYm94ZXMsIGNvbnN0IExpbmVCb3gmIGxpbmVCb3gpCiB7Cisg ICAgYXV0byBpc0xlZnRUb1JpZ2h0RGlyZWN0aW9uID0gcm9vdCgpLnN0eWxlKCkuaXNMZWZ0VG9S aWdodERpcmVjdGlvbigpOwogICAgIC8vIE5vbi1pbmxpbmUgYm94IGRpc3BsYXkgYm94ZXMganVz dCBuZWVkIGEgaG9yaXpvbnRhbCBhZGp1c3RtZW50IHdoaWxlCiAgICAgLy8gaW5saW5lIGJveCB0 eXBlIG9mIGRpc3BsYXkgYm94ZXMgbmVlZAogICAgIC8vIDEuIGhvcml6b250YWwgYWRqdXN0bWVu dCBhbmQgbWFyZ2luL2JvcmRlci9wYWRkaW5nIHN0YXJ0IG9mZnNldHRpbmcgb24gdGhlIGZpcnN0 IGJveApAQCAtNDM1LDcgKzQ2Niw3IEBAIHZvaWQgSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVy OjphZGp1c3RWaXN1YWxHZW9tZXRyeUZvckRpc3BsYXlCb3goc2l6ZV90IGRpc3BsCiAgICAgICAg IGRpc3BsYXlCb3guc2V0TGVmdChjb250ZW50UmlnaHRJblZpc3VhbE9yZGVyKTsKICAgICAgICAg Y29udGVudFJpZ2h0SW5WaXN1YWxPcmRlciArPSBkaXNwbGF5Qm94LndpZHRoKCk7CiAgICAgICAg IGlmIChkaXNwbGF5Qm94LmlzQXRvbWljSW5saW5lTGV2ZWxCb3goKSB8fCBkaXNwbGF5Qm94Lmlz R2VuZXJpY0lubGluZUxldmVsQm94KCkpCi0gICAgICAgICAgICBjb250ZW50UmlnaHRJblZpc3Vh bE9yZGVyICs9IGZvcm1hdHRpbmdTdGF0ZSgpLmJveEdlb21ldHJ5KGxheW91dEJveCkubWFyZ2lu RW5kKCk7CisgICAgICAgICAgICBjb250ZW50UmlnaHRJblZpc3VhbE9yZGVyICs9IG1hcmdpblJp Z2h0KGZvcm1hdHRpbmdTdGF0ZSgpLmJveEdlb21ldHJ5KGxheW91dEJveCksIGlzTGVmdFRvUmln aHREaXJlY3Rpb24pOwogICAgICAgICByZXR1cm47CiAgICAgfQogCkBAIC00NDYsMTAgKzQ3Nywx MCBAQCB2b2lkIElubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6YWRqdXN0VmlzdWFsR2VvbWV0 cnlGb3JEaXNwbGF5Qm94KHNpemVfdCBkaXNwbAogICAgICAgICBpZiAoIWRpc3BsYXlCb3guaXNG aXJzdEZvckxheW91dEJveCgpKQogICAgICAgICAgICAgcmV0dXJuIGRpc3BsYXlCb3guc2V0UmVj dCh2aXN1YWxSZWN0LCB2aXN1YWxSZWN0KTsKIAotICAgICAgICBjb250ZW50UmlnaHRJblZpc3Vh bE9yZGVyICs9IGJveEdlb21ldHJ5Lm1hcmdpblN0YXJ0KCk7Ci0gICAgICAgIGF1dG8gdmlzdWFs UmVjdFdpdGhNYXJnaW5TdGFydCA9IElubGluZVJlY3QgeyB2aXN1YWxSZWN0LnRvcCgpLCBjb250 ZW50UmlnaHRJblZpc3VhbE9yZGVyLCB2aXN1YWxSZWN0LndpZHRoKCksIHZpc3VhbFJlY3QuaGVp Z2h0KCkgfTsKLSAgICAgICAgZGlzcGxheUJveC5zZXRSZWN0KHZpc3VhbFJlY3RXaXRoTWFyZ2lu U3RhcnQsIHZpc3VhbFJlY3RXaXRoTWFyZ2luU3RhcnQpOwotICAgICAgICBjb250ZW50UmlnaHRJ blZpc3VhbE9yZGVyICs9IGJveEdlb21ldHJ5LmJvcmRlckFuZFBhZGRpbmdTdGFydCgpOworICAg ICAgICBjb250ZW50UmlnaHRJblZpc3VhbE9yZGVyICs9IG1hcmdpbkxlZnQoYm94R2VvbWV0cnks IGlzTGVmdFRvUmlnaHREaXJlY3Rpb24pOworICAgICAgICBhdXRvIHZpc3VhbFJlY3RXaXRoTWFy Z2luTGVmdCA9IElubGluZVJlY3QgeyB2aXN1YWxSZWN0LnRvcCgpLCBjb250ZW50UmlnaHRJblZp c3VhbE9yZGVyLCB2aXN1YWxSZWN0LndpZHRoKCksIHZpc3VhbFJlY3QuaGVpZ2h0KCkgfTsKKyAg ICAgICAgZGlzcGxheUJveC5zZXRSZWN0KHZpc3VhbFJlY3RXaXRoTWFyZ2luTGVmdCwgdmlzdWFs UmVjdFdpdGhNYXJnaW5MZWZ0KTsKKyAgICAgICAgY29udGVudFJpZ2h0SW5WaXN1YWxPcmRlciAr PSBib3JkZXJMZWZ0KGJveEdlb21ldHJ5LCBpc0xlZnRUb1JpZ2h0RGlyZWN0aW9uKSArIHBhZGRp bmdMZWZ0KGJveEdlb21ldHJ5LCBpc0xlZnRUb1JpZ2h0RGlyZWN0aW9uKTsKICAgICB9OwogICAg IGJlZm9yZUlubGluZUJveENvbnRlbnQoKTsKIApAQCAtNDYwLDkgKzQ5MSw5IEBAIHZvaWQgSW5s aW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjphZGp1c3RWaXN1YWxHZW9tZXRyeUZvckRpc3BsYXlC b3goc2l6ZV90IGRpc3BsCiAgICAgICAgIGlmICghZGlzcGxheUJveC5pc0xhc3RGb3JMYXlvdXRC b3goKSkKICAgICAgICAgICAgIHJldHVybiBkaXNwbGF5Qm94LnNldFJpZ2h0KGNvbnRlbnRSaWdo dEluVmlzdWFsT3JkZXIpOwogCi0gICAgICAgIGNvbnRlbnRSaWdodEluVmlzdWFsT3JkZXIgKz0g Ym94R2VvbWV0cnkuYm9yZGVyQW5kUGFkZGluZ0VuZCgpOworICAgICAgICBjb250ZW50UmlnaHRJ blZpc3VhbE9yZGVyICs9IGJvcmRlclJpZ2h0KGJveEdlb21ldHJ5LCBpc0xlZnRUb1JpZ2h0RGly ZWN0aW9uKSArIHBhZGRpbmdSaWdodChib3hHZW9tZXRyeSwgaXNMZWZ0VG9SaWdodERpcmVjdGlv bik7CiAgICAgICAgIGRpc3BsYXlCb3guc2V0UmlnaHQoY29udGVudFJpZ2h0SW5WaXN1YWxPcmRl cik7Ci0gICAgICAgIGNvbnRlbnRSaWdodEluVmlzdWFsT3JkZXIgKz0gYm94R2VvbWV0cnkubWFy Z2luRW5kKCk7CisgICAgICAgIGNvbnRlbnRSaWdodEluVmlzdWFsT3JkZXIgKz0gbWFyZ2luUmln aHQoYm94R2VvbWV0cnksIGlzTGVmdFRvUmlnaHREaXJlY3Rpb24pOwogICAgIH07CiAgICAgYWZ0 ZXJJbmxpbmVCb3hDb250ZW50KCk7CiAK