218200 2020-10-26 12:24:02 -0700 [LFC][Integration] Use term "modern line layout" in RenderBlockFlow 2020-10-26 13:24:16 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 koivisto webkit-unassigned bfulgham changseok esprehn+autocc ews-watchlist glenn kondapallykalyan pdr simon.fraser webkit-bug-importer zalan oldest_to_newest 1701564 0 koivisto 2020-10-26 12:24:02 -0700 modernize terminology 1701565 1 412344 koivisto 2020-10-26 12:25:51 -0700 Created attachment 412344 patch 1701577 2 simon.fraser 2020-10-26 13:02:21 -0700 This is the reverse of the direction we normally go. Don't use "new" or "modern": rename the old to legacy, and use no modifier for new code. 1701586 3 koivisto 2020-10-26 13:16:53 -0700 The plan is to use modern/legacy in the integration layer code. The actual new layout code doesn't use any qualifiers. 1701591 4 ews-feeder 2020-10-26 13:23:53 -0700 Committed r268994: <https://trac.webkit.org/changeset/268994> All reviewed patches have been landed. Closing bug and clearing flags on attachment 412344. 1701592 5 webkit-bug-importer 2020-10-26 13:24:16 -0700 <rdar://problem/70692601> 412344 2020-10-26 12:25:51 -0700 2020-10-26 13:23:54 -0700 patch lfc-modern-flow.patch text/plain 13866 koivisto ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA0ODA2MDE2YTQwZjQuLjhmOTRlZTc2ZWY4YyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDM2IEBACisyMDIwLTEwLTI2ICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNv bT4KKworICAgICAgICBbTEZDXVtJbnRlZ3JhdGlvbl0gVXNlIHRlcm0gIm1vZGVybiBsaW5lIGxh eW91dCIgaW4gUmVuZGVyQmxvY2tGbG93CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMTgyMDAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIGxheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxp bmVMYXlvdXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246OkxpbmVM YXlvdXQ6OmNvbnRhaW5pbmcpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246 OkxpbmVMYXlvdXQ6OnJlbGVhc2VDYWNoZXMpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJC bG9ja0Zsb3cuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2tGbG93OjpsYXlvdXRJ bmxpbmVDaGlsZHJlbik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9ja0Zsb3c6OnN0eWxl RGlkQ2hhbmdlKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrRmxvdzo6aGl0VGVzdElu bGluZUNoaWxkcmVuKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrRmxvdzo6YWRkT3Zl cmZsb3dGcm9tSW5saW5lQ2hpbGRyZW4pOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2tG bG93OjptYXJrTGluZXNEaXJ0eUluQmxvY2tSYW5nZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJCbG9ja0Zsb3c6OmZpcnN0TGluZUJhc2VsaW5lIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlckJsb2NrRmxvdzo6aW5saW5lQmxvY2tCYXNlbGluZSBjb25zdCk6CisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJCbG9ja0Zsb3c6OmxpbmVDb3VudCBjb25zdCk6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJCbG9ja0Zsb3c6OnBhaW50SW5saW5lQ2hpbGRyZW4pOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyQmxvY2tGbG93OjpoYXNMaW5lcyBjb25zdCk6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJCbG9ja0Zsb3c6OmludmFsaWRhdGVMaW5lTGF5b3V0UGF0aCk6CisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJCbG9ja0Zsb3c6OmxheW91dE1vZGVybkxpbmVzKToKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlckJsb2NrRmxvdzo6ZW5zdXJlTGluZUJveGVzKToKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlckJsb2NrRmxvdzo6bGF5b3V0TEZDTGluZXMpOiBEZWxldGVkLgorICAgICAgICAq IHJlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuaDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJs b2NrRmxvdzo6aGFzTW9kZXJuTGluZUxheW91dCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJCbG9ja0Zsb3c6Om1vZGVybkxpbmVMYXlvdXQgY29uc3QpOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyQmxvY2tGbG93Ojptb2Rlcm5MaW5lTGF5b3V0KToKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlckJsb2NrRmxvdzo6aGFzTGF5b3V0Rm9ybWF0dGluZ0NvbnRleHRMaW5lTGF5b3V0IGNv bnN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrRmxvdzo6bGF5b3V0 Rm9ybWF0dGluZ0NvbnRleHRMaW5lTGF5b3V0IGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlckJsb2NrRmxvdzo6bGF5b3V0Rm9ybWF0dGluZ0NvbnRleHRMaW5lTGF5b3V0 KTogRGVsZXRlZC4KKwogMjAyMC0xMC0yNSAgU2FtIFdlaW5pZyAgPHdlaW5pZ0BhcHBsZS5jb20+ CiAKICAgICAgICAgUmVtb3ZlIG5vbi1zdGFuZGFyZCAnY3NzJy8nQ3NzJyBwcmVmaXhlZCBwcm9w ZXJ0aWVzIG9uIENTU1N0eWxlRGVjbGFyYXRpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQuY3BwIGIvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uTGluZUxheW91 dC5jcHAKaW5kZXggMTE4YzJmYzJjY2EyLi5mNDliZWRmMDE4NWYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVMYXlvdXQu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3Jh dGlvbkxpbmVMYXlvdXQuY3BwCkBAIC03Myw3ICs3Myw3IEBAIExpbmVMYXlvdXQqIExpbmVMYXlv dXQ6OmNvbnRhaW5pbmcoUmVuZGVyT2JqZWN0JiByZW5kZXJlcikKICAgICAKICAgICBpZiAoYXV0 byogcGFyZW50ID0gcmVuZGVyZXIucGFyZW50KCkpIHsKICAgICAgICAgaWYgKGlzPFJlbmRlckJs b2NrRmxvdz4oKnBhcmVudCkpCi0gICAgICAgICAgICByZXR1cm4gZG93bmNhc3Q8UmVuZGVyQmxv Y2tGbG93PigqcGFyZW50KS5sYXlvdXRGb3JtYXR0aW5nQ29udGV4dExpbmVMYXlvdXQoKTsKKyAg ICAgICAgICAgIHJldHVybiBkb3duY2FzdDxSZW5kZXJCbG9ja0Zsb3c+KCpwYXJlbnQpLm1vZGVy bkxpbmVMYXlvdXQoKTsKICAgICB9CiAKICAgICByZXR1cm4gbnVsbHB0cjsKQEAgLTU0Miw3ICs1 NDIsNyBAQCB2b2lkIExpbmVMYXlvdXQ6OnJlbGVhc2VDYWNoZXMoUmVuZGVyVmlldyYgdmlldykK ICAgICAgICAgcmV0dXJuOwogCiAgICAgZm9yIChhdXRvJiByZW5kZXJlciA6IGRlc2NlbmRhbnRz T2ZUeXBlPFJlbmRlckJsb2NrRmxvdz4odmlldykpIHsKLSAgICAgICAgaWYgKGF1dG8qIGxpbmVM YXlvdXQgPSByZW5kZXJlci5sYXlvdXRGb3JtYXR0aW5nQ29udGV4dExpbmVMYXlvdXQoKSkKKyAg ICAgICAgaWYgKGF1dG8qIGxpbmVMYXlvdXQgPSByZW5kZXJlci5tb2Rlcm5MaW5lTGF5b3V0KCkp CiAgICAgICAgICAgICBsaW5lTGF5b3V0LT5yZWxlYXNlSW5saW5lSXRlbUNhY2hlKCk7CiAgICAg fQogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxv dy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcAppbmRl eCBhNTMyZGYzZGU0YjAuLjdkZmU3OWUxNTZhZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckJsb2NrRmxvdy5jcHAKQEAgLTY2OCw3ICs2NjgsNyBAQCB2b2lkIFJlbmRlckJs b2NrRmxvdzo6bGF5b3V0SW5saW5lQ2hpbGRyZW4oYm9vbCByZWxheW91dENoaWxkcmVuLCBMYXlv dXRVbml0JiByZQogICAgIGF1dG8gY29tcHV0ZUxpbmVMYXlvdXRQYXRoID0gWyZdIHsKICNpZiBF TkFCTEUoTEFZT1VUX0ZPUk1BVFRJTkdfQ09OVEVYVCkKICAgICAgICAgaWYgKExheW91dEludGVn cmF0aW9uOjpMaW5lTGF5b3V0OjpjYW5Vc2VGb3IoKnRoaXMpKQotICAgICAgICAgICAgcmV0dXJu IExheW91dEZvcm1hdHRpbmdDb250ZXh0UGF0aDsKKyAgICAgICAgICAgIHJldHVybiBNb2Rlcm5Q YXRoOwogI2VuZGlmCiAgICAgICAgIHJldHVybiBMaW5lQm94ZXNQYXRoOwogICAgIH07CkBAIC02 NzcsOCArNjc3LDggQEAgdm9pZCBSZW5kZXJCbG9ja0Zsb3c6OmxheW91dElubGluZUNoaWxkcmVu KGJvb2wgcmVsYXlvdXRDaGlsZHJlbiwgTGF5b3V0VW5pdCYgcmUKICAgICAgICAgc2V0TGluZUxh eW91dFBhdGgoY29tcHV0ZUxpbmVMYXlvdXRQYXRoKCkpOwogCiAjaWYgRU5BQkxFKExBWU9VVF9G T1JNQVRUSU5HX0NPTlRFWFQpCi0gICAgaWYgKGxpbmVMYXlvdXRQYXRoKCkgPT0gTGF5b3V0Rm9y bWF0dGluZ0NvbnRleHRQYXRoKSB7Ci0gICAgICAgIGxheW91dExGQ0xpbmVzKHJlbGF5b3V0Q2hp bGRyZW4sIHJlcGFpbnRMb2dpY2FsVG9wLCByZXBhaW50TG9naWNhbEJvdHRvbSk7CisgICAgaWYg KGxpbmVMYXlvdXRQYXRoKCkgPT0gTW9kZXJuUGF0aCkgeworICAgICAgICBsYXlvdXRNb2Rlcm5M aW5lcyhyZWxheW91dENoaWxkcmVuLCByZXBhaW50TG9naWNhbFRvcCwgcmVwYWludExvZ2ljYWxC b3R0b20pOwogICAgICAgICByZXR1cm47CiAgICAgfQogI2VuZGlmCkBAIC0yMDk2LDcgKzIwOTYs NyBAQCB2b2lkIFJlbmRlckJsb2NrRmxvdzo6c3R5bGVEaWRDaGFuZ2UoU3R5bGVEaWZmZXJlbmNl IGRpZmYsIGNvbnN0IFJlbmRlclN0eWxlKiBvbAogICAgICAgICAgICAgaWYgKHNlbGZOZWVkc0xh eW91dCgpIHx8IGNvbXBsZXhMaW5lTGF5b3V0KCkpCiAgICAgICAgICAgICAgICAgcmV0dXJuIHRy dWU7CiAjaWYgRU5BQkxFKExBWU9VVF9GT1JNQVRUSU5HX0NPTlRFWFQpCi0gICAgICAgICAgICBp ZiAobGF5b3V0Rm9ybWF0dGluZ0NvbnRleHRMaW5lTGF5b3V0KCkgJiYgIUxheW91dEludGVncmF0 aW9uOjpMaW5lTGF5b3V0OjpjYW5Vc2VGb3JBZnRlclN0eWxlQ2hhbmdlKCp0aGlzLCBkaWZmKSkK KyAgICAgICAgICAgIGlmIChtb2Rlcm5MaW5lTGF5b3V0KCkgJiYgIUxheW91dEludGVncmF0aW9u OjpMaW5lTGF5b3V0OjpjYW5Vc2VGb3JBZnRlclN0eWxlQ2hhbmdlKCp0aGlzLCBkaWZmKSkKICAg ICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICNlbmRpZgogICAgICAgICAgICAgcmV0dXJuIGZh bHNlOwpAQCAtMjEwNSw3ICsyMTA1LDcgQEAgdm9pZCBSZW5kZXJCbG9ja0Zsb3c6OnN0eWxlRGlk Q2hhbmdlKFN0eWxlRGlmZmVyZW5jZSBkaWZmLCBjb25zdCBSZW5kZXJTdHlsZSogb2wKICAgICAg ICAgICAgIGludmFsaWRhdGVMaW5lTGF5b3V0UGF0aCgpOwogCiAjaWYgRU5BQkxFKExBWU9VVF9G T1JNQVRUSU5HX0NPTlRFWFQpCi0gICAgICAgIGlmIChhdXRvKiBsaW5lTGF5b3V0ID0gbGF5b3V0 Rm9ybWF0dGluZ0NvbnRleHRMaW5lTGF5b3V0KCkpCisgICAgICAgIGlmIChhdXRvKiBsaW5lTGF5 b3V0ID0gbW9kZXJuTGluZUxheW91dCgpKQogICAgICAgICAgICAgbGluZUxheW91dC0+dXBkYXRl U3R5bGUoKnRoaXMpOwogI2VuZGlmCiAgICAgfQpAQCAtMjk3Nyw4ICsyOTc3LDggQEAgYm9vbCBS ZW5kZXJCbG9ja0Zsb3c6OmhpdFRlc3RJbmxpbmVDaGlsZHJlbihjb25zdCBIaXRUZXN0UmVxdWVz dCYgcmVxdWVzdCwgSGl0VGUKICAgICBBU1NFUlQoY2hpbGRyZW5JbmxpbmUoKSk7CiAKICNpZiBF TkFCTEUoTEFZT1VUX0ZPUk1BVFRJTkdfQ09OVEVYVCkKLSAgICBpZiAobGF5b3V0Rm9ybWF0dGlu Z0NvbnRleHRMaW5lTGF5b3V0KCkpCi0gICAgICAgIHJldHVybiBsYXlvdXRGb3JtYXR0aW5nQ29u dGV4dExpbmVMYXlvdXQoKS0+aGl0VGVzdChyZXF1ZXN0LCByZXN1bHQsIGxvY2F0aW9uSW5Db250 YWluZXIsIGFjY3VtdWxhdGVkT2Zmc2V0LCBoaXRUZXN0QWN0aW9uKTsKKyAgICBpZiAobW9kZXJu TGluZUxheW91dCgpKQorICAgICAgICByZXR1cm4gbW9kZXJuTGluZUxheW91dCgpLT5oaXRUZXN0 KHJlcXVlc3QsIHJlc3VsdCwgbG9jYXRpb25JbkNvbnRhaW5lciwgYWNjdW11bGF0ZWRPZmZzZXQs IGhpdFRlc3RBY3Rpb24pOwogI2VuZGlmCiAKICAgICByZXR1cm4gY29tcGxleExpbmVMYXlvdXQo KSAmJiBjb21wbGV4TGluZUxheW91dCgpLT5saW5lQm94ZXMoKS5oaXRUZXN0KHRoaXMsIHJlcXVl c3QsIHJlc3VsdCwgbG9jYXRpb25JbkNvbnRhaW5lciwgYWNjdW11bGF0ZWRPZmZzZXQsIGhpdFRl c3RBY3Rpb24pOwpAQCAtMjk4Nyw4ICsyOTg3LDggQEAgYm9vbCBSZW5kZXJCbG9ja0Zsb3c6Omhp dFRlc3RJbmxpbmVDaGlsZHJlbihjb25zdCBIaXRUZXN0UmVxdWVzdCYgcmVxdWVzdCwgSGl0VGUK IHZvaWQgUmVuZGVyQmxvY2tGbG93OjphZGRPdmVyZmxvd0Zyb21JbmxpbmVDaGlsZHJlbigpCiB7 CiAjaWYgRU5BQkxFKExBWU9VVF9GT1JNQVRUSU5HX0NPTlRFWFQpCi0gICAgaWYgKGxheW91dEZv cm1hdHRpbmdDb250ZXh0TGluZUxheW91dCgpKSB7Ci0gICAgICAgIGxheW91dEZvcm1hdHRpbmdD b250ZXh0TGluZUxheW91dCgpLT5jb2xsZWN0T3ZlcmZsb3coKTsKKyAgICBpZiAobW9kZXJuTGlu ZUxheW91dCgpKSB7CisgICAgICAgIG1vZGVybkxpbmVMYXlvdXQoKS0+Y29sbGVjdE92ZXJmbG93 KCk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAjZW5kaWYKQEAgLTMwNzYsNyArMzA3Niw3IEBA IHZvaWQgUmVuZGVyQmxvY2tGbG93OjptYXJrTGluZXNEaXJ0eUluQmxvY2tSYW5nZShMYXlvdXRV bml0IGxvZ2ljYWxUb3AsIExheW91dFVuCiAKICAgICAvLyBGbG9hdHMgY3VycmVudGx5IGFmZmVj dCB0aGUgY2hvaWNlIG9mIGxheW91dCBwYXRoLgogI2lmIEVOQUJMRShMQVlPVVRfRk9STUFUVElO R19DT05URVhUKQotICAgIGlmIChsYXlvdXRGb3JtYXR0aW5nQ29udGV4dExpbmVMYXlvdXQoKSkg eworICAgIGlmIChtb2Rlcm5MaW5lTGF5b3V0KCkpIHsKICAgICAgICAgaW52YWxpZGF0ZUxpbmVM YXlvdXRQYXRoKCk7CiAgICAgICAgIHJldHVybjsKICAgICB9CkBAIC0zMTA3LDggKzMxMDcsOCBA QCBPcHRpb25hbDxpbnQ+IFJlbmRlckJsb2NrRmxvdzo6Zmlyc3RMaW5lQmFzZWxpbmUoKSBjb25z dAogICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OwogCiAjaWYgRU5BQkxFKExBWU9VVF9GT1JN QVRUSU5HX0NPTlRFWFQpCi0gICAgaWYgKGxheW91dEZvcm1hdHRpbmdDb250ZXh0TGluZUxheW91 dCgpKQotICAgICAgICByZXR1cm4gZmxvb3JUb0ludChsYXlvdXRGb3JtYXR0aW5nQ29udGV4dExp bmVMYXlvdXQoKS0+Zmlyc3RMaW5lQmFzZWxpbmUoKSk7CisgICAgaWYgKG1vZGVybkxpbmVMYXlv dXQoKSkKKyAgICAgICAgcmV0dXJuIGZsb29yVG9JbnQobW9kZXJuTGluZUxheW91dCgpLT5maXJz dExpbmVCYXNlbGluZSgpKTsKICNlbmRpZgogCiAgICAgQVNTRVJUKGZpcnN0Um9vdEJveCgpKTsK QEAgLTMxNDgsOCArMzE0OCw4IEBAIE9wdGlvbmFsPGludD4gUmVuZGVyQmxvY2tGbG93Ojppbmxp bmVCbG9ja0Jhc2VsaW5lKExpbmVEaXJlY3Rpb25Nb2RlIGxpbmVEaXJlY3RpCiAgICAgICAgICAg ICAgICAgKyAoc3R5bGUuaXNGbGlwcGVkTGluZXNXcml0aW5nTW9kZSgpID8gbG9naWNhbEhlaWdo dCgpIC0gbGFzdFJvb3RCb3goKS0+bG9naWNhbEJvdHRvbSgpIDogbGFzdFJvb3RCb3goKS0+bG9n aWNhbFRvcCgpKTsKICAgICAgICAgfQogI2lmIEVOQUJMRShMQVlPVVRfRk9STUFUVElOR19DT05U RVhUKQotICAgICAgICBlbHNlIGlmIChsYXlvdXRGb3JtYXR0aW5nQ29udGV4dExpbmVMYXlvdXQo KSkKLSAgICAgICAgICAgIGxhc3RCYXNlbGluZSA9IGZsb29yVG9JbnQobGF5b3V0Rm9ybWF0dGlu Z0NvbnRleHRMaW5lTGF5b3V0KCktPmxhc3RMaW5lQmFzZWxpbmUoKSk7CisgICAgICAgIGVsc2Ug aWYgKG1vZGVybkxpbmVMYXlvdXQoKSkKKyAgICAgICAgICAgIGxhc3RCYXNlbGluZSA9IGZsb29y VG9JbnQobW9kZXJuTGluZUxheW91dCgpLT5sYXN0TGluZUJhc2VsaW5lKCkpOwogI2VuZGlmCiAg ICAgfQogICAgIC8vIEFjY29yZGluZyB0byB0aGUgQ1NTIHNwZWMgaHR0cDovL3d3dy53My5vcmcv VFIvQ1NTMjEvdmlzdWRldC5odG1sLCB3ZSBzaG91bGRuJ3QgYmUgcGVyZm9ybWluZyB0aGlzIG1p biwgYnV0IHNob3VsZApAQCAtMzI4MCw4ICszMjgwLDggQEAgaW50IFJlbmRlckJsb2NrRmxvdzo6 bGluZUNvdW50KCkgY29uc3QKIAogICAgIGlmIChjaGlsZHJlbklubGluZSgpKSB7CiAjaWYgRU5B QkxFKExBWU9VVF9GT1JNQVRUSU5HX0NPTlRFWFQpCi0gICAgICAgIGlmIChsYXlvdXRGb3JtYXR0 aW5nQ29udGV4dExpbmVMYXlvdXQoKSkKLSAgICAgICAgICAgIHJldHVybiBsYXlvdXRGb3JtYXR0 aW5nQ29udGV4dExpbmVMYXlvdXQoKS0+bGluZUNvdW50KCk7CisgICAgICAgIGlmIChtb2Rlcm5M aW5lTGF5b3V0KCkpCisgICAgICAgICAgICByZXR1cm4gbW9kZXJuTGluZUxheW91dCgpLT5saW5l Q291bnQoKTsKICNlbmRpZgogICAgICAgICBpZiAoY29tcGxleExpbmVMYXlvdXQoKSkKICAgICAg ICAgICAgIHJldHVybiBjb21wbGV4TGluZUxheW91dCgpLT5saW5lQ291bnQoKTsKQEAgLTM1NjQs OCArMzU2NCw4IEBAIHZvaWQgUmVuZGVyQmxvY2tGbG93OjpwYWludElubGluZUNoaWxkcmVuKFBh aW50SW5mbyYgcGFpbnRJbmZvLCBjb25zdCBMYXlvdXRQb2luCiAgICAgQVNTRVJUKGNoaWxkcmVu SW5saW5lKCkpOwogCiAjaWYgRU5BQkxFKExBWU9VVF9GT1JNQVRUSU5HX0NPTlRFWFQpCi0gICAg aWYgKGxheW91dEZvcm1hdHRpbmdDb250ZXh0TGluZUxheW91dCgpKSB7Ci0gICAgICAgIGxheW91 dEZvcm1hdHRpbmdDb250ZXh0TGluZUxheW91dCgpLT5wYWludChwYWludEluZm8sIHBhaW50T2Zm c2V0KTsKKyAgICBpZiAobW9kZXJuTGluZUxheW91dCgpKSB7CisgICAgICAgIG1vZGVybkxpbmVM YXlvdXQoKS0+cGFpbnQocGFpbnRJbmZvLCBwYWludE9mZnNldCk7CiAgICAgICAgIHJldHVybjsK ICAgICB9CiAjZW5kaWYKQEAgLTM2MjQsOCArMzYyNCw4IEBAIGJvb2wgUmVuZGVyQmxvY2tGbG93 OjpoYXNMaW5lcygpIGNvbnN0CiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogI2lmIEVOQUJMRShM QVlPVVRfRk9STUFUVElOR19DT05URVhUKQotICAgIGlmIChsYXlvdXRGb3JtYXR0aW5nQ29udGV4 dExpbmVMYXlvdXQoKSkKLSAgICAgICAgcmV0dXJuIGxheW91dEZvcm1hdHRpbmdDb250ZXh0TGlu ZUxheW91dCgpLT5saW5lQ291bnQoKTsKKyAgICBpZiAobW9kZXJuTGluZUxheW91dCgpKQorICAg ICAgICByZXR1cm4gbW9kZXJuTGluZUxheW91dCgpLT5saW5lQ291bnQoKTsKICNlbmRpZgogCiAg ICAgcmV0dXJuIGNvbXBsZXhMaW5lTGF5b3V0KCkgJiYgY29tcGxleExpbmVMYXlvdXQoKS0+bGlu ZUJveGVzKCkuZmlyc3RMaW5lQm94KCk7CkBAIC0zNjQwLDcgKzM2NDAsNyBAQCB2b2lkIFJlbmRl ckJsb2NrRmxvdzo6aW52YWxpZGF0ZUxpbmVMYXlvdXRQYXRoKCkKICAgICBjYXNlIExpbmVCb3hl c1BhdGg6CiAgICAgICAgIHNldExpbmVMYXlvdXRQYXRoKFVuZGV0ZXJtaW5lZFBhdGgpOwogICAg ICAgICByZXR1cm47Ci0gICAgY2FzZSBMYXlvdXRGb3JtYXR0aW5nQ29udGV4dFBhdGg6IC8vIEZJ WE1FOiBOb3QgYWxsIGNsaWVudHMgb2YgaW52YWxpZGF0ZUxpbmVMYXlvdXRQYXRoKCkgYWN0dWFs bHkgbmVlZCB0byB3aXBlIHRoZSBsYXlvdXQuCisgICAgY2FzZSBNb2Rlcm5QYXRoOiAvLyBGSVhN RTogTm90IGFsbCBjbGllbnRzIG9mIGludmFsaWRhdGVMaW5lTGF5b3V0UGF0aCgpIGFjdHVhbGx5 IG5lZWQgdG8gd2lwZSB0aGUgbGF5b3V0LgogICAgICAgICBtX2xpbmVMYXlvdXQgPSBXVEY6Ok1v bm9zdGF0ZSgpOwogICAgICAgICBzZXRMaW5lTGF5b3V0UGF0aChVbmRldGVybWluZWRQYXRoKTsK ICAgICAgICAgaWYgKG5lZWRzTGF5b3V0KCkpCkBAIC0zNjUzLDE2ICszNjUzLDE2IEBAIHZvaWQg UmVuZGVyQmxvY2tGbG93OjppbnZhbGlkYXRlTGluZUxheW91dFBhdGgoKQogfQogCiAjaWYgRU5B QkxFKExBWU9VVF9GT1JNQVRUSU5HX0NPTlRFWFQpCi12b2lkIFJlbmRlckJsb2NrRmxvdzo6bGF5 b3V0TEZDTGluZXMoYm9vbCByZWxheW91dENoaWxkcmVuLCBMYXlvdXRVbml0JiByZXBhaW50TG9n aWNhbFRvcCwgTGF5b3V0VW5pdCYgcmVwYWludExvZ2ljYWxCb3R0b20pCit2b2lkIFJlbmRlckJs b2NrRmxvdzo6bGF5b3V0TW9kZXJuTGluZXMoYm9vbCByZWxheW91dENoaWxkcmVuLCBMYXlvdXRV bml0JiByZXBhaW50TG9naWNhbFRvcCwgTGF5b3V0VW5pdCYgcmVwYWludExvZ2ljYWxCb3R0b20p CiB7CiAgICAgYm9vbCBuZWVkc1VwZGF0ZVJlcGxhY2VkRGltZW5zaW9ucyA9IGZhbHNlOwogCi0g ICAgaWYgKCFsYXlvdXRGb3JtYXR0aW5nQ29udGV4dExpbmVMYXlvdXQoKSkgeworICAgIGlmICgh bW9kZXJuTGluZUxheW91dCgpKSB7CiAgICAgICAgIG1fbGluZUxheW91dCA9IG1ha2VVbmlxdWU8 TGF5b3V0SW50ZWdyYXRpb246OkxpbmVMYXlvdXQ+KCp0aGlzKTsKICAgICAgICAgbmVlZHNVcGRh dGVSZXBsYWNlZERpbWVuc2lvbnMgPSB0cnVlOwogICAgIH0KIAotICAgIGF1dG8mIGxheW91dEZv cm1hdHRpbmdDb250ZXh0TGluZUxheW91dCA9ICp0aGlzLT5sYXlvdXRGb3JtYXR0aW5nQ29udGV4 dExpbmVMYXlvdXQoKTsKKyAgICBhdXRvJiBsYXlvdXRGb3JtYXR0aW5nQ29udGV4dExpbmVMYXlv dXQgPSAqdGhpcy0+bW9kZXJuTGluZUxheW91dCgpOwogCiAgICAgZm9yIChhdXRvJiByZW5kZXJl ciA6IGNoaWxkcmVuT2ZUeXBlPFJlbmRlck9iamVjdD4oKnRoaXMpKSB7CiAgICAgICAgIGlmIChy ZWxheW91dENoaWxkcmVuKQpAQCAtMzcwNyw3ICszNzA3LDcgQEAgdm9pZCBSZW5kZXJCbG9ja0Zs b3c6OmVuc3VyZUxpbmVCb3hlcygpCiAKICAgICBib29sIG5lZWRzVG9QYWdpbmF0ZUNvbXBsZXhM aW5lcyA9IFsmXSB7CiAjaWYgRU5BQkxFKExBWU9VVF9GT1JNQVRUSU5HX0NPTlRFWFQpCi0gICAg ICAgIGlmIChsYXlvdXRGb3JtYXR0aW5nQ29udGV4dExpbmVMYXlvdXQoKSAmJiBsYXlvdXRGb3Jt YXR0aW5nQ29udGV4dExpbmVMYXlvdXQoKS0+aXNQYWdpbmF0ZWQoKSkKKyAgICAgICAgaWYgKG1v ZGVybkxpbmVMYXlvdXQoKSAmJiBtb2Rlcm5MaW5lTGF5b3V0KCktPmlzUGFnaW5hdGVkKCkpCiAg ICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICNlbmRpZgogICAgICAgICByZXR1cm4gZmFsc2U7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmggYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmgKaW5kZXggOWFmYTllOWFj YmY3Li43YzUzZGExOWMyOGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJCbG9ja0Zsb3cuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxv Y2tGbG93LmgKQEAgLTM0Myw3ICszNDMsNyBAQCBwdWJsaWM6CiAgICAgYm9vbCBoYXNMaW5lcygp IGNvbnN0OwogICAgIHZvaWQgaW52YWxpZGF0ZUxpbmVMYXlvdXRQYXRoKCkgZmluYWw7CiAKLSAg ICBlbnVtIExpbmVMYXlvdXRQYXRoIHsgVW5kZXRlcm1pbmVkUGF0aCA9IDAsIExpbmVCb3hlc1Bh dGgsIExheW91dEZvcm1hdHRpbmdDb250ZXh0UGF0aCwgRm9yY2VMaW5lQm94ZXNQYXRoIH07Cisg ICAgZW51bSBMaW5lTGF5b3V0UGF0aCB7IFVuZGV0ZXJtaW5lZFBhdGggPSAwLCBMaW5lQm94ZXNQ YXRoLCBNb2Rlcm5QYXRoLCBGb3JjZUxpbmVCb3hlc1BhdGggfTsKICAgICBMaW5lTGF5b3V0UGF0 aCBsaW5lTGF5b3V0UGF0aCgpIGNvbnN0IHsgcmV0dXJuIHN0YXRpY19jYXN0PExpbmVMYXlvdXRQ YXRoPihyZW5kZXJCbG9ja0Zsb3dMaW5lTGF5b3V0UGF0aCgpKTsgfQogICAgIHZvaWQgc2V0TGlu ZUxheW91dFBhdGgoTGluZUxheW91dFBhdGggcGF0aCkgeyBzZXRSZW5kZXJCbG9ja0Zsb3dMaW5l TGF5b3V0UGF0aChwYXRoKTsgfQogCkBAIC0zNjEsOCArMzYxLDggQEAgcHVibGljOgogICAgIGNv bnN0IENvbXBsZXhMaW5lTGF5b3V0KiBjb21wbGV4TGluZUxheW91dCgpIGNvbnN0OwogICAgIENv bXBsZXhMaW5lTGF5b3V0KiBjb21wbGV4TGluZUxheW91dCgpOwogI2lmIEVOQUJMRShMQVlPVVRf Rk9STUFUVElOR19DT05URVhUKQotICAgIGNvbnN0IExheW91dEludGVncmF0aW9uOjpMaW5lTGF5 b3V0KiBsYXlvdXRGb3JtYXR0aW5nQ29udGV4dExpbmVMYXlvdXQoKSBjb25zdDsKLSAgICBMYXlv dXRJbnRlZ3JhdGlvbjo6TGluZUxheW91dCogbGF5b3V0Rm9ybWF0dGluZ0NvbnRleHRMaW5lTGF5 b3V0KCk7CisgICAgY29uc3QgTGF5b3V0SW50ZWdyYXRpb246OkxpbmVMYXlvdXQqIG1vZGVybkxp bmVMYXlvdXQoKSBjb25zdDsKKyAgICBMYXlvdXRJbnRlZ3JhdGlvbjo6TGluZUxheW91dCogbW9k ZXJuTGluZUxheW91dCgpOwogI2VuZGlmCiAKICAgICB2b2lkIGVuc3VyZUxpbmVCb3hlcygpOwpA QCAtNTQzLDggKzU0Myw4IEBAIHByaXZhdGU6CiAgICAgYm9vbCBoYXNDb21wbGV4TGluZUxheW91 dCgpIGNvbnN0OwogCiAjaWYgRU5BQkxFKExBWU9VVF9GT1JNQVRUSU5HX0NPTlRFWFQpCi0gICAg Ym9vbCBoYXNMYXlvdXRGb3JtYXR0aW5nQ29udGV4dExpbmVMYXlvdXQoKSBjb25zdDsKLSAgICB2 b2lkIGxheW91dExGQ0xpbmVzKGJvb2wgcmVsYXlvdXRDaGlsZHJlbiwgTGF5b3V0VW5pdCYgcmVw YWludExvZ2ljYWxUb3AsIExheW91dFVuaXQmIHJlcGFpbnRMb2dpY2FsQm90dG9tKTsKKyAgICBi b29sIGhhc01vZGVybkxpbmVMYXlvdXQoKSBjb25zdDsKKyAgICB2b2lkIGxheW91dE1vZGVybkxp bmVzKGJvb2wgcmVsYXlvdXRDaGlsZHJlbiwgTGF5b3V0VW5pdCYgcmVwYWludExvZ2ljYWxUb3As IExheW91dFVuaXQmIHJlcGFpbnRMb2dpY2FsQm90dG9tKTsKICNlbmRpZgogCiAgICAgdm9pZCBh ZGp1c3RJbnRyaW5zaWNMb2dpY2FsV2lkdGhzRm9yQ29sdW1ucyhMYXlvdXRVbml0JiBtaW5Mb2dp Y2FsV2lkdGgsIExheW91dFVuaXQmIG1heExvZ2ljYWxXaWR0aCkgY29uc3Q7CkBAIC02MTgsMTkg KzYxOCwxOSBAQCBpbmxpbmUgQ29tcGxleExpbmVMYXlvdXQqIFJlbmRlckJsb2NrRmxvdzo6Y29t cGxleExpbmVMYXlvdXQoKQogfQogCiAjaWYgRU5BQkxFKExBWU9VVF9GT1JNQVRUSU5HX0NPTlRF WFQpCi1pbmxpbmUgYm9vbCBSZW5kZXJCbG9ja0Zsb3c6Omhhc0xheW91dEZvcm1hdHRpbmdDb250 ZXh0TGluZUxheW91dCgpIGNvbnN0CitpbmxpbmUgYm9vbCBSZW5kZXJCbG9ja0Zsb3c6Omhhc01v ZGVybkxpbmVMYXlvdXQoKSBjb25zdAogewogICAgIHJldHVybiBXVEY6OmhvbGRzX2FsdGVybmF0 aXZlPHN0ZDo6dW5pcXVlX3B0cjxMYXlvdXRJbnRlZ3JhdGlvbjo6TGluZUxheW91dD4+KG1fbGlu ZUxheW91dCk7CiB9CiAKLWlubGluZSBjb25zdCBMYXlvdXRJbnRlZ3JhdGlvbjo6TGluZUxheW91 dCogUmVuZGVyQmxvY2tGbG93OjpsYXlvdXRGb3JtYXR0aW5nQ29udGV4dExpbmVMYXlvdXQoKSBj b25zdAoraW5saW5lIGNvbnN0IExheW91dEludGVncmF0aW9uOjpMaW5lTGF5b3V0KiBSZW5kZXJC bG9ja0Zsb3c6Om1vZGVybkxpbmVMYXlvdXQoKSBjb25zdAogewotICAgIHJldHVybiBoYXNMYXlv dXRGb3JtYXR0aW5nQ29udGV4dExpbmVMYXlvdXQoKSA/IFdURjo6Z2V0PHN0ZDo6dW5pcXVlX3B0 cjxMYXlvdXRJbnRlZ3JhdGlvbjo6TGluZUxheW91dD4+KG1fbGluZUxheW91dCkuZ2V0KCkgOiBu dWxscHRyOworICAgIHJldHVybiBoYXNNb2Rlcm5MaW5lTGF5b3V0KCkgPyBXVEY6OmdldDxzdGQ6 OnVuaXF1ZV9wdHI8TGF5b3V0SW50ZWdyYXRpb246OkxpbmVMYXlvdXQ+PihtX2xpbmVMYXlvdXQp LmdldCgpIDogbnVsbHB0cjsKIH0KIAotaW5saW5lIExheW91dEludGVncmF0aW9uOjpMaW5lTGF5 b3V0KiBSZW5kZXJCbG9ja0Zsb3c6OmxheW91dEZvcm1hdHRpbmdDb250ZXh0TGluZUxheW91dCgp CitpbmxpbmUgTGF5b3V0SW50ZWdyYXRpb246OkxpbmVMYXlvdXQqIFJlbmRlckJsb2NrRmxvdzo6 bW9kZXJuTGluZUxheW91dCgpCiB7Ci0gICAgcmV0dXJuIGhhc0xheW91dEZvcm1hdHRpbmdDb250 ZXh0TGluZUxheW91dCgpID8gV1RGOjpnZXQ8c3RkOjp1bmlxdWVfcHRyPExheW91dEludGVncmF0 aW9uOjpMaW5lTGF5b3V0Pj4obV9saW5lTGF5b3V0KS5nZXQoKSA6IG51bGxwdHI7CisgICAgcmV0 dXJuIGhhc01vZGVybkxpbmVMYXlvdXQoKSA/IFdURjo6Z2V0PHN0ZDo6dW5pcXVlX3B0cjxMYXlv dXRJbnRlZ3JhdGlvbjo6TGluZUxheW91dD4+KG1fbGluZUxheW91dCkuZ2V0KCkgOiBudWxscHRy OwogfQogI2VuZGlmCiAK