236963 2022-02-21 03:35:20 -0800 [CSS Container Queries] Support nested container queries 2022-02-21 12:32:30 -0800 1 1 1 Unclassified WebKit CSS WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 229659 1 koivisto koivisto clopez ews-watchlist simon.fraser webkit-bug-importer youennf oldest_to_newest 1844153 0 koivisto 2022-02-21 03:35:20 -0800 "Style rules defined on an element inside multiple nested container queries apply when all of the wrapping container queries are true for that element." https://drafts.csswg.org/css-contain-3/#container-rule 1844157 1 452721 koivisto 2022-02-21 03:46:34 -0800 Created attachment 452721 Patch 1844159 2 ews-watchlist 2022-02-21 03:49:14 -0800 This patch modifies the imported WPT tests. Please ensure that any changes on the tests (not coming from a WPT import) are exported to WPT. Please see https://trac.webkit.org/wiki/WPTExportProcess 1844302 3 ews-feeder 2022-02-21 11:49:19 -0800 Committed r290257 (?): <https://commits.webkit.org/r290257> All reviewed patches have been landed. Closing bug and clearing flags on attachment 452721. 1844303 4 webkit-bug-importer 2022-02-21 11:50:16 -0800 <rdar://problem/89248832> 452721 2022-02-21 03:46:34 -0800 2022-02-21 12:32:30 -0800 Patch bug-236963-20220221134633.patch text/plain 15251 koivisto U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwMjM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzFlYWU2OTg2YzljOTUx NTY2OWZlYzQxNjA0YTRiYWM1NGExYTRkMS4uMTY3MjQ1N2Y5YTliMmI4MjA1ODU1NTA4YTExMGFm ZDNiYmFjZDdlYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDIyLTAyLTIxICBBbnR0 aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBbQ1NTIENvbnRhaW5lciBR dWVyaWVzXSBTdXBwb3J0IG5lc3RlZCBjb250YWluZXIgcXVlcmllcworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM2OTYzCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgIlN0eWxlIHJ1bGVzIGRlZmluZWQgb24g YW4gZWxlbWVudCBpbnNpZGUgbXVsdGlwbGUgbmVzdGVkIGNvbnRhaW5lciBxdWVyaWVzIGFwcGx5 IHdoZW4gYWxsIG9mIHRoZSB3cmFwcGluZyBjb250YWluZXIgcXVlcmllcyBhcmUgdHJ1ZSBmb3Ig dGhhdCBlbGVtZW50LiIKKworICAgICAgICBodHRwczovL2RyYWZ0cy5jc3N3Zy5vcmcvY3NzLWNv bnRhaW4tMy8jY29udGFpbmVyLXJ1bGUKKworICAgICAgICBUZXN0OiBpbXBvcnRlZC93M2Mvd2Vi LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY29udGFpbi9jb250YWluZXItcXVlcmllcy9jb250YWlu ZXItbmVzdGVkLmh0bWwKKworICAgICAgICAqIHN0eWxlL0VsZW1lbnRSdWxlQ29sbGVjdG9yLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpFbGVtZW50UnVsZUNvbGxlY3Rvcjo6Y29sbGVj dE1hdGNoaW5nUnVsZXNGb3JMaXN0KToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpFbGVtZW50 UnVsZUNvbGxlY3Rvcjo6Y29udGFpbmVyUXVlcmllc01hdGNoKToKKworICAgICAgICBBbGwgbmVz dGVkIHF1ZXJpZXMgbmVlZCB0byBtYXRjaC4KKworICAgICAgICAoV2ViQ29yZTo6U3R5bGU6OkVs ZW1lbnRSdWxlQ29sbGVjdG9yOjpjb250YWluZXJRdWVyeU1hdGNoZXMpOiBEZWxldGVkLgorICAg ICAgICAqIHN0eWxlL0VsZW1lbnRSdWxlQ29sbGVjdG9yLmg6CisgICAgICAgICogc3R5bGUvUnVs ZVNldC5oOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGU6OlJ1bGVTZXQ6Omhhc0NvbnRhaW5lclF1 ZXJpZXMgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGU6OiBjb25zdCk6CisgICAgICAg IChXZWJDb3JlOjpTdHlsZTo6UnVsZVNldDo6Y29udGFpbmVyUXVlcnlGb3IgY29uc3QpOiBEZWxl dGVkLgorCisgICAgICAgIFJldHVybiBhbGwgbmVzdGVkIHF1ZXJpZXMuCisgICAgICAgIERvbid0 IHVubmVjZXNzYXJpbHkgY29weSBGaWx0ZXJlZENvbnRhaW5lclF1ZXJ5LCByZWZlciB0byB0aGUg U3R5bGVSdWxlQ29udGFpbmVyIGluc3RlYWQuCisKKyAgICAgICAgKiBzdHlsZS9SdWxlU2V0QnVp bGRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6UnVsZVNldEJ1aWxkZXI6OmFkZENo aWxkUnVsZXMpOgorCiAyMDIyLTAyLTIwICBMYXVybyBNb3VyYSAgPGxtb3VyYUBpZ2FsaWEuY29t PgogCiAgICAgICAgIFVucmV2aWV3ZWQsIG5vbi11bmlmaWVkIGJ1aWxkIGZpeGVzIGFmdGVyIDI0 NzUwOEBtYWluCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9FbGVtZW50UnVsZUNv bGxlY3Rvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9FbGVtZW50UnVsZUNvbGxlY3Rvci5j cHAKaW5kZXggNzhhZTRiZTA1NmM1ZTkwM2JjYjUxNzIwOTY1NjFkMDYxMGZjZWM0Mi4uNDQxYTQ4 MmRhYzYzYWMzMmI5NWQ1MmRlYzYwZjc5YWIxNWQ1NjVlMiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvc3R5bGUvRWxlbWVudFJ1bGVDb2xsZWN0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3N0eWxlL0VsZW1lbnRSdWxlQ29sbGVjdG9yLmNwcApAQCAtNDg1LDEwICs0ODUsOCBAQCB2b2lk IEVsZW1lbnRSdWxlQ29sbGVjdG9yOjpjb2xsZWN0TWF0Y2hpbmdSdWxlc0Zvckxpc3QoY29uc3Qg UnVsZVNldDo6UnVsZURhdGFWZQogICAgICAgICBpZiAobV9zZWxlY3Rvck1hdGNoaW5nU3RhdGUg JiYgbV9zZWxlY3Rvck1hdGNoaW5nU3RhdGUtPnNlbGVjdG9yRmlsdGVyLmZhc3RSZWplY3RTZWxl Y3RvcihydWxlRGF0YS5kZXNjZW5kYW50U2VsZWN0b3JJZGVudGlmaWVySGFzaGVzKCkpKQogICAg ICAgICAgICAgY29udGludWU7CiAKLSAgICAgICAgaWYgKGF1dG8qIGNvbnRhaW5lclF1ZXJ5ID0g bWF0Y2hSZXF1ZXN0LnJ1bGVTZXQuY29udGFpbmVyUXVlcnlGb3IocnVsZURhdGEpKSB7Ci0gICAg ICAgICAgICBpZiAoIWNvbnRhaW5lclF1ZXJ5TWF0Y2hlcygqY29udGFpbmVyUXVlcnkpKQotICAg ICAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICB9CisgICAgICAgIGlmIChtYXRjaFJlcXVl c3QucnVsZVNldC5oYXNDb250YWluZXJRdWVyaWVzKCkgJiYgIWNvbnRhaW5lclF1ZXJpZXNNYXRj aChtYXRjaFJlcXVlc3QucnVsZVNldC5jb250YWluZXJRdWVyaWVzRm9yKHJ1bGVEYXRhKSkpCisg ICAgICAgICAgICBjb250aW51ZTsKIAogICAgICAgICBhdXRvJiBydWxlID0gcnVsZURhdGEuc3R5 bGVSdWxlKCk7CiAKQEAgLTUwNSwxMCArNTAzLDE4IEBAIHZvaWQgRWxlbWVudFJ1bGVDb2xsZWN0 b3I6OmNvbGxlY3RNYXRjaGluZ1J1bGVzRm9yTGlzdChjb25zdCBSdWxlU2V0OjpSdWxlRGF0YVZl CiAgICAgfQogfQogCi1ib29sIEVsZW1lbnRSdWxlQ29sbGVjdG9yOjpjb250YWluZXJRdWVyeU1h dGNoZXMoY29uc3QgRmlsdGVyZWRDb250YWluZXJRdWVyeSYgcXVlcnkpCitib29sIEVsZW1lbnRS dWxlQ29sbGVjdG9yOjpjb250YWluZXJRdWVyaWVzTWF0Y2goY29uc3QgVmVjdG9yPGNvbnN0IEZp bHRlcmVkQ29udGFpbmVyUXVlcnkqPiYgcXVlcmllcykKIHsKLSAgICBDb250YWluZXJRdWVyeUV2 YWx1YXRvciBldmFsdWF0b3IoZWxlbWVudCgpLCBtX3BzZXVkb0VsZW1lbnRSZXF1ZXN0LnBzZXVk b0lkICwgbV9zZWxlY3Rvck1hdGNoaW5nU3RhdGUpOwotICAgIHJldHVybiBldmFsdWF0b3IuZXZh bHVhdGUocXVlcnkpOworICAgIGlmIChxdWVyaWVzLmlzRW1wdHkoKSkKKyAgICAgICAgcmV0dXJu IHRydWU7CisKKyAgICAvLyAiU3R5bGUgcnVsZXMgZGVmaW5lZCBvbiBhbiBlbGVtZW50IGluc2lk ZSBtdWx0aXBsZSBuZXN0ZWQgY29udGFpbmVyIHF1ZXJpZXMgYXBwbHkgd2hlbiBhbGwgb2YgdGhl IHdyYXBwaW5nIGNvbnRhaW5lciBxdWVyaWVzIGFyZSB0cnVlIGZvciB0aGF0IGVsZW1lbnQuIgor ICAgIENvbnRhaW5lclF1ZXJ5RXZhbHVhdG9yIGV2YWx1YXRvcihlbGVtZW50KCksIG1fcHNldWRv RWxlbWVudFJlcXVlc3QucHNldWRvSWQsIG1fc2VsZWN0b3JNYXRjaGluZ1N0YXRlKTsKKyAgICBm b3IgKGF1dG8qIHF1ZXJ5IDogcXVlcmllcykgeworICAgICAgICBpZiAoIWV2YWx1YXRvci5ldmFs dWF0ZSgqcXVlcnkpKQorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0KKyAgICByZXR1 cm4gdHJ1ZTsKIH0KIAogc3RhdGljIGlubGluZSBib29sIGNvbXBhcmVSdWxlcyhNYXRjaGVkUnVs ZSByMSwgTWF0Y2hlZFJ1bGUgcjIpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9F bGVtZW50UnVsZUNvbGxlY3Rvci5oIGIvU291cmNlL1dlYkNvcmUvc3R5bGUvRWxlbWVudFJ1bGVD b2xsZWN0b3IuaAppbmRleCA5MGUwNmZhNjA1ZWZmMGJiZmI5OTVjNjVlMjM5ZGNkYjg3NTE2NDIy Li43MTQ4OTgzMWFhMWY1NzAxZmRmZTk5ZDBmMDNkNjc5YzExMTViN2YxIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9zdHlsZS9FbGVtZW50UnVsZUNvbGxlY3Rvci5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3N0eWxlL0VsZW1lbnRSdWxlQ29sbGVjdG9yLmgKQEAgLTExMiw3ICsxMTIsNyBAQCBw cml2YXRlOgogICAgIHZvaWQgY29sbGVjdE1hdGNoaW5nUnVsZXMoY29uc3QgTWF0Y2hSZXF1ZXN0 Jik7CiAgICAgdm9pZCBjb2xsZWN0TWF0Y2hpbmdSdWxlc0Zvckxpc3QoY29uc3QgUnVsZVNldDo6 UnVsZURhdGFWZWN0b3IqLCBjb25zdCBNYXRjaFJlcXVlc3QmKTsKICAgICBib29sIHJ1bGVNYXRj aGVzKGNvbnN0IFJ1bGVEYXRhJiwgdW5zaWduZWQmIHNwZWNpZmljaXR5LCBTY29wZU9yZGluYWwp OwotICAgIGJvb2wgY29udGFpbmVyUXVlcnlNYXRjaGVzKGNvbnN0IEZpbHRlcmVkQ29udGFpbmVy UXVlcnkmKTsKKyAgICBib29sIGNvbnRhaW5lclF1ZXJpZXNNYXRjaChjb25zdCBWZWN0b3I8Y29u c3QgRmlsdGVyZWRDb250YWluZXJRdWVyeSo+Jik7CiAKICAgICB2b2lkIHNvcnRNYXRjaGVkUnVs ZXMoKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3R5bGUvUnVsZVNldC5oIGIvU291 cmNlL1dlYkNvcmUvc3R5bGUvUnVsZVNldC5oCmluZGV4IDY1ZTczZjc0NTUyYWVkODBlNTQ0MDNj NGY2NmE0YmY2YTdiZDdkNGQuLjU4OWNkZTRkMDBkM2NjYTNlMjRhM2Q2NGEzMjlhNzQ3ZGQ2YmQ3 OGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1J1bGVTZXQuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9zdHlsZS9SdWxlU2V0LmgKQEAgLTEwOCw3ICsxMDgsOSBAQCBwdWJsaWM6CiAg ICAgc3RhdGljIGNvbnN0ZXhwciBhdXRvIGNhc2NhZGVMYXllclByaW9yaXR5Rm9yVW5sYXllcmVk ID0gc3RkOjpudW1lcmljX2xpbWl0czxDYXNjYWRlTGF5ZXJQcmlvcml0eT46Om1heCgpOwogCiAg ICAgQ2FzY2FkZUxheWVyUHJpb3JpdHkgY2FzY2FkZUxheWVyUHJpb3JpdHlGb3IoY29uc3QgUnVs ZURhdGEmKSBjb25zdDsKLSAgICBjb25zdCBGaWx0ZXJlZENvbnRhaW5lclF1ZXJ5KiBjb250YWlu ZXJRdWVyeUZvcihjb25zdCBSdWxlRGF0YSYpIGNvbnN0OworCisgICAgYm9vbCBoYXNDb250YWlu ZXJRdWVyaWVzKCkgY29uc3QgeyByZXR1cm4gIW1fY29udGFpbmVyUXVlcmllcy5pc0VtcHR5KCk7 IH0KKyAgICBWZWN0b3I8Y29uc3QgRmlsdGVyZWRDb250YWluZXJRdWVyeSo+IGNvbnRhaW5lclF1 ZXJpZXNGb3IoY29uc3QgUnVsZURhdGEmKSBjb25zdDsKIAogcHJpdmF0ZToKICAgICBmcmllbmQg Y2xhc3MgUnVsZVNldEJ1aWxkZXI7CkBAIC0xNDQsNyArMTQ2LDcgQEAgcHJpdmF0ZToKICAgICBD YXNjYWRlTGF5ZXJQcmlvcml0eSBjYXNjYWRlTGF5ZXJQcmlvcml0eUZvcklkZW50aWZpZXIoQ2Fz Y2FkZUxheWVySWRlbnRpZmllcikgY29uc3Q7CiAKICAgICBzdHJ1Y3QgQ29udGFpbmVyUXVlcnlB bmRQYXJlbnQgewotICAgICAgICBGaWx0ZXJlZENvbnRhaW5lclF1ZXJ5IHF1ZXJ5OworICAgICAg ICBSZWY8U3R5bGVSdWxlQ29udGFpbmVyPiBjb250YWluZXJSdWxlOwogICAgICAgICBDb250YWlu ZXJRdWVyeUlkZW50aWZpZXIgcGFyZW50OwogICAgIH07CiAKQEAgLTIyMSwxNiArMjIzLDIxIEBA IGlubGluZSBDYXNjYWRlTGF5ZXJQcmlvcml0eSBSdWxlU2V0OjpjYXNjYWRlTGF5ZXJQcmlvcml0 eUZvcihjb25zdCBSdWxlRGF0YSYgcnVsCiAgICAgcmV0dXJuIGNhc2NhZGVMYXllclByaW9yaXR5 Rm9ySWRlbnRpZmllcihpZGVudGlmaWVyKTsKIH0KIAotaW5saW5lIGNvbnN0IEZpbHRlcmVkQ29u dGFpbmVyUXVlcnkqIFJ1bGVTZXQ6OmNvbnRhaW5lclF1ZXJ5Rm9yKGNvbnN0IFJ1bGVEYXRhJiBy dWxlRGF0YSkgY29uc3QKK2lubGluZSBWZWN0b3I8Y29uc3QgRmlsdGVyZWRDb250YWluZXJRdWVy eSo+IFJ1bGVTZXQ6OmNvbnRhaW5lclF1ZXJpZXNGb3IoY29uc3QgUnVsZURhdGEmIHJ1bGVEYXRh KSBjb25zdAogewogICAgIGlmIChtX2NvbnRhaW5lclF1ZXJ5SWRlbnRpZmllckZvclJ1bGVQb3Np dGlvbi5zaXplKCkgPD0gcnVsZURhdGEucG9zaXRpb24oKSkKLSAgICAgICAgcmV0dXJuIG51bGxw dHI7CisgICAgICAgIHJldHVybiB7IH07CisKKyAgICBWZWN0b3I8Y29uc3QgRmlsdGVyZWRDb250 YWluZXJRdWVyeSo+IHF1ZXJpZXM7CiAKICAgICBhdXRvIGlkZW50aWZpZXIgPSBtX2NvbnRhaW5l clF1ZXJ5SWRlbnRpZmllckZvclJ1bGVQb3NpdGlvbltydWxlRGF0YS5wb3NpdGlvbigpXTsKLSAg ICBpZiAoIWlkZW50aWZpZXIpCi0gICAgICAgIHJldHVybiBudWxscHRyOworICAgIHdoaWxlIChp ZGVudGlmaWVyKSB7CisgICAgICAgIGF1dG8mIHF1ZXJ5ID0gbV9jb250YWluZXJRdWVyaWVzW2lk ZW50aWZpZXIgLSAxXTsKKyAgICAgICAgcXVlcmllcy5hcHBlbmQoJnF1ZXJ5LmNvbnRhaW5lclJ1 bGUtPmZpbHRlcmVkUXVlcnkoKSk7CisgICAgICAgIGlkZW50aWZpZXIgPSBxdWVyeS5wYXJlbnQ7 CisgICAgfTsKIAotICAgIHJldHVybiAmbV9jb250YWluZXJRdWVyaWVzW2lkZW50aWZpZXIgLSAx XS5xdWVyeTsKKyAgICByZXR1cm4gcXVlcmllczsKIH0KIAogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9zdHlsZS9SdWxlU2V0QnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9S dWxlU2V0QnVpbGRlci5jcHAKaW5kZXggNTc1MTg1OTE5N2IyMjZmYzI0NGFmNmJjMzIwNWZhZDI2 ZTAxNzAxOS4uY2I0NDBhYzk2NjA1MDAxZDg4OTMxNzRlZTMxZWQ5OGQ1ZTIyYTdjZiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvc3R5bGUvUnVsZVNldEJ1aWxkZXIuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3N0eWxlL1J1bGVTZXRCdWlsZGVyLmNwcApAQCAtMTEzLDcgKzExMyw3IEBAIHZv aWQgUnVsZVNldEJ1aWxkZXI6OmFkZENoaWxkUnVsZXMoY29uc3QgVmVjdG9yPFJlZlB0cjxTdHls ZVJ1bGVCYXNlPj4mIHJ1bGVzKQogICAgICAgICAgICAgYXV0byYgY29udGFpbmVyUnVsZSA9IGRv d25jYXN0PFN0eWxlUnVsZUNvbnRhaW5lcj4oKnJ1bGUpOwogICAgICAgICAgICAgYXV0byBwcmV2 aW91c0NvbnRhaW5lclF1ZXJ5SWRlbnRpZmllciA9IG1fY3VycmVudENvbnRhaW5lclF1ZXJ5SWRl bnRpZmllcjsKICAgICAgICAgICAgIGlmIChtX3J1bGVTZXQpIHsKLSAgICAgICAgICAgICAgICBt X3J1bGVTZXQtPm1fY29udGFpbmVyUXVlcmllcy5hcHBlbmQoeyBjb250YWluZXJSdWxlLmZpbHRl cmVkUXVlcnkoKSwgcHJldmlvdXNDb250YWluZXJRdWVyeUlkZW50aWZpZXIgfSk7CisgICAgICAg ICAgICAgICAgbV9ydWxlU2V0LT5tX2NvbnRhaW5lclF1ZXJpZXMuYXBwZW5kKHsgY29udGFpbmVy UnVsZSwgcHJldmlvdXNDb250YWluZXJRdWVyeUlkZW50aWZpZXIgfSk7CiAgICAgICAgICAgICAg ICAgbV9jdXJyZW50Q29udGFpbmVyUXVlcnlJZGVudGlmaWVyID0gbV9ydWxlU2V0LT5tX2NvbnRh aW5lclF1ZXJpZXMuc2l6ZSgpOwogICAgICAgICAgICAgfQogICAgICAgICAgICAgYWRkQ2hpbGRS dWxlcyhjb250YWluZXJSdWxlLmNoaWxkUnVsZXMoKSk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5n ZUxvZwppbmRleCBlMTExNTA3YTBkNzhjZGNhYjI1MWVjZGQxNDIzMjA2YTdkNTM3MjVmLi4yYmQ2 ODA0ZTBkZjVmNmVhYTJkOTFjMzEwZDk2MDA0MmEzY2I2ZWZhIDEwMDY0NAotLS0gYS9MYXlvdXRU ZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3cz Yy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAyMi0wMi0yMSAgQW50dGkgS29pdmlzdG8g IDxhbnR0aUBhcHBsZS5jb20+CisKKyAgICAgICAgW0NTUyBDb250YWluZXIgUXVlcmllc10gU3Vw cG9ydCBuZXN0ZWQgY29udGFpbmVyIHF1ZXJpZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNjk2MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY29udGFp bi9jb250YWluZXItcXVlcmllcy9jb250YWluZXItbmVzdGVkLWV4cGVjdGVkLnR4dDogQWRkZWQu CisgICAgICAgICogd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY29udGFpbi9jb250YWluZXIt cXVlcmllcy9jb250YWluZXItbmVzdGVkLmh0bWw6IEFkZGVkLgorCiAyMDIyLTAyLTIwICBUaW0g Tmd1eWVuICA8bnRpbUBhcHBsZS5jb20+CiAKICAgICAgICAgUmViYXNlbGluZSBpbmVydC1mb2N1 cy1pbi1mcmFtZXMuaHRtbCBhZnRlciByMjkwMTk3LgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWNvbnRhaW4vY29udGFpbmVy LXF1ZXJpZXMvY29udGFpbmVyLW5lc3RlZC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbXBv cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY29udGFpbi9jb250YWluZXItcXVl cmllcy9jb250YWluZXItbmVzdGVkLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NApp bmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4wM2Q0ZmNmMzhl NTkzMmE5MDgwMWQ1YmE0MGQ0OTRiZTY1YmI2MmU4Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0 VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWNvbnRhaW4vY29u dGFpbmVyLXF1ZXJpZXMvY29udGFpbmVyLW5lc3RlZC1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwx NiBAQAorCitQQVNTIE5lYXJlc3QKK1BBU1MgTmVhcmVzdCwgb3V0ZXIgZmFpbGluZworUEFTUyBO ZWFyZXN0LCBpbm5lciBmYWlsaW5nCitQQVNTIE91dGVyIG5hbWVkLCBpbm5lciBuYW1lZAorUEFT UyBPdXRlciBuYW1lZCwgaW5uZXIgbmFtZWQgKHJldmVyc2UpCitQQVNTIEZhaWxpbmcgb3V0ZXIg bmFtZQorUEFTUyBGYWlsaW5nIGlubmVyIG5hbWUKK1BBU1MgT3V0ZXIgbmFtZWQsIGlubmVyIG5l YXJlc3QKK1BBU1MgSW5uZXIgbmFtZWQsIG91dGVyIG5lYXJlc3QKK1BBU1MgSW5uZXIgbmFtZWQs IG91dGVyIG5lYXJlc3QgKHJldmVyc2UpCitQQVNTIFRocmVlIGxldmVscworUEFTUyBUaHJlZSBs ZXZlbHMsIG1pZGRsZSBmYWlsCitQQVNTIE5hbWVkIGlubmVyIGludmFsaWRhdGlvbgorUEFTUyBO ZWFyZXN0IG91dGVyIGludmFsaWRhdGlvbgorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBv cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY29udGFpbi9jb250YWluZXItcXVl cmllcy9jb250YWluZXItbmVzdGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2Vi LXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY29udGFpbi9jb250YWluZXItcXVlcmllcy9jb250YWlu ZXItbmVzdGVkLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uOTJlZWQxYzdhNTA4YzUwZDY2MzM4MDM1MjQyYTNh OTE1ZDQ4NDgyNAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93 ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1jb250YWluL2NvbnRhaW5lci1xdWVyaWVzL2NvbnRh aW5lci1uZXN0ZWQuaHRtbApAQCAtMCwwICsxLDIzNSBAQAorPCFkb2N0eXBlIGh0bWw+Cis8dGl0 bGU+QGNvbnRhaW5lciAobmVzdGVkKTwvdGl0bGU+Cis8bGluayByZWw9ImhlbHAiIGhyZWY9Imh0 dHBzOi8vZHJhZnRzLmNzc3dnLm9yZy9jc3MtY29udGFpbi0zLyNjb250YWluZXItcnVsZSI+Cis8 c2NyaXB0IHNyYz0iL3Jlc291cmNlcy90ZXN0aGFybmVzcy5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0 IHNyYz0iL3Jlc291cmNlcy90ZXN0aGFybmVzc3JlcG9ydC5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0 IHNyYz0ic3VwcG9ydC9jcS10ZXN0Y29tbW9uLmpzIj48L3NjcmlwdD4KKzxzdHlsZT4KKworI291 dGVyIHsKKyAgY29udGFpbmVyLW5hbWU6IG91dGVyOworICBjb250YWluZXItdHlwZTogc2l6ZTsK KyAgd2lkdGg6IDEwMHB4OworICBoZWlnaHQ6IDEwMHB4OworfQorCisjaW5uZXIgeworICBjb250 YWluZXItbmFtZTogaW5uZXI7CisgIGNvbnRhaW5lci10eXBlOiBzaXplOworICB3aWR0aDogNTBw eDsKKyAgaGVpZ2h0OiA1MHB4OworfQorPC9zdHlsZT4KKzxkaXYgaWQ9b3V0ZXI+CisgIDxkaXYg aWQ9aW5uZXI+CisgICAgPGRpdiBpZD1jaGlsZD48L2Rpdj4KKyAgPC9kaXY+Cis8L2Rpdj4KKzxz Y3JpcHQ+CisgIHNldHVwKCgpID0+IGFzc2VydF9pbXBsZW1lbnRzX2NvbnRhaW5lcl9xdWVyaWVz KCkpOworPC9zY3JpcHQ+CisKKworPHN0eWxlPgorICBAY29udGFpbmVyIHNpemUod2lkdGg6IDUw cHgpIHsKKyAgICBAY29udGFpbmVyIHNpemUoaGVpZ2h0OiA1MHB4KSB7CisgICAgICAjY2hpbGQg eyAtLW5lYXJlc3Q6dHJ1ZTsgfQorICAgIH0KKyAgfQorPC9zdHlsZT4KKzxzY3JpcHQ+CisgIHRl c3QoKCkgPT4geworICAgIGFzc2VydF9lcXVhbHMoZ2V0Q29tcHV0ZWRTdHlsZShjaGlsZCkuZ2V0 UHJvcGVydHlWYWx1ZSgnLS1uZWFyZXN0JyksICd0cnVlJyk7CisgIH0sICdOZWFyZXN0Jyk7Cis8 L3NjcmlwdD4KKworCis8c3R5bGU+CisgIEBjb250YWluZXIgc2l6ZSh3aWR0aDogNzBweCkgewor ICAgIEBjb250YWluZXIgc2l6ZShoZWlnaHQ6IDUwcHgpIHsKKyAgICAgICNjaGlsZCB7IC0tbmVh cmVzdC1vdXRlci1mYWlsOnRydWU7IH0KKyAgICB9CisgIH0KKzwvc3R5bGU+Cis8c2NyaXB0Pgor ICB0ZXN0KCgpID0+IHsKKyAgICBhc3NlcnRfZXF1YWxzKGdldENvbXB1dGVkU3R5bGUoY2hpbGQp LmdldFByb3BlcnR5VmFsdWUoJy0tbmVhcmVzdC1vdXRlci1mYWlsJyksICcnKTsKKyAgfSwgJ05l YXJlc3QsIG91dGVyIGZhaWxpbmcnKTsKKzwvc2NyaXB0PgorCisKKzxzdHlsZT4KKyAgQGNvbnRh aW5lciBzaXplKHdpZHRoOiA1MHB4KSB7CisgICAgQGNvbnRhaW5lciBzaXplKGhlaWdodDogNzBw eCkgeworICAgICAgI2NoaWxkIHsgLS1uZWFyZXN0LWlubmVyLWZhaWw6dHJ1ZTsgfQorICAgIH0K KyAgfQorPC9zdHlsZT4KKzxzY3JpcHQ+CisgIHRlc3QoKCkgPT4geworICAgIGFzc2VydF9lcXVh bHMoZ2V0Q29tcHV0ZWRTdHlsZShjaGlsZCkuZ2V0UHJvcGVydHlWYWx1ZSgnLS1uZWFyZXN0LWlu bmVyLWZhaWwnKSwgJycpOworICB9LCAnTmVhcmVzdCwgaW5uZXIgZmFpbGluZycpOworPC9zY3Jp cHQ+CisKKworPHN0eWxlPgorICBAY29udGFpbmVyIG91dGVyIHNpemUod2lkdGg6IDEwMHB4KSB7 CisgICAgQGNvbnRhaW5lciBpbm5lciBzaXplKGhlaWdodDogNTBweCkgeworICAgICAgI2NoaWxk IHsgLS1uYW1lZC1vdXRlci1pbm5lcjp0cnVlOyB9CisgICAgfQorICB9Cis8L3N0eWxlPgorPHNj cmlwdD4KKyAgdGVzdCgoKSA9PiB7CisgICAgYXNzZXJ0X2VxdWFscyhnZXRDb21wdXRlZFN0eWxl KGNoaWxkKS5nZXRQcm9wZXJ0eVZhbHVlKCctLW5hbWVkLW91dGVyLWlubmVyJyksICd0cnVlJyk7 CisgIH0sICdPdXRlciBuYW1lZCwgaW5uZXIgbmFtZWQnKTsKKzwvc2NyaXB0PgorCisKKzxzdHls ZT4KKyAgQGNvbnRhaW5lciBpbm5lciBzaXplKHdpZHRoOiA1MHB4KSB7CisgICAgQGNvbnRhaW5l ciBvdXRlciBzaXplKGhlaWdodDogMTAwcHgpIHsKKyAgICAgICNjaGlsZCB7IC0tbmFtZWQtb3V0 ZXItaW5uZXItcmV2ZXJzZTp0cnVlOyB9CisgICAgfQorICB9Cis8L3N0eWxlPgorPHNjcmlwdD4K KyAgdGVzdCgoKSA9PiB7CisgICAgYXNzZXJ0X2VxdWFscyhnZXRDb21wdXRlZFN0eWxlKGNoaWxk KS5nZXRQcm9wZXJ0eVZhbHVlKCctLW5hbWVkLW91dGVyLWlubmVyLXJldmVyc2UnKSwgJ3RydWUn KTsKKyAgfSwgJ091dGVyIG5hbWVkLCBpbm5lciBuYW1lZCAocmV2ZXJzZSknKTsKKzwvc2NyaXB0 PgorCisKKzxzdHlsZT4KKyAgQGNvbnRhaW5lciB1bmtub3duIHNpemUod2lkdGg6IDEwMHB4KSB7 CisgICAgQGNvbnRhaW5lciBpbm5lciBzaXplKGhlaWdodDogNTBweCkgeworICAgICAgI2NoaWxk IHsgLS1uYW1lZC1mYWlsaW5nLW91dGVyOnRydWU7IH0KKyAgICB9CisgIH0KKzwvc3R5bGU+Cis8 c2NyaXB0PgorICB0ZXN0KCgpID0+IHsKKyAgICBhc3NlcnRfZXF1YWxzKGdldENvbXB1dGVkU3R5 bGUoY2hpbGQpLmdldFByb3BlcnR5VmFsdWUoJy0tbmFtZWQtZmFpbGluZy1vdXRlcicpLCAnJyk7 CisgIH0sICdGYWlsaW5nIG91dGVyIG5hbWUnKTsKKzwvc2NyaXB0PgorCis8c3R5bGU+CisgIEBj b250YWluZXIgb3V0ZXIgc2l6ZSh3aWR0aDogMTAwcHgpIHsKKyAgICBAY29udGFpbmVyIHVua25v d24gc2l6ZShoZWlnaHQ6IDUwcHgpIHsKKyAgICAgICNjaGlsZCB7IC0tbmFtZWQtZmFpbGluZy1p bm5lcjp0cnVlOyB9CisgICAgfQorICB9Cis8L3N0eWxlPgorPHNjcmlwdD4KKyAgdGVzdCgoKSA9 PiB7CisgICAgYXNzZXJ0X2VxdWFscyhnZXRDb21wdXRlZFN0eWxlKGNoaWxkKS5nZXRQcm9wZXJ0 eVZhbHVlKCctLW5hbWVkLWZhaWxpbmctaW5uZXInKSwgJycpOworICB9LCAnRmFpbGluZyBpbm5l ciBuYW1lJyk7Cis8L3NjcmlwdD4KKworCis8c3R5bGU+CisgIEBjb250YWluZXIgb3V0ZXIgc2l6 ZSh3aWR0aDogMTAwcHgpIHsKKyAgICBAY29udGFpbmVyIHNpemUoaGVpZ2h0OiA1MHB4KSB7Cisg ICAgICAjY2hpbGQgeyAtLW5hbWVkLW91dGVyLWlubmVyLW5lYXJlc3Q6dHJ1ZTsgfQorICAgIH0K KyAgfQorPC9zdHlsZT4KKzxzY3JpcHQ+CisgIHRlc3QoKCkgPT4geworICAgIGFzc2VydF9lcXVh bHMoZ2V0Q29tcHV0ZWRTdHlsZShjaGlsZCkuZ2V0UHJvcGVydHlWYWx1ZSgnLS1uYW1lZC1vdXRl ci1pbm5lci1uZWFyZXN0JyksICd0cnVlJyk7CisgIH0sICdPdXRlciBuYW1lZCwgaW5uZXIgbmVh cmVzdCcpOworPC9zY3JpcHQ+CisKKworPHN0eWxlPgorICBAY29udGFpbmVyIHNpemUod2lkdGg6 IDUwcHgpIHsKKyAgICBAY29udGFpbmVyIGlubmVyIHNpemUoaGVpZ2h0OiA1MHB4KSB7CisgICAg ICAjY2hpbGQgeyAtLW5lYXJlc3Qtb3V0ZXItaW5uZXItbmFtZWQ6dHJ1ZTsgfQorICAgIH0KKyAg fQorPC9zdHlsZT4KKzxzY3JpcHQ+CisgIHRlc3QoKCkgPT4geworICAgIGFzc2VydF9lcXVhbHMo Z2V0Q29tcHV0ZWRTdHlsZShjaGlsZCkuZ2V0UHJvcGVydHlWYWx1ZSgnLS1uZWFyZXN0LW91dGVy LWlubmVyLW5hbWVkJyksICd0cnVlJyk7CisgIH0sICdJbm5lciBuYW1lZCwgb3V0ZXIgbmVhcmVz dCcpOworPC9zY3JpcHQ+CisKKworPHN0eWxlPgorICBAY29udGFpbmVyIHNpemUod2lkdGg6IDUw cHgpIHsKKyAgICBAY29udGFpbmVyIG91dGVyIHNpemUoaGVpZ2h0OiAxMDBweCkgeworICAgICAg I2NoaWxkIHsgLS1uZWFyZXN0LW91dGVyLWlubmVyLW5hbWVkLXJldmVyc2U6dHJ1ZTsgfQorICAg IH0KKyAgfQorPC9zdHlsZT4KKzxzY3JpcHQ+CisgIHRlc3QoKCkgPT4geworICAgIGFzc2VydF9l cXVhbHMoZ2V0Q29tcHV0ZWRTdHlsZShjaGlsZCkuZ2V0UHJvcGVydHlWYWx1ZSgnLS1uZWFyZXN0 LW91dGVyLWlubmVyLW5hbWVkLXJldmVyc2UnKSwgJ3RydWUnKTsKKyAgfSwgJ0lubmVyIG5hbWVk LCBvdXRlciBuZWFyZXN0IChyZXZlcnNlKScpOworPC9zY3JpcHQ+CisKKworPHN0eWxlPgorICBA Y29udGFpbmVyIHNpemUod2lkdGggPiAxcHgpIHsKKyAgICBAY29udGFpbmVyIHNpemUod2lkdGgg PiAycHgpIHsKKyAgICAgIEBjb250YWluZXIgc2l6ZSh3aWR0aCA+IDNweCkgeworICAgICAgICAj Y2hpbGQgeyAtLXRocmVlLWxldmVsczp0cnVlOyB9CisgICAgICB9CisgICAgfQorICB9Cis8L3N0 eWxlPgorPHNjcmlwdD4KKyAgdGVzdCgoKSA9PiB7CisgICAgYXNzZXJ0X2VxdWFscyhnZXRDb21w dXRlZFN0eWxlKGNoaWxkKS5nZXRQcm9wZXJ0eVZhbHVlKCctLXRocmVlLWxldmVscycpLCAndHJ1 ZScpOworICB9LCAnVGhyZWUgbGV2ZWxzJyk7Cis8L3NjcmlwdD4KKworCis8c3R5bGU+CisgIEBj b250YWluZXIgc2l6ZSh3aWR0aCA+IDFweCkgeworICAgIEBjb250YWluZXIgc2l6ZSh3aWR0aCA+ IDIwMDBweCkgeworICAgICAgQGNvbnRhaW5lciBzaXplKHdpZHRoID4gM3B4KSB7CisgICAgICAg ICNjaGlsZCB7IC0tdGhyZWUtbGV2ZWxzLW1pZGRsZS1mYWlsOnRydWU7IH0KKyAgICAgIH0KKyAg ICB9CisgIH0KKzwvc3R5bGU+Cis8c2NyaXB0PgorICB0ZXN0KCgpID0+IHsKKyAgICBhc3NlcnRf ZXF1YWxzKGdldENvbXB1dGVkU3R5bGUoY2hpbGQpLmdldFByb3BlcnR5VmFsdWUoJy0tdGhyZWUt bGV2ZWxzLW1pZGRsZS1mYWlsJyksICcnKTsKKyAgfSwgJ1RocmVlIGxldmVscywgbWlkZGxlIGZh aWwnKTsKKzwvc2NyaXB0PgorCisKKzxzdHlsZT4KKyAgQGNvbnRhaW5lciBzaXplKHdpZHRoOiA1 MHB4KSB7CisgICAgQGNvbnRhaW5lciBvdXRlciBzaXplKGhlaWdodDogMTAwcHgpIHsKKyAgICAg ICNjaGlsZCB7IC0taW5uZXItbmFtZWQtaW52YWxpZGF0aW9uOnRydWU7IH0KKyAgICB9CisgIH0K Kzwvc3R5bGU+Cis8c2NyaXB0PgorICB0ZXN0KCh0KSA9PiB7CisgICAgdC5hZGRfY2xlYW51cCgo KSA9PiB7IG91dGVyLnN0eWxlID0gJyc7IH0pOworICAgIGFzc2VydF9lcXVhbHMoZ2V0Q29tcHV0 ZWRTdHlsZShjaGlsZCkuZ2V0UHJvcGVydHlWYWx1ZSgnLS1pbm5lci1uYW1lZC1pbnZhbGlkYXRp b24nKSwgJ3RydWUnKTsKKyAgICBvdXRlci5zdHlsZS5oZWlnaHQgPSAnMjAwcHgnOworICAgIGFz c2VydF9lcXVhbHMoZ2V0Q29tcHV0ZWRTdHlsZShjaGlsZCkuZ2V0UHJvcGVydHlWYWx1ZSgnLS1p bm5lci1uYW1lZC1pbnZhbGlkYXRpb24nKSwgJycpOworICB9LCAnTmFtZWQgaW5uZXIgaW52YWxp ZGF0aW9uJyk7Cis8L3NjcmlwdD4KKworCis8c3R5bGU+CisgIEBjb250YWluZXIgc2l6ZSh3aWR0 aDogNTBweCkgeworICAgIEBjb250YWluZXIgb3V0ZXIgc2l6ZShoZWlnaHQ6IDEwMHB4KSB7Cisg ICAgICAjY2hpbGQgeyAtLW91dGVyLW5lYXJlc3QtaW52YWxpZGF0aW9uOnRydWU7IH0KKyAgICB9 CisgIH0KKzwvc3R5bGU+Cis8c2NyaXB0PgorICB0ZXN0KCh0KSA9PiB7CisgICAgdC5hZGRfY2xl YW51cCgoKSA9PiB7IGlubmVyLnN0eWxlID0gJyc7IH0pOworICAgIGFzc2VydF9lcXVhbHMoZ2V0 Q29tcHV0ZWRTdHlsZShjaGlsZCkuZ2V0UHJvcGVydHlWYWx1ZSgnLS1vdXRlci1uZWFyZXN0LWlu dmFsaWRhdGlvbicpLCAndHJ1ZScpOworICAgIGlubmVyLnN0eWxlLndpZHRoID0gJzIwMHB4JzsK KyAgICBhc3NlcnRfZXF1YWxzKGdldENvbXB1dGVkU3R5bGUoY2hpbGQpLmdldFByb3BlcnR5VmFs dWUoJy0tb3V0ZXItbmVhcmVzdC1pbnZhbGlkYXRpb24nKSwgJycpOworICB9LCAnTmVhcmVzdCBv dXRlciBpbnZhbGlkYXRpb24nKTsKKzwvc2NyaXB0Pgo=