212876 2020-06-06 20:50:03 -0700 [LFC][BFC] Intrinsic width computation should take min/max-width into account. 2020-06-07 08:01:18 -0700 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 1660031 0 zalan 2020-06-06 20:50:03 -0700 ssia 1660032 1 401285 zalan 2020-06-06 20:55:16 -0700 Created attachment 401285 Patch 1660048 2 401285 koivisto 2020-06-07 02:45:37 -0700 Comment on attachment 401285 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=401285&action=review > Source/WebCore/layout/FormattingContextGeometry.cpp:120 > - return width; > + return style.logicalWidth(); Probably don't need this return since all paths of the switch return. 1660049 3 401285 koivisto 2020-06-07 02:48:53 -0700 Comment on attachment 401285 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=401285&action=review >> Source/WebCore/layout/FormattingContextGeometry.cpp:120 >> + return style.logicalWidth(); > > Probably don't need this return since all paths of the switch return. Actually, it is better to not have a default in the switch and instead have ASSERT_NOT_REACHED() here. That way if the enum ever gain another member the compiler will force handling that case. 1660059 4 401291 zalan 2020-06-07 07:10:16 -0700 Created attachment 401291 Patch 1660074 5 ews-feeder 2020-06-07 08:00:12 -0700 Committed r262698: <https://trac.webkit.org/changeset/262698> All reviewed patches have been landed. Closing bug and clearing flags on attachment 401291. 1660075 6 webkit-bug-importer 2020-06-07 08:01:18 -0700 <rdar://problem/64089714> 401285 2020-06-06 20:55:16 -0700 2020-06-07 07:10:15 -0700 Patch bug-212876-20200606205515.patch text/plain 7220 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyNDE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGZkODNiYTI4MDZjOTUx NjdiNzQ0NWE4ZTk2ZDkwMzEzYTdjNjZhZS4uZjQzNzVmMjQxNDEwYjE4NWNhZGQ4Yjc0ODIyZGRi ZDBkODI3Y2ZkYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIwLTA2LTA2ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bQkZDXSBJbnRyaW5z aWMgd2lkdGggY29tcHV0YXRpb24gc2hvdWxkIHRha2UgbWluL21heC13aWR0aCBpbnRvIGFjY291 bnQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTI4 NzYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0 OiBmYXN0L2xheW91dGZvcm1hdHRpbmdjb250ZXh0L21pbi1tYXgtY29udGVudC13aWR0aC1zaW1w bGUyLmh0bWwKKworICAgICAgICAqIGxheW91dC9Gb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6Rm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5 Ojpjb21wdXRlZFdpZHRoVmFsdWUpOiBBZGRyZXNzIFNhbSdzIHBvc3QtbGFuZGluZyBjb21tZW50 LgorICAgICAgICAqIGxheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4 dEdlb21ldHJ5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6QmxvY2tGb3JtYXR0aW5n Q29udGV4dDo6R2VvbWV0cnk6OmludHJpbnNpY1dpZHRoQ29uc3RyYWludHMpOgorCiAyMDIwLTA2 LTA2ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ10gQWRk IHN1cHBvcnQgZm9yIHdpZHRoOiBtaW4vbWF4LWNvbnRlbnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcCBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcAppbmRleCAzOWNhM2I5M2Fh ZTM4YzQ1OTdkMWI4MjUwOWZiZjAyYTU3ZGEyYTNlLi5kZGYxMWIxMTAyMzJhMTc4MGUxYzFhYjc3 YTI4NGRlZjc3OTBkM2UzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0 dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1h dHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCkBAIC0xMDYsMjMgKzEwNiwxOCBAQCBPcHRpb25hbDxM YXlvdXRVbml0PiBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmNvbXB1dGVkV2lkdGhWYWx1 ZShjb25zdCBCb3gmCiAKICAgICBhdXRvIHdpZHRoID0gWyZdIHsKICAgICAgICAgYXV0byYgc3R5 bGUgPSBsYXlvdXRCb3guc3R5bGUoKTsKLSAgICAgICAgYXV0byB3aWR0aCA9IHN0eWxlLmxvZ2lj YWxXaWR0aCgpOyAgCi0KICAgICAgICAgc3dpdGNoICh3aWR0aFR5cGUpIHsKICAgICAgICAgY2Fz ZSBXaWR0aFR5cGU6Ok5vcm1hbDoKLSAgICAgICAgICAgIHdpZHRoID0gc3R5bGUubG9naWNhbFdp ZHRoKCk7Ci0gICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIHJldHVybiBzdHlsZS5sb2dp Y2FsV2lkdGgoKTsKICAgICAgICAgY2FzZSBXaWR0aFR5cGU6Ok1pbjoKLSAgICAgICAgICAgIHdp ZHRoID0gc3R5bGUubG9naWNhbE1pbldpZHRoKCk7Ci0gICAgICAgICAgICBicmVhazsKKyAgICAg ICAgICAgIHJldHVybiBzdHlsZS5sb2dpY2FsTWluV2lkdGgoKTsKICAgICAgICAgY2FzZSBXaWR0 aFR5cGU6Ok1heDoKLSAgICAgICAgICAgIHdpZHRoID0gc3R5bGUubG9naWNhbE1heFdpZHRoKCk7 Ci0gICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIHJldHVybiBzdHlsZS5sb2dpY2FsTWF4 V2lkdGgoKTsKICAgICAgICAgZGVmYXVsdDoKICAgICAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hF RCgpOwotICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICByZXR1cm4gc3R5bGUubG9naWNh bFdpZHRoKCk7CiAgICAgICAgIH0KLSAgICAgICAgcmV0dXJuIHdpZHRoOworICAgICAgICByZXR1 cm4gc3R5bGUubG9naWNhbFdpZHRoKCk7CiAgICAgfSgpOwogICAgIGlmIChhdXRvIGNvbXB1dGVk VmFsdWUgPSB0aGlzLT5jb21wdXRlZFZhbHVlKHdpZHRoLCBjb250YWluaW5nQmxvY2tXaWR0aCkp CiAgICAgICAgIHJldHVybiBjb21wdXRlZFZhbHVlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnku Y3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRp bmdDb250ZXh0R2VvbWV0cnkuY3BwCmluZGV4IDQ1NTEyYzgxNzE3ZTY3ZDZhYWI2YmZlM2JmZGYx YTFjZTU5M2U1ZmMuLmVlZjg5YjNhNGMyMDE3YTNhNGFjNGYwMWY0ZGYxNzIzMjQ5MTc2ZjkgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3Jt YXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxv Y2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAKQEAgLTI5Niwx NCArMjk2LDE1IEBAIEZvcm1hdHRpbmdDb250ZXh0OjpJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRz IEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjppCiAgICAgfTsKIAogICAgIGF1dG8g Y29tcHV0ZWRJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzID0gWyZdKCkgLT4gSW50cmluc2ljV2lk dGhDb25zdHJhaW50cyB7Ci0gICAgICAgIGF1dG8mIHN0eWxlID0gbGF5b3V0Qm94LnN0eWxlKCk7 Ci0gICAgICAgIGlmIChhdXRvIHdpZHRoID0gZml4ZWRWYWx1ZShzdHlsZS5sb2dpY2FsV2lkdGgo KSkpCi0gICAgICAgICAgICByZXR1cm4geyAqd2lkdGgsICp3aWR0aCB9OwotCisgICAgICAgIGF1 dG8gbG9naWNhbFdpZHRoID0gbGF5b3V0Qm94LnN0eWxlKCkubG9naWNhbFdpZHRoKCk7CiAgICAg ICAgIC8vIE1pbmltdW0vbWF4aW11bSB3aWR0aCBjYW4ndCBiZSBkZXBlbmRpbmcgb24gdGhlIGNv bnRhaW5pbmcgYmxvY2sncyB3aWR0aC4KLSAgICAgICAgaWYgKCFzdHlsZS5sb2dpY2FsV2lkdGgo KS5pc0F1dG8oKSkKKyAgICAgICAgYXV0byBuZWVkc1Jlc29sdmVkQ29udGFpbmluZ0Jsb2NrV2lk dGggPSBsb2dpY2FsV2lkdGguaXNDYWxjdWxhdGVkKCkgfHwgbG9naWNhbFdpZHRoLmlzUGVyY2Vu dCgpIHx8IGxvZ2ljYWxXaWR0aC5pc1JlbGF0aXZlKCk7CisgICAgICAgIGlmIChuZWVkc1Jlc29s dmVkQ29udGFpbmluZ0Jsb2NrV2lkdGgpCiAgICAgICAgICAgICByZXR1cm4geyB9OwogCisgICAg ICAgIGlmIChhdXRvIHdpZHRoID0gZml4ZWRWYWx1ZShsb2dpY2FsV2lkdGgpKQorICAgICAgICAg ICAgcmV0dXJuIHsgKndpZHRoLCAqd2lkdGggfTsKKwogICAgICAgICBpZiAobGF5b3V0Qm94Lmlz UmVwbGFjZWRCb3goKSkgewogICAgICAgICAgICAgYXV0byYgcmVwbGFjZWRCb3ggPSBkb3duY2Fz dDxSZXBsYWNlZEJveD4obGF5b3V0Qm94KTsKICAgICAgICAgICAgIGlmIChyZXBsYWNlZEJveC5o YXNJbnRyaW5zaWNXaWR0aCgpKSB7CkBAIC0zMTYsOCArMzE3LDE0IEBAIEZvcm1hdHRpbmdDb250 ZXh0OjpJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Okdl b21ldHJ5OjppCiAgICAgICAgIGlmICghaXM8Q29udGFpbmVyQm94PihsYXlvdXRCb3gpIHx8ICFk b3duY2FzdDxDb250YWluZXJCb3g+KGxheW91dEJveCkuaGFzSW5GbG93T3JGbG9hdGluZ0NoaWxk KCkpCiAgICAgICAgICAgICByZXR1cm4geyB9OwogCi0gICAgICAgIGlmIChsYXlvdXRCb3guZXN0 YWJsaXNoZXNGb3JtYXR0aW5nQ29udGV4dCgpKQotICAgICAgICAgICAgcmV0dXJuIExheW91dENv bnRleHQ6OmNyZWF0ZUZvcm1hdHRpbmdDb250ZXh0KGRvd25jYXN0PENvbnRhaW5lckJveD4obGF5 b3V0Qm94KSwgbGF5b3V0U3RhdGUoKSktPmNvbXB1dGVkSW50cmluc2ljV2lkdGhDb25zdHJhaW50 cygpOworICAgICAgICBpZiAobGF5b3V0Qm94LmVzdGFibGlzaGVzRm9ybWF0dGluZ0NvbnRleHQo KSkgeworICAgICAgICAgICAgYXV0byBpbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzID0gTGF5b3V0 Q29udGV4dDo6Y3JlYXRlRm9ybWF0dGluZ0NvbnRleHQoZG93bmNhc3Q8Q29udGFpbmVyQm94Pihs YXlvdXRCb3gpLCBsYXlvdXRTdGF0ZSgpKS0+Y29tcHV0ZWRJbnRyaW5zaWNXaWR0aENvbnN0cmFp bnRzKCk7CisgICAgICAgICAgICBpZiAobG9naWNhbFdpZHRoLmlzTWluQ29udGVudCgpKQorICAg ICAgICAgICAgICAgIHJldHVybiB7IGludHJpbnNpY1dpZHRoQ29uc3RyYWludHMubWluaW11bSwg aW50cmluc2ljV2lkdGhDb25zdHJhaW50cy5taW5pbXVtIH07CisgICAgICAgICAgICBpZiAobG9n aWNhbFdpZHRoLmlzTWF4Q29udGVudCgpKQorICAgICAgICAgICAgICAgIHJldHVybiB7IGludHJp bnNpY1dpZHRoQ29uc3RyYWludHMubWF4aW11bSwgaW50cmluc2ljV2lkdGhDb25zdHJhaW50cy5t YXhpbXVtIH07CisgICAgICAgICAgICByZXR1cm4gaW50cmluc2ljV2lkdGhDb25zdHJhaW50czsK KyAgICAgICAgfQogCiAgICAgICAgIGF1dG8gaW50cmluc2ljV2lkdGhDb25zdHJhaW50cyA9IElu dHJpbnNpY1dpZHRoQ29uc3RyYWludHMgeyB9OwogICAgICAgICBhdXRvJiBmb3JtYXR0aW5nU3Rh dGUgPSBsYXlvdXRTdGF0ZSgpLmZvcm1hdHRpbmdTdGF0ZUZvckJveChsYXlvdXRCb3gpOwpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmlu ZGV4IDk4ZGFhNWY0NWU0MGIyMzc1MjQyYjczYjY3ZjBhODhhZWYzYzgzMGUuLjVhMTE4MzYyZGY3 ZjNlZDI3YjcyMGY1MGE3YjgzNDIxZjA2YWVhMDcgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0No YW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAy MC0wNi0wNiAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgorCisgICAgICAgIFtMRkNd W0JGQ10gSW50cmluc2ljIHdpZHRoIGNvbXB1dGF0aW9uIHNob3VsZCB0YWtlIG1pbi9tYXgtd2lk dGggaW50byBhY2NvdW50LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjEyODc2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBmYXN0L2xheW91dGZvcm1hdHRpbmdjb250ZXh0L21pbi1tYXgtY29udGVudC13 aWR0aC1zaW1wbGUyLWV4cGVjdGVkLmh0bWw6IEFkZGVkLgorICAgICAgICAqIGZhc3QvbGF5b3V0 Zm9ybWF0dGluZ2NvbnRleHQvbWluLW1heC1jb250ZW50LXdpZHRoLXNpbXBsZTIuaHRtbDogQWRk ZWQuCisKIDIwMjAtMDYtMDYgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAg ICAgICBbTEZDXSBBZGQgc3VwcG9ydCBmb3Igd2lkdGg6IG1pbi9tYXgtY29udGVudApkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9sYXlvdXRmb3JtYXR0aW5nY29udGV4dC9taW4tbWF4LWNv bnRlbnQtd2lkdGgtc2ltcGxlMi1leHBlY3RlZC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9sYXlv dXRmb3JtYXR0aW5nY29udGV4dC9taW4tbWF4LWNvbnRlbnQtd2lkdGgtc2ltcGxlMi1leHBlY3Rl ZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAuLmVjYzBmNGRmMWNjOWVmMDQ2MTI1MmUyYmIyYzMxNDY0NDc4MDQw ZDAKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2xheW91dGZvcm1hdHRpbmdj b250ZXh0L21pbi1tYXgtY29udGVudC13aWR0aC1zaW1wbGUyLWV4cGVjdGVkLmh0bWwKQEAgLTAs MCArMSw4IEBACis8IS0tIHdlYmtpdC10ZXN0LXJ1bm5lciBbIGludGVybmFsOkxheW91dEZvcm1h dHRpbmdDb250ZXh0RW5hYmxlZD10cnVlIGludGVybmFsOkxheW91dEZvcm1hdHRpbmdDb250ZXh0 SW50ZWdyYXRpb25FbmFibGVkPWZhbHNlIF0gLS0+Cis8c3R5bGU+CitkaXYgeworICBib3JkZXI6 IDFweCBzb2xpZCBncmVlbjsKK30KKzwvc3R5bGU+Cis8ZGl2IHN0eWxlPSJ3aWR0aDogNzBweDsg aGVpZ2h0OiAzMHB4OyI+PC9kaXY+Cis8ZGl2IHN0eWxlPSJ3aWR0aDogMTcwcHg7IGhlaWdodDog MTBweDsiPjwvZGl2PgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9sYXlvdXRmb3JtYXR0 aW5nY29udGV4dC9taW4tbWF4LWNvbnRlbnQtd2lkdGgtc2ltcGxlMi5odG1sIGIvTGF5b3V0VGVz dHMvZmFzdC9sYXlvdXRmb3JtYXR0aW5nY29udGV4dC9taW4tbWF4LWNvbnRlbnQtd2lkdGgtc2lt cGxlMi5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAuLmJkMmQwYTVkZjY2MGNjNjBlMzc1N2IzNmIyZDAzZDI1YWZi YjAzYWEKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2xheW91dGZvcm1hdHRp bmdjb250ZXh0L21pbi1tYXgtY29udGVudC13aWR0aC1zaW1wbGUyLmh0bWwKQEAgLTAsMCArMSwx MyBAQAorPCEtLSB3ZWJraXQtdGVzdC1ydW5uZXIgWyBpbnRlcm5hbDpMYXlvdXRGb3JtYXR0aW5n Q29udGV4dEVuYWJsZWQ9dHJ1ZSBpbnRlcm5hbDpMYXlvdXRGb3JtYXR0aW5nQ29udGV4dEludGVn cmF0aW9uRW5hYmxlZD1mYWxzZSBdIC0tPgorPHN0eWxlPgorLnNocmlua1RvRml0IHsKKyAgYm9y ZGVyOiAxcHggc29saWQgZ3JlZW47CisgIGZvbnQtc2l6ZTogMTBweDsKKyAgZm9udC1mYW1pbHk6 IEFoZW07CisgIGNvbG9yOiB3aGl0ZTsKKyAgcG9zaXRpb246IGFic29sdXRlOworfQorPC9zdHls ZT4KKzxib2R5PgorPGRpdiBjbGFzcz1zaHJpbmtUb0ZpdD48ZGl2IHN0eWxlPSJ3aWR0aDogbWlu LWNvbnRlbnQiPm1pbiBjb250ZW50IHdpZHRoPC9kaXY+PC9kaXY+Cis8ZGl2IGNsYXNzPXNocmlu a1RvRml0IHN0eWxlPSJtYXJnaW4tdG9wOiAzMnB4OyI+PGRpdiBzdHlsZT0id2lkdGg6IG1heC1j b250ZW50Ij5tYXggY29udGVudCB3aWR0aDwvZGl2PjwvZGl2Pgo= 401291 2020-06-07 07:10:16 -0700 2020-06-07 08:00:13 -0700 Patch bug-212876-20200607071016.patch text/plain 7209 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyNDE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGZkODNiYTI4MDZjOTUx NjdiNzQ0NWE4ZTk2ZDkwMzEzYTdjNjZhZS4uYTY0ZmEwNzA3ZjYwMGExOGVhZWQ4NGRlNzk0MDRh MDZmZDk0MDE5NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIwLTA2LTA2ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bQkZDXSBJbnRyaW5z aWMgd2lkdGggY29tcHV0YXRpb24gc2hvdWxkIHRha2UgbWluL21heC13aWR0aCBpbnRvIGFjY291 bnQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTI4 NzYKKworICAgICAgICBSZXZpZXdlZCBieSBBbnR0aSBLb2l2aXN0by4KKworICAgICAgICBUZXN0 OiBmYXN0L2xheW91dGZvcm1hdHRpbmdjb250ZXh0L21pbi1tYXgtY29udGVudC13aWR0aC1zaW1w bGUyLmh0bWwKKworICAgICAgICAqIGxheW91dC9Gb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6Rm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5 Ojpjb21wdXRlZFdpZHRoVmFsdWUpOiBBZGRyZXNzIFNhbSdzIHBvc3QtbGFuZGluZyBjb21tZW50 LgorICAgICAgICAqIGxheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4 dEdlb21ldHJ5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6QmxvY2tGb3JtYXR0aW5n Q29udGV4dDo6R2VvbWV0cnk6OmludHJpbnNpY1dpZHRoQ29uc3RyYWludHMpOgorCiAyMDIwLTA2 LTA2ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ10gQWRk IHN1cHBvcnQgZm9yIHdpZHRoOiBtaW4vbWF4LWNvbnRlbnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcCBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcAppbmRleCAzOWNhM2I5M2Fh ZTM4YzQ1OTdkMWI4MjUwOWZiZjAyYTU3ZGEyYTNlLi5mYjQwYWI3N2VlMGY3YTY1OGI5ODY2ZjAz MWE4N2FmOWY3YTA5Nzc3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0 dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1h dHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCkBAIC0xMDYsMjMgKzEwNiwxNiBAQCBPcHRpb25hbDxM YXlvdXRVbml0PiBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmNvbXB1dGVkV2lkdGhWYWx1 ZShjb25zdCBCb3gmCiAKICAgICBhdXRvIHdpZHRoID0gWyZdIHsKICAgICAgICAgYXV0byYgc3R5 bGUgPSBsYXlvdXRCb3guc3R5bGUoKTsKLSAgICAgICAgYXV0byB3aWR0aCA9IHN0eWxlLmxvZ2lj YWxXaWR0aCgpOyAgCi0KICAgICAgICAgc3dpdGNoICh3aWR0aFR5cGUpIHsKICAgICAgICAgY2Fz ZSBXaWR0aFR5cGU6Ok5vcm1hbDoKLSAgICAgICAgICAgIHdpZHRoID0gc3R5bGUubG9naWNhbFdp ZHRoKCk7Ci0gICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIHJldHVybiBzdHlsZS5sb2dp Y2FsV2lkdGgoKTsKICAgICAgICAgY2FzZSBXaWR0aFR5cGU6Ok1pbjoKLSAgICAgICAgICAgIHdp ZHRoID0gc3R5bGUubG9naWNhbE1pbldpZHRoKCk7Ci0gICAgICAgICAgICBicmVhazsKKyAgICAg ICAgICAgIHJldHVybiBzdHlsZS5sb2dpY2FsTWluV2lkdGgoKTsKICAgICAgICAgY2FzZSBXaWR0 aFR5cGU6Ok1heDoKLSAgICAgICAgICAgIHdpZHRoID0gc3R5bGUubG9naWNhbE1heFdpZHRoKCk7 Ci0gICAgICAgICAgICBicmVhazsKLSAgICAgICAgZGVmYXVsdDoKLSAgICAgICAgICAgIEFTU0VS VF9OT1RfUkVBQ0hFRCgpOwotICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICByZXR1cm4g c3R5bGUubG9naWNhbE1heFdpZHRoKCk7CiAgICAgICAgIH0KLSAgICAgICAgcmV0dXJuIHdpZHRo OworICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICAgICAgcmV0dXJuIHN0eWxlLmxv Z2ljYWxXaWR0aCgpOwogICAgIH0oKTsKICAgICBpZiAoYXV0byBjb21wdXRlZFZhbHVlID0gdGhp cy0+Y29tcHV0ZWRWYWx1ZSh3aWR0aCwgY29udGFpbmluZ0Jsb2NrV2lkdGgpKQogICAgICAgICBy ZXR1cm4gY29tcHV0ZWRWYWx1ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9i bG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dEdl b21ldHJ5LmNwcAppbmRleCA0NTUxMmM4MTcxN2U2N2Q2YWFiNmJmZTNiZmRmMWExY2U1OTNlNWZj Li5lZWY4OWIzYTRjMjAxN2EzYTRhYzRmMDFmNGRmMTcyMzI0OTE3NmY5IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRl eHRHZW9tZXRyeS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGlu Zy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCkBAIC0yOTYsMTQgKzI5NiwxNSBA QCBGb3JtYXR0aW5nQ29udGV4dDo6SW50cmluc2ljV2lkdGhDb25zdHJhaW50cyBCbG9ja0Zvcm1h dHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6aQogICAgIH07CiAKICAgICBhdXRvIGNvbXB1dGVkSW50 cmluc2ljV2lkdGhDb25zdHJhaW50cyA9IFsmXSgpIC0+IEludHJpbnNpY1dpZHRoQ29uc3RyYWlu dHMgewotICAgICAgICBhdXRvJiBzdHlsZSA9IGxheW91dEJveC5zdHlsZSgpOwotICAgICAgICBp ZiAoYXV0byB3aWR0aCA9IGZpeGVkVmFsdWUoc3R5bGUubG9naWNhbFdpZHRoKCkpKQotICAgICAg ICAgICAgcmV0dXJuIHsgKndpZHRoLCAqd2lkdGggfTsKLQorICAgICAgICBhdXRvIGxvZ2ljYWxX aWR0aCA9IGxheW91dEJveC5zdHlsZSgpLmxvZ2ljYWxXaWR0aCgpOwogICAgICAgICAvLyBNaW5p bXVtL21heGltdW0gd2lkdGggY2FuJ3QgYmUgZGVwZW5kaW5nIG9uIHRoZSBjb250YWluaW5nIGJs b2NrJ3Mgd2lkdGguCi0gICAgICAgIGlmICghc3R5bGUubG9naWNhbFdpZHRoKCkuaXNBdXRvKCkp CisgICAgICAgIGF1dG8gbmVlZHNSZXNvbHZlZENvbnRhaW5pbmdCbG9ja1dpZHRoID0gbG9naWNh bFdpZHRoLmlzQ2FsY3VsYXRlZCgpIHx8IGxvZ2ljYWxXaWR0aC5pc1BlcmNlbnQoKSB8fCBsb2dp Y2FsV2lkdGguaXNSZWxhdGl2ZSgpOworICAgICAgICBpZiAobmVlZHNSZXNvbHZlZENvbnRhaW5p bmdCbG9ja1dpZHRoKQogICAgICAgICAgICAgcmV0dXJuIHsgfTsKIAorICAgICAgICBpZiAoYXV0 byB3aWR0aCA9IGZpeGVkVmFsdWUobG9naWNhbFdpZHRoKSkKKyAgICAgICAgICAgIHJldHVybiB7 ICp3aWR0aCwgKndpZHRoIH07CisKICAgICAgICAgaWYgKGxheW91dEJveC5pc1JlcGxhY2VkQm94 KCkpIHsKICAgICAgICAgICAgIGF1dG8mIHJlcGxhY2VkQm94ID0gZG93bmNhc3Q8UmVwbGFjZWRC b3g+KGxheW91dEJveCk7CiAgICAgICAgICAgICBpZiAocmVwbGFjZWRCb3guaGFzSW50cmluc2lj V2lkdGgoKSkgewpAQCAtMzE2LDggKzMxNywxNCBAQCBGb3JtYXR0aW5nQ29udGV4dDo6SW50cmlu c2ljV2lkdGhDb25zdHJhaW50cyBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6aQog ICAgICAgICBpZiAoIWlzPENvbnRhaW5lckJveD4obGF5b3V0Qm94KSB8fCAhZG93bmNhc3Q8Q29u dGFpbmVyQm94PihsYXlvdXRCb3gpLmhhc0luRmxvd09yRmxvYXRpbmdDaGlsZCgpKQogICAgICAg ICAgICAgcmV0dXJuIHsgfTsKIAotICAgICAgICBpZiAobGF5b3V0Qm94LmVzdGFibGlzaGVzRm9y bWF0dGluZ0NvbnRleHQoKSkKLSAgICAgICAgICAgIHJldHVybiBMYXlvdXRDb250ZXh0OjpjcmVh dGVGb3JtYXR0aW5nQ29udGV4dChkb3duY2FzdDxDb250YWluZXJCb3g+KGxheW91dEJveCksIGxh eW91dFN0YXRlKCkpLT5jb21wdXRlZEludHJpbnNpY1dpZHRoQ29uc3RyYWludHMoKTsKKyAgICAg ICAgaWYgKGxheW91dEJveC5lc3RhYmxpc2hlc0Zvcm1hdHRpbmdDb250ZXh0KCkpIHsKKyAgICAg ICAgICAgIGF1dG8gaW50cmluc2ljV2lkdGhDb25zdHJhaW50cyA9IExheW91dENvbnRleHQ6OmNy ZWF0ZUZvcm1hdHRpbmdDb250ZXh0KGRvd25jYXN0PENvbnRhaW5lckJveD4obGF5b3V0Qm94KSwg bGF5b3V0U3RhdGUoKSktPmNvbXB1dGVkSW50cmluc2ljV2lkdGhDb25zdHJhaW50cygpOworICAg ICAgICAgICAgaWYgKGxvZ2ljYWxXaWR0aC5pc01pbkNvbnRlbnQoKSkKKyAgICAgICAgICAgICAg ICByZXR1cm4geyBpbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzLm1pbmltdW0sIGludHJpbnNpY1dp ZHRoQ29uc3RyYWludHMubWluaW11bSB9OworICAgICAgICAgICAgaWYgKGxvZ2ljYWxXaWR0aC5p c01heENvbnRlbnQoKSkKKyAgICAgICAgICAgICAgICByZXR1cm4geyBpbnRyaW5zaWNXaWR0aENv bnN0cmFpbnRzLm1heGltdW0sIGludHJpbnNpY1dpZHRoQ29uc3RyYWludHMubWF4aW11bSB9Owor ICAgICAgICAgICAgcmV0dXJuIGludHJpbnNpY1dpZHRoQ29uc3RyYWludHM7CisgICAgICAgIH0K IAogICAgICAgICBhdXRvIGludHJpbnNpY1dpZHRoQ29uc3RyYWludHMgPSBJbnRyaW5zaWNXaWR0 aENvbnN0cmFpbnRzIHsgfTsKICAgICAgICAgYXV0byYgZm9ybWF0dGluZ1N0YXRlID0gbGF5b3V0 U3RhdGUoKS5mb3JtYXR0aW5nU3RhdGVGb3JCb3gobGF5b3V0Qm94KTsKZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA5OGRhYTVm NDVlNDBiMjM3NTI0MmI3M2I2N2YwYTg4YWVmM2M4MzBlLi5mNmMwYTEyYTE1MTFlMmUxZmE1NjAy MDYyZDRiMjllYmViOGZkYzg1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysr IGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjAtMDYtMDYgIFph bGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtCRkNdIEludHJp bnNpYyB3aWR0aCBjb21wdXRhdGlvbiBzaG91bGQgdGFrZSBtaW4vbWF4LXdpZHRoIGludG8gYWNj b3VudC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIx Mjg3NgorCisgICAgICAgIFJldmlld2VkIGJ5IEFudHRpIEtvaXZpc3RvLgorCisgICAgICAgICog ZmFzdC9sYXlvdXRmb3JtYXR0aW5nY29udGV4dC9taW4tbWF4LWNvbnRlbnQtd2lkdGgtc2ltcGxl Mi1leHBlY3RlZC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2xheW91dGZvcm1hdHRpbmdj b250ZXh0L21pbi1tYXgtY29udGVudC13aWR0aC1zaW1wbGUyLmh0bWw6IEFkZGVkLgorCiAyMDIw LTA2LTA2ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ10g QWRkIHN1cHBvcnQgZm9yIHdpZHRoOiBtaW4vbWF4LWNvbnRlbnQKZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL2Zhc3QvbGF5b3V0Zm9ybWF0dGluZ2NvbnRleHQvbWluLW1heC1jb250ZW50LXdpZHRo LXNpbXBsZTItZXhwZWN0ZWQuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvbGF5b3V0Zm9ybWF0dGlu Z2NvbnRleHQvbWluLW1heC1jb250ZW50LXdpZHRoLXNpbXBsZTItZXhwZWN0ZWQuaHRtbApuZXcg ZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwLi5lY2MwZjRkZjFjYzllZjA0NjEyNTJlMmJiMmMzMTQ2NDQ3ODA0MGQwCi0tLSAvZGV2 L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9sYXlvdXRmb3JtYXR0aW5nY29udGV4dC9taW4t bWF4LWNvbnRlbnQtd2lkdGgtc2ltcGxlMi1leHBlY3RlZC5odG1sCkBAIC0wLDAgKzEsOCBAQAor PCEtLSB3ZWJraXQtdGVzdC1ydW5uZXIgWyBpbnRlcm5hbDpMYXlvdXRGb3JtYXR0aW5nQ29udGV4 dEVuYWJsZWQ9dHJ1ZSBpbnRlcm5hbDpMYXlvdXRGb3JtYXR0aW5nQ29udGV4dEludGVncmF0aW9u RW5hYmxlZD1mYWxzZSBdIC0tPgorPHN0eWxlPgorZGl2IHsKKyAgYm9yZGVyOiAxcHggc29saWQg Z3JlZW47Cit9Cis8L3N0eWxlPgorPGRpdiBzdHlsZT0id2lkdGg6IDcwcHg7IGhlaWdodDogMzBw eDsiPjwvZGl2PgorPGRpdiBzdHlsZT0id2lkdGg6IDE3MHB4OyBoZWlnaHQ6IDEwcHg7Ij48L2Rp dj4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvbGF5b3V0Zm9ybWF0dGluZ2NvbnRleHQv bWluLW1heC1jb250ZW50LXdpZHRoLXNpbXBsZTIuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvbGF5 b3V0Zm9ybWF0dGluZ2NvbnRleHQvbWluLW1heC1jb250ZW50LXdpZHRoLXNpbXBsZTIuaHRtbApu ZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwLi5iZDJkMGE1ZGY2NjBjYzYwZTM3NTdiMzZiMmQwM2QyNWFmYmIwM2FhCi0tLSAv ZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9sYXlvdXRmb3JtYXR0aW5nY29udGV4dC9t aW4tbWF4LWNvbnRlbnQtd2lkdGgtc2ltcGxlMi5odG1sCkBAIC0wLDAgKzEsMTMgQEAKKzwhLS0g d2Via2l0LXRlc3QtcnVubmVyIFsgaW50ZXJuYWw6TGF5b3V0Rm9ybWF0dGluZ0NvbnRleHRFbmFi bGVkPXRydWUgaW50ZXJuYWw6TGF5b3V0Rm9ybWF0dGluZ0NvbnRleHRJbnRlZ3JhdGlvbkVuYWJs ZWQ9ZmFsc2UgXSAtLT4KKzxzdHlsZT4KKy5zaHJpbmtUb0ZpdCB7CisgIGJvcmRlcjogMXB4IHNv bGlkIGdyZWVuOworICBmb250LXNpemU6IDEwcHg7CisgIGZvbnQtZmFtaWx5OiBBaGVtOworICBj b2xvcjogd2hpdGU7CisgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKK30KKzwvc3R5bGU+Cis8Ym9keT4K KzxkaXYgY2xhc3M9c2hyaW5rVG9GaXQ+PGRpdiBzdHlsZT0id2lkdGg6IG1pbi1jb250ZW50Ij5t aW4gY29udGVudCB3aWR0aDwvZGl2PjwvZGl2PgorPGRpdiBjbGFzcz1zaHJpbmtUb0ZpdCBzdHls ZT0ibWFyZ2luLXRvcDogMzJweDsiPjxkaXYgc3R5bGU9IndpZHRoOiBtYXgtY29udGVudCI+bWF4 IGNvbnRlbnQgd2lkdGg8L2Rpdj48L2Rpdj4K