232883 2021-11-09 07:25:32 -0800 [Performance test][css-contain] Add case to test contain: layout inside a complex document 2021-11-21 19:06:42 -0800 1 1 1 Unclassified WebKit CSS WebKit Local Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=228696 InRadar P2 Normal --- 1 cathiechen cathiechen cdumez ews-watchlist jbedard rbuis rniwa webkit-bug-importer oldest_to_newest 1813136 0 cathiechen 2021-11-09 07:25:32 -0800 Add case to test contain: layout inside a complex document 1813143 1 443689 cathiechen 2021-11-09 07:36:48 -0800 Created attachment 443689 Patch 1813145 2 cathiechen 2021-11-09 07:44:04 -0800 Tested locally, here are the results: Disable CSS containment: :Runs -> [4.232804232804235, 4.282655246252677, 4.3478260869565215, 4.333694474539545, 4.32432432432432, 4.287245444801715, 4.34782608695653, 4.381161007667032, 4.395604395604404, 4.504504504504505, 4.489337822671156, 4.405286343612326, 3.7735849056603774, 3.712871287128713, 3.65853658536587, 3.7174721189591247, 3.7406483790523692, 3.7735849056603774, 4.415011037527594, 4.405286343612334] runs/s mean: 4.176463276683085 runs/s median: 4.329009399431932 runs/s stdev: 0.30757834250293725 runs/s min: 3.65853658536587 runs/s max: 4.504504504504505 runs/s Enable CSS containment: :Runs -> [290.6208718626154, 318.7250996015938, 322.5806451612903, 307.29833546734955, 315.37450722733246, 315.37450722733246, 304.56852791878174, 306.51340996168585, 306.9053708439898, 311.68831168831167, 303.4134007585335, 303.03030303030374, 311.284046692607, 317.04095112285336, 312.09362808842656, 308.0872913992298, 307.6923076923077, 320.1970443349754, 303.4134007585335, 323.3830845771144] runs/s mean: 310.4642522707584 runs/s median: 309.6856690459184 runs/s stdev: 7.973029662425939 runs/s min: 290.6208718626154 runs/s max: 323.3830845771144 runs/s 1813155 3 rbuis 2021-11-09 08:08:47 -0800 ASAN Release build (2021 MacBook Pro M1): Disable CSS containment: :Runs -> [11.350737797956867, 11.235955056179776, 11.312217194570136, 11.299435028248588, 11.325028312570781, 11.325028312570781, 11.325028312570781, 11.286681715575622, 11.26126126126126, 11.26126126126126, 11.037527593818984, 11.185682326621901, 11.160714285714308, 11.36363636363634, 11.325028312570758, 11.123470522803114, 11.299435028248565, 11.1731843575419, 11.235955056179776, 11.160714285714286] runs/s mean: 11.252399119280788 runs/s median: 11.273971488418441 runs/s stdev: 0.08686076045574032 runs/s min: 11.037527593818984 runs/s max: 11.36363636363634 runs/s Enable CSS containment: :Runs -> [1055.4089709762534, 1061.0079575596817, 1062.4169986719787, 1069.258809234508, 1028.2776349614396, 1054.0184453227932, 1059.6026490066224, 1061.0079575596817, 1062.41699867198, 1063.8297872340424, 1044.3864229765013, 1063.8297872340424, 1062.4169986719787, 1058.2010582010582, 1038.9610389610389, 1062.4169986719787, 1062.4169986719787, 1043.0247718383312, 1062.4169986719787, 1066.6666666666667] runs/s mean: 1057.0991974882265 runs/s median: 1061.7124781158302 runs/s stdev: 10.436357976932406 runs/s min: 1028.2776349614396 runs/s max: 1069.258809234508 runs/s 1815469 4 webkit-bug-importer 2021-11-16 07:26:20 -0800 <rdar://problem/85457367> 1816798 5 444798 cathiechen 2021-11-19 03:33:32 -0800 Created attachment 444798 Patch 1816805 6 444802 cathiechen 2021-11-19 04:49:07 -0800 Created attachment 444802 Patch 1816807 7 444802 rbuis 2021-11-19 04:58:10 -0800 Comment on attachment 444802 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=444802&action=review > PerformanceTests/Layout/css-contain-layout-size-inside-complex-document.html:74 > + description: 'Measures performance of changing layout containment box inside a document with complicated and expensive layout.', This probably needs changing too. 1816811 8 444802 cathiechen 2021-11-19 05:20:48 -0800 Comment on attachment 444802 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=444802&action=review Thanks for the review, Rob! >> PerformanceTests/Layout/css-contain-layout-size-inside-complex-document.html:74 >> + description: 'Measures performance of changing layout containment box inside a document with complicated and expensive layout.', > > This probably needs changing too. Oops, done! Thanks! 1816813 9 444806 cathiechen 2021-11-19 05:24:21 -0800 Created attachment 444806 Patch 1817218 10 444934 cathiechen 2021-11-21 18:32:25 -0800 Created attachment 444934 Patch 1817223 11 ews-feeder 2021-11-21 19:06:39 -0800 Committed r286108 (244495@main): <https://commits.webkit.org/244495@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 444934. 443689 2021-11-09 07:36:48 -0800 2021-11-19 03:33:25 -0800 Patch bug-232883-20211109233643.patch text/plain 3697 cathiechen U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1NDkzCmRpZmYgLS1naXQgYS9QZXJmb3JtYW5jZVRlc3Rz L0NoYW5nZUxvZyBiL1BlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nCmluZGV4IGM1ZTJkYjgyMjIw NWI5ZTIyODY0NTVhMmIyYjE4Mzc3M2E3N2VjMTYuLjU4OGIzZTFjMWIwOGY2NGVlNjJmM2M4ZTBm NTAxZWZiMmQ0MzhiOTYgMTAwNjQ0Ci0tLSBhL1BlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nCisr KyBiL1BlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjEtMTEt MDkgIENhdGhpZSBDaGVuICA8Y2F0aGllY2hlbkBpZ2FsaWEuY29tPgorCisgICAgICAgIFtQZXJm b3JtYW5jZSB0ZXN0XVtjc3MtY29udGFpbl0gQWRkIGNhc2UgdG8gdGVzdCBjb250YWluOiBsYXlv dXQgaW5zaWRlIGEgY29tcGxleCBkb2N1bWVudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyODgzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgVGhpcyBjYXNlIHRlc3QgdGhlIHBlcmZvcm1hbmNlIG9mIGNo YW5naW5nIHRoZSBjb250ZW50IG9mIGEgbGF5b3V0IGNvbnRhaW5tZW50IHdoaWNoIGlzCisgICAg ICAgIGluc2lkZSBhIGNvbXBsZXggZG9jdW1lbnQuCisKKyAgICAgICAgKiBMYXlvdXQvY3NzLWNv bnRhaW4tbGF5b3V0LWluc2lkZS1jb21wbGV4LWRvY3VtZW50Lmh0bWw6IEFkZGVkLgorCiAyMDIx LTEwLTE0ICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CiAKICAgICAg ICAgQWxsIHRoZSBTREtWYXJpYW50LnhjY29uZmlnIGZpbGVzIHNob3VsZCBtYXRjaApkaWZmIC0t Z2l0IGEvUGVyZm9ybWFuY2VUZXN0cy9MYXlvdXQvY3NzLWNvbnRhaW4tbGF5b3V0LWluc2lkZS1j b21wbGV4LWRvY3VtZW50Lmh0bWwgYi9QZXJmb3JtYW5jZVRlc3RzL0xheW91dC9jc3MtY29udGFp bi1sYXlvdXQtaW5zaWRlLWNvbXBsZXgtZG9jdW1lbnQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0 NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi42NGVjOGZm MmFiMjk1ZDQwNTIxNWIzYjhlZGU4MjY3Y2RkNTRjODgyCi0tLSAvZGV2L251bGwKKysrIGIvUGVy Zm9ybWFuY2VUZXN0cy9MYXlvdXQvY3NzLWNvbnRhaW4tbGF5b3V0LWluc2lkZS1jb21wbGV4LWRv Y3VtZW50Lmh0bWwKQEAgLTAsMCArMSw4NiBAQAorPCFET0NUWVBFIGh0bWw+Cis8dGl0bGU+UGVy Zm9ybWFuY2UgdGVzdCBjaGFuZ2luZyBsYXlvdXQgY29udGFpbm1lbnQgYm94IGluc2lkZSBhIGRv Y3VtZW50IHdpdGggY29tcGxpY2F0ZWQgYW5kIGV4cGVuc2l2ZSBsYXlvdXQ8L3RpdGxlPgorPHN0 eWxlPgorI3dyYXBwZXIgeworICAgIGRpc3BsYXk6IGZsZXg7CisgICAgZmxleC1kaXJlY3Rpb246 IGNvbHVtbjsKK30KKy5yb3cgeworICAgIGRpc3BsYXk6IGZsZXg7Cit9CisjdGFyZ2V0IHsgICAK KyAgICBjb250YWluOiBsYXlvdXQ7Cit9CisKKzwvc3R5bGU+Cis8c2NyaXB0IHNyYz0iLi4vcmVz b3VyY2VzL3J1bm5lci5qcyI+PC9zY3JpcHQ+Cis8cHJlIGlkPSJsb2ciPjwvcHJlPgorPGRpdiBp ZD0id3JhcHBlciI+PC9kaXY+Cis8c2NyaXB0PgorICAgIGxldCB3cmFwcGVyID0gZG9jdW1lbnQu Z2V0RWxlbWVudEJ5SWQoIndyYXBwZXIiKTsKKyAgICBsZXQgdGFyZ2V0ID0gdW5kZWZpbmVkOwor CisgICAgY29uc3QgTlVNX1JPV1MgPSAxMDsKKyAgICBjb25zdCBOVU1fQ09MVU1OUyA9IDEwOwor ICAgIGNvbnN0IERPTV9ERVBUSCA9IDEwMDsKKyAgICBmdW5jdGlvbiBjcmVhdGVDZWxscyhkZXB0 aCkgeworICAgICAgICBsZXQgY29udGVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIp OworICAgICAgICBpZiAodGFyZ2V0ID09IHVuZGVmaW5lZCkgeworICAgICAgICAgICAgdGFyZ2V0 ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CisgICAgICAgICAgICB0YXJnZXQuaWQg PSAidGFyZ2V0IjsKKyAgICAgICAgICAgIGNvbnRlbnQuYXBwZW5kQ2hpbGQodGFyZ2V0KTsKKyAg ICAgICAgfQorICAgICAgICBjb250ZW50LmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZUVsZW1l bnQoImgxIikpOworICAgICAgICBjb250ZW50LmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZUVs ZW1lbnQoInBhcmFncmFwaCIpKTsKKworICAgICAgICBpZiAoZGVwdGggPiAwKQorICAgICAgICAg ICAgY29udGVudC5hcHBlbmRDaGlsZChjcmVhdGVDZWxscyhkZXB0aCAtIDEpKTsKKworICAgICAg ICByZXR1cm4gY29udGVudDsKKyAgICB9CisKKyAgICBmdW5jdGlvbiBnZW5lcmF0ZUNvbnRlbnQo KSB7CisgICAgICAgIGZvciAobGV0IGkgPSAwOyBpIDwgTlVNX1JPV1M7IGkrKykgeworICAgICAg ICAgICAgbGV0IHJvdyA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOworICAgICAgICAg ICAgcm93LmNsYXNzTGlzdC5hZGQoInJvdyIpOworICAgICAgICAgICAgcm93LmFwcGVuZENoaWxk KGNyZWF0ZUNlbGxzKERPTV9ERVBUSCkpOworICAgICAgICAgICAgd3JhcHBlci5hcHBlbmRDaGls ZChyb3cpOworICAgICAgICB9CisgICAgfQorCisgICAgZnVuY3Rpb24gYWRkUm93c1RvVGFyZ2V0 KCkgeworICAgICAgICBmb3IgKGxldCBpID0gMDsgaSA8IDU7IGkrKykgeworICAgICAgICAgICAg bGV0IHJvdyA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpOworICAgICAgICAgICAgcm93 LmlubmVySFRNTCA9ICJzb21lIHRleHQiOworICAgICAgICAgICAgdGFyZ2V0LmFwcGVuZENoaWxk KHJvdyk7CisgICAgICAgIH0KKyAgICB9CisKKyAgICBmdW5jdGlvbiByZW1vdmVSb3dzRnJvbVRh cmdldCgpIHsKKyAgICAgICAgd2hpbGUgKHRhcmdldC5maXJzdEVsZW1lbnRDaGlsZCkKKyAgICAg ICAgICAgIHRhcmdldC5yZW1vdmVDaGlsZCh0YXJnZXQuZmlyc3RFbGVtZW50Q2hpbGQpOworICAg IH0KKworICAgIGZ1bmN0aW9uIHJ1blRlc3QoKSB7CisgICAgICAgIGFkZFJvd3NUb1RhcmdldCgp OworICAgICAgICBkb2N1bWVudC5ib2R5LmdldEJvdW5kaW5nQ2xpZW50UmVjdCgpOworICAgICAg ICByZW1vdmVSb3dzRnJvbVRhcmdldCgpOworICAgICAgICBkb2N1bWVudC5ib2R5LmdldEJvdW5k aW5nQ2xpZW50UmVjdCgpOworICAgIH0KKworICAgIGZ1bmN0aW9uIHNldHVwVGVzdCgpIHsKKyAg ICAgICAgZ2VuZXJhdGVDb250ZW50KCk7CisgICAgICAgIGRvY3VtZW50LmJvZHkuZ2V0Qm91bmRp bmdDbGllbnRSZWN0KCk7CisgICAgICAgIFBlcmZUZXN0UnVubmVyLm1lYXN1cmVSdW5zUGVyU2Vj b25kKHsKKyAgICAgICAgICAgIGRlc2NyaXB0aW9uOiAnTWVhc3VyZXMgcGVyZm9ybWFuY2Ugb2Yg Y2hhbmdpbmcgbGF5b3V0IGNvbnRhaW5tZW50IGJveCBpbnNpZGUgYSBkb2N1bWVudCB3aXRoIGNv bXBsaWNhdGVkIGFuZCBleHBlbnNpdmUgbGF5b3V0LicsCisgICAgICAgICAgICBydW46IGZ1bmN0 aW9uICgpIHsKKyAgICAgICAgICAgICAgICBydW5UZXN0KCk7CisgICAgICAgICAgICB9LAorICAg ICAgICAgICAgZG9uZTogZnVuY3Rpb24oKSB7CisgICAgICAgICAgICAgICAgd3JhcHBlci5pbm5l ckhUTUwgPSAiIjsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfSk7CisgICAgfQorICAgIHdpbmRv dy5yZXF1ZXN0QW5pbWF0aW9uRnJhbWUoc2V0dXBUZXN0KTsKKworPC9zY3JpcHQ+Cg== 444798 2021-11-19 03:33:32 -0800 2021-11-19 04:49:01 -0800 Patch bug-232883-20211119193330.patch text/plain 3651 cathiechen U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1OTE4CmRpZmYgLS1naXQgYS9QZXJmb3JtYW5jZVRlc3Rz L0NoYW5nZUxvZyBiL1BlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nCmluZGV4IDlmZjNhOTNkNzgx ZTkzNTdlOGQzZmExMWNkN2MwYTY3ZTI5NTdhM2MuLmMzZTQxNjA3ODQzNmI4YjhkN2FlN2QzYzRi Yzk1OTBiNDZiMzgwMjggMTAwNjQ0Ci0tLSBhL1BlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nCisr KyBiL1BlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjEtMTEt MDkgIENhdGhpZSBDaGVuICA8Y2F0aGllY2hlbkBpZ2FsaWEuY29tPgorCisgICAgICAgIFtQZXJm b3JtYW5jZSB0ZXN0XVtjc3MtY29udGFpbl0gQWRkIGNhc2UgdG8gdGVzdCBjb250YWluOiBsYXlv dXQgaW5zaWRlIGEgY29tcGxleCBkb2N1bWVudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyODgzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgVGhpcyBjYXNlIHRlc3QgdGhlIHBlcmZvcm1hbmNlIG9mIGNo YW5naW5nIHRoZSBjb250ZW50IG9mIGEgbGF5b3V0IGNvbnRhaW5tZW50IHdoaWNoIGlzCisgICAg ICAgIGluc2lkZSBhIGNvbXBsZXggZG9jdW1lbnQuCisKKyAgICAgICAgKiBMYXlvdXQvY3NzLWNv bnRhaW4tbGF5b3V0LWluc2lkZS1jb21wbGV4LWRvY3VtZW50Lmh0bWw6IEFkZGVkLgorCiAyMDIx LTExLTE1ICBBbmdlbG9zIE9pa29ub21vcG91bG9zICA8YW5nZWxvc0BpZ2FsaWEuY29tPgogCiAg ICAgICAgIFNraXAgdGVzdHMgbmV3bHktZmFpbGluZyBvbiBtaXBzCmRpZmYgLS1naXQgYS9QZXJm b3JtYW5jZVRlc3RzL0xheW91dC9jc3MtY29udGFpbi1sYXlvdXQtaW5zaWRlLWNvbXBsZXgtZG9j dW1lbnQuaHRtbCBiL1BlcmZvcm1hbmNlVGVzdHMvTGF5b3V0L2Nzcy1jb250YWluLWxheW91dC1p bnNpZGUtY29tcGxleC1kb2N1bWVudC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjJhYjVkNzFiZWJhYmYxOTcz NWQ3MTBlNzE4ZTYyNWEyZTQ4NTBkMTAKLS0tIC9kZXYvbnVsbAorKysgYi9QZXJmb3JtYW5jZVRl c3RzL0xheW91dC9jc3MtY29udGFpbi1sYXlvdXQtaW5zaWRlLWNvbXBsZXgtZG9jdW1lbnQuaHRt bApAQCAtMCwwICsxLDg1IEBACis8IURPQ1RZUEUgaHRtbD4KKzx0aXRsZT5QZXJmb3JtYW5jZSB0 ZXN0IGNoYW5naW5nIGxheW91dCBjb250YWlubWVudCBib3ggaW5zaWRlIGEgZG9jdW1lbnQgd2l0 aCBjb21wbGljYXRlZCBhbmQgZXhwZW5zaXZlIGxheW91dDwvdGl0bGU+Cis8c3R5bGU+Cisjd3Jh cHBlciB7CisgICAgZGlzcGxheTogZmxleDsKKyAgICBmbGV4LWRpcmVjdGlvbjogY29sdW1uOwor fQorLnJvdyB7CisgICAgZGlzcGxheTogZmxleDsKK30KKyN0YXJnZXQgeyAgIAorICAgIGNvbnRh aW46IGxheW91dCBzaXplOworfQorCis8L3N0eWxlPgorPHNjcmlwdCBzcmM9Ii4uL3Jlc291cmNl cy9ydW5uZXIuanMiPjwvc2NyaXB0PgorPHByZSBpZD0ibG9nIj48L3ByZT4KKzxkaXYgaWQ9Indy YXBwZXIiPjwvZGl2PgorPHNjcmlwdD4KKyAgICBsZXQgd3JhcHBlciA9IGRvY3VtZW50LmdldEVs ZW1lbnRCeUlkKCJ3cmFwcGVyIik7CisgICAgbGV0IHRhcmdldCA9IHVuZGVmaW5lZDsKKworICAg IGNvbnN0IE5VTV9ST1dTID0gMTA7CisgICAgY29uc3QgRE9NX0RFUFRIID0gMTAwOworICAgIGZ1 bmN0aW9uIGNyZWF0ZUNlbGxzKGRlcHRoKSB7CisgICAgICAgIGxldCBjb250ZW50ID0gZG9jdW1l bnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CisgICAgICAgIGlmICghdGFyZ2V0KSB7CisgICAgICAg ICAgICB0YXJnZXQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKKyAgICAgICAgICAg IHRhcmdldC5pZCA9ICJ0YXJnZXQiOworICAgICAgICAgICAgY29udGVudC5hcHBlbmRDaGlsZCh0 YXJnZXQpOworICAgICAgICB9CisgICAgICAgIGNvbnRlbnQuYXBwZW5kQ2hpbGQoZG9jdW1lbnQu Y3JlYXRlRWxlbWVudCgiaDEiKSk7CisgICAgICAgIGNvbnRlbnQuYXBwZW5kQ2hpbGQoZG9jdW1l bnQuY3JlYXRlRWxlbWVudCgicGFyYWdyYXBoIikpOworCisgICAgICAgIGlmIChkZXB0aCA+IDAp CisgICAgICAgICAgICBjb250ZW50LmFwcGVuZENoaWxkKGNyZWF0ZUNlbGxzKGRlcHRoIC0gMSkp OworCisgICAgICAgIHJldHVybiBjb250ZW50OworICAgIH0KKworICAgIGZ1bmN0aW9uIGdlbmVy YXRlQ29udGVudCgpIHsKKyAgICAgICAgZm9yIChsZXQgaSA9IDA7IGkgPCBOVU1fUk9XUzsgaSsr KSB7CisgICAgICAgICAgICBsZXQgcm93ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7 CisgICAgICAgICAgICByb3cuY2xhc3NMaXN0LmFkZCgicm93Iik7CisgICAgICAgICAgICByb3cu YXBwZW5kQ2hpbGQoY3JlYXRlQ2VsbHMoRE9NX0RFUFRIKSk7CisgICAgICAgICAgICB3cmFwcGVy LmFwcGVuZENoaWxkKHJvdyk7CisgICAgICAgIH0KKyAgICB9CisKKyAgICBmdW5jdGlvbiBhZGRS b3dzVG9UYXJnZXQoKSB7CisgICAgICAgIGZvciAobGV0IGkgPSAwOyBpIDwgNTsgaSsrKSB7Cisg ICAgICAgICAgICBsZXQgcm93ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CisgICAg ICAgICAgICByb3cuaW5uZXJIVE1MID0gInNvbWUgdGV4dCI7CisgICAgICAgICAgICB0YXJnZXQu YXBwZW5kQ2hpbGQocm93KTsKKyAgICAgICAgfQorICAgIH0KKworICAgIGZ1bmN0aW9uIHJlbW92 ZVJvd3NGcm9tVGFyZ2V0KCkgeworICAgICAgICB3aGlsZSAodGFyZ2V0LmZpcnN0RWxlbWVudENo aWxkKQorICAgICAgICAgICAgdGFyZ2V0LnJlbW92ZUNoaWxkKHRhcmdldC5maXJzdEVsZW1lbnRD aGlsZCk7CisgICAgfQorCisgICAgZnVuY3Rpb24gcnVuVGVzdCgpIHsKKyAgICAgICAgYWRkUm93 c1RvVGFyZ2V0KCk7CisgICAgICAgIGRvY3VtZW50LmJvZHkuZ2V0Qm91bmRpbmdDbGllbnRSZWN0 KCk7CisgICAgICAgIHJlbW92ZVJvd3NGcm9tVGFyZ2V0KCk7CisgICAgICAgIGRvY3VtZW50LmJv ZHkuZ2V0Qm91bmRpbmdDbGllbnRSZWN0KCk7CisgICAgfQorCisgICAgZnVuY3Rpb24gc2V0dXBU ZXN0KCkgeworICAgICAgICBnZW5lcmF0ZUNvbnRlbnQoKTsKKyAgICAgICAgZG9jdW1lbnQuYm9k eS5nZXRCb3VuZGluZ0NsaWVudFJlY3QoKTsKKyAgICAgICAgUGVyZlRlc3RSdW5uZXIubWVhc3Vy ZVJ1bnNQZXJTZWNvbmQoeworICAgICAgICAgICAgZGVzY3JpcHRpb246ICdNZWFzdXJlcyBwZXJm b3JtYW5jZSBvZiBjaGFuZ2luZyBsYXlvdXQgY29udGFpbm1lbnQgYm94IGluc2lkZSBhIGRvY3Vt ZW50IHdpdGggY29tcGxpY2F0ZWQgYW5kIGV4cGVuc2l2ZSBsYXlvdXQuJywKKyAgICAgICAgICAg IHJ1bjogZnVuY3Rpb24gKCkgeworICAgICAgICAgICAgICAgIHJ1blRlc3QoKTsKKyAgICAgICAg ICAgIH0sCisgICAgICAgICAgICBkb25lOiBmdW5jdGlvbigpIHsKKyAgICAgICAgICAgICAgICB3 cmFwcGVyLmlubmVySFRNTCA9ICIiOworICAgICAgICAgICAgfQorICAgICAgICB9KTsKKyAgICB9 CisgICAgd2luZG93LnJlcXVlc3RBbmltYXRpb25GcmFtZShzZXR1cFRlc3QpOworCis8L3Njcmlw dD4K 444802 2021-11-19 04:49:07 -0800 2021-11-19 05:24:15 -0800 Patch bug-232883-20211119204905.patch text/plain 3675 cathiechen U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1OTE4CmRpZmYgLS1naXQgYS9QZXJmb3JtYW5jZVRlc3Rz L0NoYW5nZUxvZyBiL1BlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nCmluZGV4IDlmZjNhOTNkNzgx ZTkzNTdlOGQzZmExMWNkN2MwYTY3ZTI5NTdhM2MuLjA2ODJkMWUwNTgwYTkxMTZlODU1YWE4Nzgx YTU1ZDY2MzdhZDRkZWIgMTAwNjQ0Ci0tLSBhL1BlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nCisr KyBiL1BlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjEtMTEt MDkgIENhdGhpZSBDaGVuICA8Y2F0aGllY2hlbkBpZ2FsaWEuY29tPgorCisgICAgICAgIFtQZXJm b3JtYW5jZSB0ZXN0XVtjc3MtY29udGFpbl0gQWRkIGNhc2UgdG8gdGVzdCBjb250YWluOiBsYXlv dXQgaW5zaWRlIGEgY29tcGxleCBkb2N1bWVudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyODgzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgVGhpcyBjYXNlIHRlc3QgdGhlIHBlcmZvcm1hbmNlIG9mIGNo YW5naW5nIHRoZSBjb250ZW50IG9mIGEgbGF5b3V0IGNvbnRhaW5tZW50IHdoaWNoIGlzCisgICAg ICAgIGluc2lkZSBhIGNvbXBsZXggZG9jdW1lbnQuCisKKyAgICAgICAgKiBMYXlvdXQvY3NzLWNv bnRhaW4tbGF5b3V0LXNpemUtaW5zaWRlLWNvbXBsZXgtZG9jdW1lbnQuaHRtbDogQWRkZWQuCisK IDIwMjEtMTEtMTUgIEFuZ2Vsb3MgT2lrb25vbW9wb3Vsb3MgIDxhbmdlbG9zQGlnYWxpYS5jb20+ CiAKICAgICAgICAgU2tpcCB0ZXN0cyBuZXdseS1mYWlsaW5nIG9uIG1pcHMKZGlmZiAtLWdpdCBh L1BlcmZvcm1hbmNlVGVzdHMvTGF5b3V0L2Nzcy1jb250YWluLWxheW91dC1zaXplLWluc2lkZS1j b21wbGV4LWRvY3VtZW50Lmh0bWwgYi9QZXJmb3JtYW5jZVRlc3RzL0xheW91dC9jc3MtY29udGFp bi1sYXlvdXQtc2l6ZS1pbnNpZGUtY29tcGxleC1kb2N1bWVudC5odG1sCm5ldyBmaWxlIG1vZGUg MTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmUx NjcwMjE4MDRlOTg5MGRkNzAzYjA0OWE0YjdlMGVkMDRlZWU2MjYKLS0tIC9kZXYvbnVsbAorKysg Yi9QZXJmb3JtYW5jZVRlc3RzL0xheW91dC9jc3MtY29udGFpbi1sYXlvdXQtc2l6ZS1pbnNpZGUt Y29tcGxleC1kb2N1bWVudC5odG1sCkBAIC0wLDAgKzEsODUgQEAKKzwhRE9DVFlQRSBodG1sPgor PHRpdGxlPlBlcmZvcm1hbmNlIHRlc3QgY2hhbmdpbmcgImNvbnRhaW46IGxheW91dCBzaXplIiBi b3ggaW5zaWRlIGEgZG9jdW1lbnQgd2l0aCBjb21wbGljYXRlZCBhbmQgZXhwZW5zaXZlIGxheW91 dDwvdGl0bGU+Cis8c3R5bGU+Cisjd3JhcHBlciB7CisgICAgZGlzcGxheTogZmxleDsKKyAgICBm bGV4LWRpcmVjdGlvbjogY29sdW1uOworfQorLnJvdyB7CisgICAgZGlzcGxheTogZmxleDsKK30K KyN0YXJnZXQgeyAgIAorICAgIGNvbnRhaW46IGxheW91dCBzaXplOworfQorCis8L3N0eWxlPgor PHNjcmlwdCBzcmM9Ii4uL3Jlc291cmNlcy9ydW5uZXIuanMiPjwvc2NyaXB0PgorPHByZSBpZD0i bG9nIj48L3ByZT4KKzxkaXYgaWQ9IndyYXBwZXIiPjwvZGl2PgorPHNjcmlwdD4KKyAgICBsZXQg d3JhcHBlciA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJ3cmFwcGVyIik7CisgICAgbGV0IHRh cmdldCA9IHVuZGVmaW5lZDsKKworICAgIGNvbnN0IE5VTV9ST1dTID0gMTA7CisgICAgY29uc3Qg RE9NX0RFUFRIID0gMTAwOworICAgIGZ1bmN0aW9uIGNyZWF0ZUNlbGxzKGRlcHRoKSB7CisgICAg ICAgIGxldCBjb250ZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CisgICAgICAg IGlmICghdGFyZ2V0KSB7CisgICAgICAgICAgICB0YXJnZXQgPSBkb2N1bWVudC5jcmVhdGVFbGVt ZW50KCJkaXYiKTsKKyAgICAgICAgICAgIHRhcmdldC5pZCA9ICJ0YXJnZXQiOworICAgICAgICAg ICAgY29udGVudC5hcHBlbmRDaGlsZCh0YXJnZXQpOworICAgICAgICB9CisgICAgICAgIGNvbnRl bnQuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiaDEiKSk7CisgICAgICAgIGNv bnRlbnQuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgicGFyYWdyYXBoIikpOwor CisgICAgICAgIGlmIChkZXB0aCA+IDApCisgICAgICAgICAgICBjb250ZW50LmFwcGVuZENoaWxk KGNyZWF0ZUNlbGxzKGRlcHRoIC0gMSkpOworCisgICAgICAgIHJldHVybiBjb250ZW50OworICAg IH0KKworICAgIGZ1bmN0aW9uIGdlbmVyYXRlQ29udGVudCgpIHsKKyAgICAgICAgZm9yIChsZXQg aSA9IDA7IGkgPCBOVU1fUk9XUzsgaSsrKSB7CisgICAgICAgICAgICBsZXQgcm93ID0gZG9jdW1l bnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CisgICAgICAgICAgICByb3cuY2xhc3NMaXN0LmFkZCgi cm93Iik7CisgICAgICAgICAgICByb3cuYXBwZW5kQ2hpbGQoY3JlYXRlQ2VsbHMoRE9NX0RFUFRI KSk7CisgICAgICAgICAgICB3cmFwcGVyLmFwcGVuZENoaWxkKHJvdyk7CisgICAgICAgIH0KKyAg ICB9CisKKyAgICBmdW5jdGlvbiBhZGRSb3dzVG9UYXJnZXQoKSB7CisgICAgICAgIGZvciAobGV0 IGkgPSAwOyBpIDwgNTsgaSsrKSB7CisgICAgICAgICAgICBsZXQgcm93ID0gZG9jdW1lbnQuY3Jl YXRlRWxlbWVudCgiZGl2Iik7CisgICAgICAgICAgICByb3cuaW5uZXJIVE1MID0gInNvbWUgdGV4 dCI7CisgICAgICAgICAgICB0YXJnZXQuYXBwZW5kQ2hpbGQocm93KTsKKyAgICAgICAgfQorICAg IH0KKworICAgIGZ1bmN0aW9uIHJlbW92ZVJvd3NGcm9tVGFyZ2V0KCkgeworICAgICAgICB3aGls ZSAodGFyZ2V0LmZpcnN0RWxlbWVudENoaWxkKQorICAgICAgICAgICAgdGFyZ2V0LnJlbW92ZUNo aWxkKHRhcmdldC5maXJzdEVsZW1lbnRDaGlsZCk7CisgICAgfQorCisgICAgZnVuY3Rpb24gcnVu VGVzdCgpIHsKKyAgICAgICAgYWRkUm93c1RvVGFyZ2V0KCk7CisgICAgICAgIGRvY3VtZW50LmJv ZHkuZ2V0Qm91bmRpbmdDbGllbnRSZWN0KCk7CisgICAgICAgIHJlbW92ZVJvd3NGcm9tVGFyZ2V0 KCk7CisgICAgICAgIGRvY3VtZW50LmJvZHkuZ2V0Qm91bmRpbmdDbGllbnRSZWN0KCk7CisgICAg fQorCisgICAgZnVuY3Rpb24gc2V0dXBUZXN0KCkgeworICAgICAgICBnZW5lcmF0ZUNvbnRlbnQo KTsKKyAgICAgICAgZG9jdW1lbnQuYm9keS5nZXRCb3VuZGluZ0NsaWVudFJlY3QoKTsKKyAgICAg ICAgUGVyZlRlc3RSdW5uZXIubWVhc3VyZVJ1bnNQZXJTZWNvbmQoeworICAgICAgICAgICAgZGVz Y3JpcHRpb246ICdNZWFzdXJlcyBwZXJmb3JtYW5jZSBvZiBjaGFuZ2luZyBsYXlvdXQgY29udGFp bm1lbnQgYm94IGluc2lkZSBhIGRvY3VtZW50IHdpdGggY29tcGxpY2F0ZWQgYW5kIGV4cGVuc2l2 ZSBsYXlvdXQuJywKKyAgICAgICAgICAgIHJ1bjogZnVuY3Rpb24gKCkgeworICAgICAgICAgICAg ICAgIHJ1blRlc3QoKTsKKyAgICAgICAgICAgIH0sCisgICAgICAgICAgICBkb25lOiBmdW5jdGlv bigpIHsKKyAgICAgICAgICAgICAgICB3cmFwcGVyLmlubmVySFRNTCA9ICIiOworICAgICAgICAg ICAgfQorICAgICAgICB9KTsKKyAgICB9CisgICAgd2luZG93LnJlcXVlc3RBbmltYXRpb25GcmFt ZShzZXR1cFRlc3QpOworCis8L3NjcmlwdD4K 444806 2021-11-19 05:24:21 -0800 2021-11-21 18:32:18 -0800 Patch bug-232883-20211119212419.patch text/plain 3671 cathiechen U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1OTE4CmRpZmYgLS1naXQgYS9QZXJmb3JtYW5jZVRlc3Rz L0NoYW5nZUxvZyBiL1BlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nCmluZGV4IDlmZjNhOTNkNzgx ZTkzNTdlOGQzZmExMWNkN2MwYTY3ZTI5NTdhM2MuLjY0ZDQ5MzY1NTgxN2M0YTg4MWE3NzM5YTBh ZGViYWNhNzM4NWI5YWMgMTAwNjQ0Ci0tLSBhL1BlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nCisr KyBiL1BlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjEtMTEt MDkgIENhdGhpZSBDaGVuICA8Y2F0aGllY2hlbkBpZ2FsaWEuY29tPgorCisgICAgICAgIFtQZXJm b3JtYW5jZSB0ZXN0XVtjc3MtY29udGFpbl0gQWRkIGNhc2UgdG8gdGVzdCBjb250YWluOiBsYXlv dXQgaW5zaWRlIGEgY29tcGxleCBkb2N1bWVudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyODgzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgUm9iIEJ1 aXMuCisKKyAgICAgICAgVGhpcyBjYXNlIHRlc3QgdGhlIHBlcmZvcm1hbmNlIG9mIGNoYW5naW5n IHRoZSBjb250ZW50IG9mIGEgbGF5b3V0IGNvbnRhaW5tZW50IHdoaWNoIGlzCisgICAgICAgIGlu c2lkZSBhIGNvbXBsZXggZG9jdW1lbnQuCisKKyAgICAgICAgKiBMYXlvdXQvY3NzLWNvbnRhaW4t bGF5b3V0LXNpemUtaW5zaWRlLWNvbXBsZXgtZG9jdW1lbnQuaHRtbDogQWRkZWQuCisKIDIwMjEt MTEtMTUgIEFuZ2Vsb3MgT2lrb25vbW9wb3Vsb3MgIDxhbmdlbG9zQGlnYWxpYS5jb20+CiAKICAg ICAgICAgU2tpcCB0ZXN0cyBuZXdseS1mYWlsaW5nIG9uIG1pcHMKZGlmZiAtLWdpdCBhL1BlcmZv cm1hbmNlVGVzdHMvTGF5b3V0L2Nzcy1jb250YWluLWxheW91dC1zaXplLWluc2lkZS1jb21wbGV4 LWRvY3VtZW50Lmh0bWwgYi9QZXJmb3JtYW5jZVRlc3RzL0xheW91dC9jc3MtY29udGFpbi1sYXlv dXQtc2l6ZS1pbnNpZGUtY29tcGxleC1kb2N1bWVudC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0 CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjUwNGE1MjM0 MjA5YTgxODdmMmI0OTgwNDI0NWE2ZDI1MWUzMmQzMzMKLS0tIC9kZXYvbnVsbAorKysgYi9QZXJm b3JtYW5jZVRlc3RzL0xheW91dC9jc3MtY29udGFpbi1sYXlvdXQtc2l6ZS1pbnNpZGUtY29tcGxl eC1kb2N1bWVudC5odG1sCkBAIC0wLDAgKzEsODUgQEAKKzwhRE9DVFlQRSBodG1sPgorPHRpdGxl PlBlcmZvcm1hbmNlIHRlc3QgY2hhbmdpbmcgImNvbnRhaW46IGxheW91dCBzaXplIiBib3ggaW5z aWRlIGEgZG9jdW1lbnQgd2l0aCBjb21wbGljYXRlZCBhbmQgZXhwZW5zaXZlIGxheW91dDwvdGl0 bGU+Cis8c3R5bGU+Cisjd3JhcHBlciB7CisgICAgZGlzcGxheTogZmxleDsKKyAgICBmbGV4LWRp cmVjdGlvbjogY29sdW1uOworfQorLnJvdyB7CisgICAgZGlzcGxheTogZmxleDsKK30KKyN0YXJn ZXQgeyAgIAorICAgIGNvbnRhaW46IGxheW91dCBzaXplOworfQorCis8L3N0eWxlPgorPHNjcmlw dCBzcmM9Ii4uL3Jlc291cmNlcy9ydW5uZXIuanMiPjwvc2NyaXB0PgorPHByZSBpZD0ibG9nIj48 L3ByZT4KKzxkaXYgaWQ9IndyYXBwZXIiPjwvZGl2PgorPHNjcmlwdD4KKyAgICBsZXQgd3JhcHBl ciA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJ3cmFwcGVyIik7CisgICAgbGV0IHRhcmdldCA9 IHVuZGVmaW5lZDsKKworICAgIGNvbnN0IE5VTV9ST1dTID0gMTA7CisgICAgY29uc3QgRE9NX0RF UFRIID0gMTAwOworICAgIGZ1bmN0aW9uIGNyZWF0ZUNlbGxzKGRlcHRoKSB7CisgICAgICAgIGxl dCBjb250ZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CisgICAgICAgIGlmICgh dGFyZ2V0KSB7CisgICAgICAgICAgICB0YXJnZXQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJk aXYiKTsKKyAgICAgICAgICAgIHRhcmdldC5pZCA9ICJ0YXJnZXQiOworICAgICAgICAgICAgY29u dGVudC5hcHBlbmRDaGlsZCh0YXJnZXQpOworICAgICAgICB9CisgICAgICAgIGNvbnRlbnQuYXBw ZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiaDEiKSk7CisgICAgICAgIGNvbnRlbnQu YXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgicGFyYWdyYXBoIikpOworCisgICAg ICAgIGlmIChkZXB0aCA+IDApCisgICAgICAgICAgICBjb250ZW50LmFwcGVuZENoaWxkKGNyZWF0 ZUNlbGxzKGRlcHRoIC0gMSkpOworCisgICAgICAgIHJldHVybiBjb250ZW50OworICAgIH0KKwor ICAgIGZ1bmN0aW9uIGdlbmVyYXRlQ29udGVudCgpIHsKKyAgICAgICAgZm9yIChsZXQgaSA9IDA7 IGkgPCBOVU1fUk9XUzsgaSsrKSB7CisgICAgICAgICAgICBsZXQgcm93ID0gZG9jdW1lbnQuY3Jl YXRlRWxlbWVudCgiZGl2Iik7CisgICAgICAgICAgICByb3cuY2xhc3NMaXN0LmFkZCgicm93Iik7 CisgICAgICAgICAgICByb3cuYXBwZW5kQ2hpbGQoY3JlYXRlQ2VsbHMoRE9NX0RFUFRIKSk7Cisg ICAgICAgICAgICB3cmFwcGVyLmFwcGVuZENoaWxkKHJvdyk7CisgICAgICAgIH0KKyAgICB9CisK KyAgICBmdW5jdGlvbiBhZGRSb3dzVG9UYXJnZXQoKSB7CisgICAgICAgIGZvciAobGV0IGkgPSAw OyBpIDwgNTsgaSsrKSB7CisgICAgICAgICAgICBsZXQgcm93ID0gZG9jdW1lbnQuY3JlYXRlRWxl bWVudCgiZGl2Iik7CisgICAgICAgICAgICByb3cuaW5uZXJIVE1MID0gInNvbWUgdGV4dCI7Cisg ICAgICAgICAgICB0YXJnZXQuYXBwZW5kQ2hpbGQocm93KTsKKyAgICAgICAgfQorICAgIH0KKwor ICAgIGZ1bmN0aW9uIHJlbW92ZVJvd3NGcm9tVGFyZ2V0KCkgeworICAgICAgICB3aGlsZSAodGFy Z2V0LmZpcnN0RWxlbWVudENoaWxkKQorICAgICAgICAgICAgdGFyZ2V0LnJlbW92ZUNoaWxkKHRh cmdldC5maXJzdEVsZW1lbnRDaGlsZCk7CisgICAgfQorCisgICAgZnVuY3Rpb24gcnVuVGVzdCgp IHsKKyAgICAgICAgYWRkUm93c1RvVGFyZ2V0KCk7CisgICAgICAgIGRvY3VtZW50LmJvZHkuZ2V0 Qm91bmRpbmdDbGllbnRSZWN0KCk7CisgICAgICAgIHJlbW92ZVJvd3NGcm9tVGFyZ2V0KCk7Cisg ICAgICAgIGRvY3VtZW50LmJvZHkuZ2V0Qm91bmRpbmdDbGllbnRSZWN0KCk7CisgICAgfQorCisg ICAgZnVuY3Rpb24gc2V0dXBUZXN0KCkgeworICAgICAgICBnZW5lcmF0ZUNvbnRlbnQoKTsKKyAg ICAgICAgZG9jdW1lbnQuYm9keS5nZXRCb3VuZGluZ0NsaWVudFJlY3QoKTsKKyAgICAgICAgUGVy ZlRlc3RSdW5uZXIubWVhc3VyZVJ1bnNQZXJTZWNvbmQoeworICAgICAgICAgICAgZGVzY3JpcHRp b246ICdNZWFzdXJlcyBwZXJmb3JtYW5jZSBvZiBjaGFuZ2luZyBjb250YWluOiBsYXlvdXQgc2l6 ZSBib3ggaW5zaWRlIGEgZG9jdW1lbnQgd2l0aCBjb21wbGljYXRlZCBhbmQgZXhwZW5zaXZlIGxh eW91dC4nLAorICAgICAgICAgICAgcnVuOiBmdW5jdGlvbiAoKSB7CisgICAgICAgICAgICAgICAg cnVuVGVzdCgpOworICAgICAgICAgICAgfSwKKyAgICAgICAgICAgIGRvbmU6IGZ1bmN0aW9uKCkg eworICAgICAgICAgICAgICAgIHdyYXBwZXIuaW5uZXJIVE1MID0gIiI7CisgICAgICAgICAgICB9 CisgICAgICAgIH0pOworICAgIH0KKyAgICB3aW5kb3cucmVxdWVzdEFuaW1hdGlvbkZyYW1lKHNl dHVwVGVzdCk7CisKKzwvc2NyaXB0Pgo= 444934 2021-11-21 18:32:25 -0800 2021-11-21 19:06:41 -0800 Patch bug-232883-20211122103223.patch text/plain 3686 cathiechen U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1OTE4CmRpZmYgLS1naXQgYS9QZXJmb3JtYW5jZVRlc3Rz L0NoYW5nZUxvZyBiL1BlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nCmluZGV4IDlmZjNhOTNkNzgx ZTkzNTdlOGQzZmExMWNkN2MwYTY3ZTI5NTdhM2MuLjY0ZDQ5MzY1NTgxN2M0YTg4MWE3NzM5YTBh ZGViYWNhNzM4NWI5YWMgMTAwNjQ0Ci0tLSBhL1BlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nCisr KyBiL1BlcmZvcm1hbmNlVGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjEtMTEt MDkgIENhdGhpZSBDaGVuICA8Y2F0aGllY2hlbkBpZ2FsaWEuY29tPgorCisgICAgICAgIFtQZXJm b3JtYW5jZSB0ZXN0XVtjc3MtY29udGFpbl0gQWRkIGNhc2UgdG8gdGVzdCBjb250YWluOiBsYXlv dXQgaW5zaWRlIGEgY29tcGxleCBkb2N1bWVudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMyODgzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgUm9iIEJ1 aXMuCisKKyAgICAgICAgVGhpcyBjYXNlIHRlc3QgdGhlIHBlcmZvcm1hbmNlIG9mIGNoYW5naW5n IHRoZSBjb250ZW50IG9mIGEgbGF5b3V0IGNvbnRhaW5tZW50IHdoaWNoIGlzCisgICAgICAgIGlu c2lkZSBhIGNvbXBsZXggZG9jdW1lbnQuCisKKyAgICAgICAgKiBMYXlvdXQvY3NzLWNvbnRhaW4t bGF5b3V0LXNpemUtaW5zaWRlLWNvbXBsZXgtZG9jdW1lbnQuaHRtbDogQWRkZWQuCisKIDIwMjEt MTEtMTUgIEFuZ2Vsb3MgT2lrb25vbW9wb3Vsb3MgIDxhbmdlbG9zQGlnYWxpYS5jb20+CiAKICAg ICAgICAgU2tpcCB0ZXN0cyBuZXdseS1mYWlsaW5nIG9uIG1pcHMKZGlmZiAtLWdpdCBhL1BlcmZv cm1hbmNlVGVzdHMvTGF5b3V0L2Nzcy1jb250YWluLWxheW91dC1zaXplLWluc2lkZS1jb21wbGV4 LWRvY3VtZW50Lmh0bWwgYi9QZXJmb3JtYW5jZVRlc3RzL0xheW91dC9jc3MtY29udGFpbi1sYXlv dXQtc2l6ZS1pbnNpZGUtY29tcGxleC1kb2N1bWVudC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0 CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmZmZGZiMjcz NGQwNWI5MzhjY2NlZjk3ODhhYzg4ODNlZjJhOTQwODgKLS0tIC9kZXYvbnVsbAorKysgYi9QZXJm b3JtYW5jZVRlc3RzL0xheW91dC9jc3MtY29udGFpbi1sYXlvdXQtc2l6ZS1pbnNpZGUtY29tcGxl eC1kb2N1bWVudC5odG1sCkBAIC0wLDAgKzEsODUgQEAKKzwhRE9DVFlQRSBodG1sPgorPHRpdGxl PlBlcmZvcm1hbmNlIHRlc3QgY2hhbmdpbmcgImNvbnRhaW46IGxheW91dCBzaXplIiBib3ggaW5z aWRlIGEgZG9jdW1lbnQgd2l0aCBjb21wbGljYXRlZCBhbmQgZXhwZW5zaXZlIGxheW91dDwvdGl0 bGU+Cis8c3R5bGU+Cisjd3JhcHBlciB7CisgICAgZGlzcGxheTogZmxleDsKKyAgICBmbGV4LWRp cmVjdGlvbjogY29sdW1uOworfQorLnJvdyB7CisgICAgZGlzcGxheTogZmxleDsKK30KKyN0YXJn ZXQgeyAgIAorICAgIGNvbnRhaW46IGxheW91dCBzaXplOworfQorCis8L3N0eWxlPgorPHNjcmlw dCBzcmM9Ii4uL3Jlc291cmNlcy9ydW5uZXIuanMiPjwvc2NyaXB0PgorPHByZSBpZD0ibG9nIj48 L3ByZT4KKzxkaXYgaWQ9IndyYXBwZXIiPjwvZGl2PgorPHNjcmlwdD4KKyAgICBsZXQgd3JhcHBl ciA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJ3cmFwcGVyIik7CisgICAgbGV0IHRhcmdldCA9 IHVuZGVmaW5lZDsKKworICAgIGNvbnN0IE5VTV9ST1dTID0gMTA7CisgICAgY29uc3QgRE9NX0RF UFRIID0gMTAwOworICAgIGZ1bmN0aW9uIGNyZWF0ZUNlbGxzKGRlcHRoKSB7CisgICAgICAgIGxl dCBjb250ZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CisgICAgICAgIGlmICgh dGFyZ2V0KSB7CisgICAgICAgICAgICB0YXJnZXQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJk aXYiKTsKKyAgICAgICAgICAgIHRhcmdldC5pZCA9ICJ0YXJnZXQiOworICAgICAgICAgICAgY29u dGVudC5hcHBlbmRDaGlsZCh0YXJnZXQpOworICAgICAgICB9CisgICAgICAgIGNvbnRlbnQuYXBw ZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiaDEiKSk7CisgICAgICAgIGNvbnRlbnQu YXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgicGFyYWdyYXBoIikpOworCisgICAg ICAgIGlmIChkZXB0aCA+IDApCisgICAgICAgICAgICBjb250ZW50LmFwcGVuZENoaWxkKGNyZWF0 ZUNlbGxzKGRlcHRoIC0gMSkpOworCisgICAgICAgIHJldHVybiBjb250ZW50OworICAgIH0KKwor ICAgIGZ1bmN0aW9uIGdlbmVyYXRlQ29udGVudCgpIHsKKyAgICAgICAgZm9yIChsZXQgaSA9IDA7 IGkgPCBOVU1fUk9XUzsgaSsrKSB7CisgICAgICAgICAgICBsZXQgcm93ID0gZG9jdW1lbnQuY3Jl YXRlRWxlbWVudCgiZGl2Iik7CisgICAgICAgICAgICByb3cuY2xhc3NMaXN0LmFkZCgicm93Iik7 CisgICAgICAgICAgICByb3cuYXBwZW5kQ2hpbGQoY3JlYXRlQ2VsbHMoRE9NX0RFUFRIKSk7Cisg ICAgICAgICAgICB3cmFwcGVyLmFwcGVuZENoaWxkKHJvdyk7CisgICAgICAgIH0KKyAgICB9CisK KyAgICBmdW5jdGlvbiBhZGRUZXh0VG9UYXJnZXQoKSB7CisgICAgICAgIGZvciAobGV0IGkgPSAw OyBpIDwgNTsgaSsrKSB7CisgICAgICAgICAgICBsZXQgdGV4dE5vZGUgPSBkb2N1bWVudC5jcmVh dGVFbGVtZW50KCJkaXYiKTsKKyAgICAgICAgICAgIHRleHROb2RlLmlubmVySFRNTCA9ICJzb21l IHRleHQiOworICAgICAgICAgICAgdGFyZ2V0LmFwcGVuZENoaWxkKHRleHROb2RlKTsKKyAgICAg ICAgfQorICAgIH0KKworICAgIGZ1bmN0aW9uIHJlbW92ZVRleHRGcm9tVGFyZ2V0KCkgeworICAg ICAgICB3aGlsZSAodGFyZ2V0LmZpcnN0RWxlbWVudENoaWxkKQorICAgICAgICAgICAgdGFyZ2V0 LnJlbW92ZUNoaWxkKHRhcmdldC5maXJzdEVsZW1lbnRDaGlsZCk7CisgICAgfQorCisgICAgZnVu Y3Rpb24gcnVuVGVzdCgpIHsKKyAgICAgICAgYWRkVGV4dFRvVGFyZ2V0KCk7CisgICAgICAgIGRv Y3VtZW50LmJvZHkuZ2V0Qm91bmRpbmdDbGllbnRSZWN0KCk7CisgICAgICAgIHJlbW92ZVRleHRG cm9tVGFyZ2V0KCk7CisgICAgICAgIGRvY3VtZW50LmJvZHkuZ2V0Qm91bmRpbmdDbGllbnRSZWN0 KCk7CisgICAgfQorCisgICAgZnVuY3Rpb24gc2V0dXBUZXN0KCkgeworICAgICAgICBnZW5lcmF0 ZUNvbnRlbnQoKTsKKyAgICAgICAgZG9jdW1lbnQuYm9keS5nZXRCb3VuZGluZ0NsaWVudFJlY3Qo KTsKKyAgICAgICAgUGVyZlRlc3RSdW5uZXIubWVhc3VyZVJ1bnNQZXJTZWNvbmQoeworICAgICAg ICAgICAgZGVzY3JpcHRpb246ICdNZWFzdXJlcyBwZXJmb3JtYW5jZSBvZiBjaGFuZ2luZyBjb250 YWluOiBsYXlvdXQgc2l6ZSBib3ggaW5zaWRlIGEgZG9jdW1lbnQgd2l0aCBjb21wbGljYXRlZCBh bmQgZXhwZW5zaXZlIGxheW91dC4nLAorICAgICAgICAgICAgcnVuOiBmdW5jdGlvbiAoKSB7Cisg ICAgICAgICAgICAgICAgcnVuVGVzdCgpOworICAgICAgICAgICAgfSwKKyAgICAgICAgICAgIGRv bmU6IGZ1bmN0aW9uKCkgeworICAgICAgICAgICAgICAgIHdyYXBwZXIuaW5uZXJIVE1MID0gIiI7 CisgICAgICAgICAgICB9CisgICAgICAgIH0pOworICAgIH0KKyAgICB3aW5kb3cucmVxdWVzdEFu aW1hdGlvbkZyYW1lKHNldHVwVGVzdCk7CisKKzwvc2NyaXB0Pgo=