229795 2021-09-02 01:46:06 -0700 [CSS Cascade Layers] Support layer argument in @import rules 2021-09-02 09:34:33 -0700 1 1 1 Unclassified WebKit CSS WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 229796 220779 1 koivisto webkit-unassigned esprehn+autocc ews-watchlist glenn gyuyoung.kim macpherson menard simon.fraser webkit-bug-importer oldest_to_newest 1789632 0 koivisto 2021-09-02 01:46:06 -0700 @import "style.css" layer; @import "style.css" layer(foo); 1789671 1 437137 koivisto 2021-09-02 05:11:31 -0700 Created attachment 437137 patch 1789740 2 ews-feeder 2021-09-02 09:33:13 -0700 Committed r281928 (241237@main): <https://commits.webkit.org/241237@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 437137. 1789742 3 webkit-bug-importer 2021-09-02 09:34:33 -0700 <rdar://problem/82679068> 437137 2021-09-02 05:11:31 -0700 2021-09-02 09:33:14 -0700 patch cascade-layer-import.patch text/plain 13315 koivisto ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cgYi9MYXlvdXRU ZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCmluZGV4IGNhZTNhNzEwYWM1MS4uNmU0ZmE5Y2Q1 OWFjIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCisrKyBi L0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAorMjAy MS0wOS0wMiAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CisKKyAgICAgICAgW0NT UyBDYXNjYWRlIExheWVyc10gU3VwcG9ydCBsYXllciBhcmd1bWVudCBpbiBAaW1wb3J0IHJ1bGVz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjk3OTUK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHdlYi1w bGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWNhc2NhZGUvbGF5ZXItaW1wb3J0LWV4cGVjdGVkLnR4dDoK KwogMjAyMS0wOS0wMiAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CiAKICAgICAg ICAgW0NTUyBDYXNjYWRlIExheWVyc10gSW1wb3J0IEBpbXBvcnQgV1BUIHRlc3RzCmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mt Y2FzY2FkZS9sYXllci1pbXBvcnQtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQv dzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWNhc2NhZGUvbGF5ZXItaW1wb3J0LWV4cGVj dGVkLnR4dAppbmRleCBjZjZmYzFmZWNiMTEuLjE0MjI2NGQ3OTZmOCAxMDA2NDQKLS0tIGEvTGF5 b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWNhc2NhZGUv bGF5ZXItaW1wb3J0LWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mv d2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY2FzY2FkZS9sYXllci1pbXBvcnQtZXhwZWN0ZWQu dHh0CkBAIC0zLDIzICszLDIzIEBAIFBBU1MgQTEgTGF5ZXIgcnVsZXMgd2l0aCBpbXBvcnQKIFBB U1MgQTIgTGF5ZXIgcnVsZXMgd2l0aCBpbXBvcnQKIFBBU1MgQTMgTGF5ZXIgcnVsZXMgd2l0aCBp bXBvcnQKIFBBU1MgQTQgTGF5ZXIgcnVsZXMgd2l0aCBpbXBvcnQKLUZBSUwgQjEgQW5vbnltb3Vz IGltcG9ydHMgYXNzZXJ0X2VxdWFsczogQjEgQW5vbnltb3VzIGltcG9ydHMsIHRhcmdldCAnZmly c3QnIGV4cGVjdGVkICJyZ2IoMCwgMTI4LCAwKSIgYnV0IGdvdCAicmdiKDI1NSwgMCwgMCkiCi1G QUlMIEIyIEFub255bW91cyBpbXBvcnRzIGFzc2VydF9lcXVhbHM6IEIyIEFub255bW91cyBpbXBv cnRzLCB0YXJnZXQgJ2ZpcnN0JyBleHBlY3RlZCAicmdiKDAsIDEyOCwgMCkiIGJ1dCBnb3QgInJn YigyNTUsIDAsIDApIgorUEFTUyBCMSBBbm9ueW1vdXMgaW1wb3J0cworUEFTUyBCMiBBbm9ueW1v dXMgaW1wb3J0cwogUEFTUyBCMyBBbm9ueW1vdXMgaW1wb3J0cwotRkFJTCBCNCBBbm9ueW1vdXMg aW1wb3J0cyBhc3NlcnRfZXF1YWxzOiBCNCBBbm9ueW1vdXMgaW1wb3J0cywgdGFyZ2V0ICdmaXJz dCcgZXhwZWN0ZWQgInJnYigwLCAxMjgsIDApIiBidXQgZ290ICJyZ2IoMjU1LCAwLCAwKSIKLUZB SUwgQzEgTmFtZWQgaW1wb3J0cyBhc3NlcnRfZXF1YWxzOiBDMSBOYW1lZCBpbXBvcnRzLCB0YXJn ZXQgJ2ZpcnN0JyBleHBlY3RlZCAicmdiKDAsIDEyOCwgMCkiIGJ1dCBnb3QgInJnYigyNTUsIDAs IDApIgotRkFJTCBDMiBOYW1lZCBpbXBvcnRzIGFzc2VydF9lcXVhbHM6IEMyIE5hbWVkIGltcG9y dHMsIHRhcmdldCAnZmlyc3QnIGV4cGVjdGVkICJyZ2IoMCwgMTI4LCAwKSIgYnV0IGdvdCAicmdi KDI1NSwgMCwgMCkiCitQQVNTIEI0IEFub255bW91cyBpbXBvcnRzCitQQVNTIEMxIE5hbWVkIGlt cG9ydHMKK1BBU1MgQzIgTmFtZWQgaW1wb3J0cwogUEFTUyBDMyBOYW1lZCBpbXBvcnRzCi1GQUlM IEM0IE5hbWVkIGltcG9ydHMgYXNzZXJ0X2VxdWFsczogQzQgTmFtZWQgaW1wb3J0cywgdGFyZ2V0 ICdmaXJzdCcgZXhwZWN0ZWQgInJnYigwLCAxMjgsIDApIiBidXQgZ290ICJyZ2IoMjU1LCAwLCAw KSIKK1BBU1MgQzQgTmFtZWQgaW1wb3J0cwogUEFTUyBDNSBOYW1lZCBpbXBvcnRzCiBQQVNTIEM2 IE5hbWVkIGltcG9ydHMKLUZBSUwgQzcgTmFtZWQgaW1wb3J0cyBhc3NlcnRfZXF1YWxzOiBDNyBO YW1lZCBpbXBvcnRzLCB0YXJnZXQgJ2ZpcnN0JyBleHBlY3RlZCAicmdiKDAsIDEyOCwgMCkiIGJ1 dCBnb3QgInJnYigyNTUsIDAsIDApIgotRkFJTCBDOCBOYW1lZCBpbXBvcnRzIGFzc2VydF9lcXVh bHM6IEM4IE5hbWVkIGltcG9ydHMsIHRhcmdldCAnZmlyc3QnIGV4cGVjdGVkICJyZ2IoMCwgMTI4 LCAwKSIgYnV0IGdvdCAicmdiKDI1NSwgMCwgMCkiCi1GQUlMIEM5IE5hbWVkIGltcG9ydHMgYXNz ZXJ0X2VxdWFsczogQzkgTmFtZWQgaW1wb3J0cywgdGFyZ2V0ICdmaXJzdCcgZXhwZWN0ZWQgInJn YigwLCAxMjgsIDApIiBidXQgZ290ICJyZ2IoMjU1LCAwLCAwKSIKLUZBSUwgRDEgTGF5ZXIgc3Rh dGVtZW50IHdpdGggaW1wb3J0cyBhc3NlcnRfZXF1YWxzOiBEMSBMYXllciBzdGF0ZW1lbnQgd2l0 aCBpbXBvcnRzLCB0YXJnZXQgJ2ZpcnN0JyBleHBlY3RlZCAicmdiKDAsIDEyOCwgMCkiIGJ1dCBn b3QgInJnYigyNTUsIDAsIDApIgorUEFTUyBDNyBOYW1lZCBpbXBvcnRzCitQQVNTIEM4IE5hbWVk IGltcG9ydHMKK1BBU1MgQzkgTmFtZWQgaW1wb3J0cworUEFTUyBEMSBMYXllciBzdGF0ZW1lbnQg d2l0aCBpbXBvcnRzCiBGQUlMIEQyIExheWVyIHN0YXRlbWVudCB3aXRoIGltcG9ydHMgYXNzZXJ0 X2VxdWFsczogRDIgTGF5ZXIgc3RhdGVtZW50IHdpdGggaW1wb3J0cywgdGFyZ2V0ICdmaXJzdCcg ZXhwZWN0ZWQgInJnYigwLCAxMjgsIDApIiBidXQgZ290ICJyZ2IoMjU1LCAwLCAwKSIKIEZBSUwg RDMgTGF5ZXIgc3RhdGVtZW50IHdpdGggaW1wb3J0cyBhc3NlcnRfZXF1YWxzOiBEMyBMYXllciBz dGF0ZW1lbnQgd2l0aCBpbXBvcnRzLCB0YXJnZXQgJ2ZpcnN0JyBleHBlY3RlZCAicmdiKDAsIDEy OCwgMCkiIGJ1dCBnb3QgInJnYigyNTUsIDAsIDApIgogRkFJTCBENCBMYXllciBzdGF0ZW1lbnQg d2l0aCBpbXBvcnRzIGFzc2VydF9lcXVhbHM6IEQ0IExheWVyIHN0YXRlbWVudCB3aXRoIGltcG9y dHMsIHRhcmdldCAnZmlyc3QnIGV4cGVjdGVkICJyZ2IoMCwgMTI4LCAwKSIgYnV0IGdvdCAicmdi KDI1NSwgMCwgMCkiCiBGQUlMIEQ1IExheWVyIHN0YXRlbWVudCB3aXRoIGltcG9ydHMgYXNzZXJ0 X2VxdWFsczogRDUgTGF5ZXIgc3RhdGVtZW50IHdpdGggaW1wb3J0cywgdGFyZ2V0ICdmaXJzdCcg ZXhwZWN0ZWQgInJnYigwLCAxMjgsIDApIiBidXQgZ290ICJyZ2IoMjU1LCAwLCAwKSIKLUZBSUwg RDYgTGF5ZXIgc3RhdGVtZW50IHdpdGggaW1wb3J0cyBhc3NlcnRfZXF1YWxzOiBENiBMYXllciBz dGF0ZW1lbnQgd2l0aCBpbXBvcnRzLCB0YXJnZXQgJ2ZpcnN0JyBleHBlY3RlZCAicmdiKDAsIDEy OCwgMCkiIGJ1dCBnb3QgInJnYigyNTUsIDAsIDApIgorUEFTUyBENiBMYXllciBzdGF0ZW1lbnQg d2l0aCBpbXBvcnRzCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA5MjBkM2U2NzA4ZTguLjVjMjcxYmE5ZGVjZSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3Jl L0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDIxLTA5LTAyICBBbnR0aSBLb2l2aXN0byAg PGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBbQ1NTIENhc2NhZGUgTGF5ZXJzXSBTdXBwb3J0 IGxheWVyIGFyZ3VtZW50IGluIEBpbXBvcnQgcnVsZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyOTc5NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBzdXBwb3J0IGZvcgorCisgICAgICAgIEBpbXBv cnQgInN0eWxlLmNzcyIgbGF5ZXI7CisgICAgICAgIEBpbXBvcnQgInN0eWxlLmNzcyIgbGF5ZXIo Zm9vKTsKKworICAgICAgICAqIGNzcy9TdHlsZVJ1bGVJbXBvcnQuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6U3R5bGVSdWxlSW1wb3J0OjpjcmVhdGUpOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGVS dWxlSW1wb3J0OjpTdHlsZVJ1bGVJbXBvcnQpOgorCisgICAgICAgIEFkZCBsYXllciBuYW1lIG1l bWJlci4KKworICAgICAgICAqIGNzcy9TdHlsZVJ1bGVJbXBvcnQuaDoKKyAgICAgICAgKiBjc3Mv cGFyc2VyL0NTU1BhcnNlckltcGwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y29uc3VtZUNhc2Nh ZGVMYXllck5hbWUpOgorCisgICAgICAgIEZhY3RvciBpbnRvIGEgc3RhbmRhbG9uZSBmdW5jdGlv bi4KKworICAgICAgICAoV2ViQ29yZTo6Q1NTUGFyc2VySW1wbDo6Y29uc3VtZUltcG9ydFJ1bGUp OgorCisgICAgICAgIFBhcnNlIGxheWVyIGFuZCBsYXllcigpIGFyZ3VtZW50cyBmb3IgQGltcG9y dC4KKworICAgICAgICAoV2ViQ29yZTo6Q1NTUGFyc2VySW1wbDo6Y29uc3VtZUxheWVyUnVsZSk6 CisgICAgICAgICogc3R5bGUvUnVsZVNldC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6 UnVsZVNldDo6QnVpbGRlcjo6YWRkUnVsZXNGcm9tU2hlZXQpOgorCisgICAgICAgIFJlZ2lzdGVy IHRoZSBsYXllcnMgc3BlY2lmaWVkIGluIGltcG9ydCBydWxlcy4KKwogMjAyMS0wOS0wMiAgUm9i IEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgogCiAgICAgICAgIEFic29sdXRlbHkgcG9zaXRpb25l ZCBhbmQgbmVnYXRpdmUgei1pbmRleCBkaXYgd2l0aCBjYW52YXMgY2hpbGQgZ2V0cyBkcmF3biB3 aXRoIHdyb25nIHN0YWNraW5nIG9yZGVyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3Mv U3R5bGVSdWxlSW1wb3J0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJ1bGVJbXBvcnQu Y3BwCmluZGV4IDUyMTczNTg5Mzk2NC4uYWZjZDI1ZjZjZjQ1IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9jc3MvU3R5bGVSdWxlSW1wb3J0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3Mv U3R5bGVSdWxlSW1wb3J0LmNwcApAQCAtMzYsMTYgKzM2LDE3IEBACiAKIG5hbWVzcGFjZSBXZWJD b3JlIHsKIAotUmVmPFN0eWxlUnVsZUltcG9ydD4gU3R5bGVSdWxlSW1wb3J0OjpjcmVhdGUoY29u c3QgU3RyaW5nJiBocmVmLCBSZWY8TWVkaWFRdWVyeVNldD4mJiBtZWRpYSkKK1JlZjxTdHlsZVJ1 bGVJbXBvcnQ+IFN0eWxlUnVsZUltcG9ydDo6Y3JlYXRlKGNvbnN0IFN0cmluZyYgaHJlZiwgUmVm PE1lZGlhUXVlcnlTZXQ+JiYgbWVkaWEsIHN0ZDo6b3B0aW9uYWw8Q2FzY2FkZUxheWVyTmFtZT4m JiBjYXNjYWRlTGF5ZXJOYW1lKQogewotICAgIHJldHVybiBhZG9wdFJlZigqbmV3IFN0eWxlUnVs ZUltcG9ydChocmVmLCBXVEZNb3ZlKG1lZGlhKSkpOworICAgIHJldHVybiBhZG9wdFJlZigqbmV3 IFN0eWxlUnVsZUltcG9ydChocmVmLCBXVEZNb3ZlKG1lZGlhKSwgV1RGTW92ZShjYXNjYWRlTGF5 ZXJOYW1lKSkpOwogfQogCi1TdHlsZVJ1bGVJbXBvcnQ6OlN0eWxlUnVsZUltcG9ydChjb25zdCBT dHJpbmcmIGhyZWYsIFJlZjxNZWRpYVF1ZXJ5U2V0PiYmIG1lZGlhKQorU3R5bGVSdWxlSW1wb3J0 OjpTdHlsZVJ1bGVJbXBvcnQoY29uc3QgU3RyaW5nJiBocmVmLCBSZWY8TWVkaWFRdWVyeVNldD4m JiBtZWRpYSwgc3RkOjpvcHRpb25hbDxDYXNjYWRlTGF5ZXJOYW1lPiYmIGNhc2NhZGVMYXllck5h bWUpCiAgICAgOiBTdHlsZVJ1bGVCYXNlKFN0eWxlUnVsZVR5cGU6OkltcG9ydCkKICAgICAsIG1f c3R5bGVTaGVldENsaWVudCh0aGlzKQogICAgICwgbV9zdHJIcmVmKGhyZWYpCiAgICAgLCBtX21l ZGlhUXVlcmllcyhXVEZNb3ZlKG1lZGlhKSkKKyAgICAsIG1fY2FzY2FkZUxheWVyTmFtZShXVEZN b3ZlKGNhc2NhZGVMYXllck5hbWUpKQogewogICAgIGlmICghbV9tZWRpYVF1ZXJpZXMpCiAgICAg ICAgIG1fbWVkaWFRdWVyaWVzID0gTWVkaWFRdWVyeVNldDo6Y3JlYXRlKFN0cmluZygpLCBNZWRp YVF1ZXJ5UGFyc2VyQ29udGV4dCgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9T dHlsZVJ1bGVJbXBvcnQuaCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJ1bGVJbXBvcnQuaApp bmRleCA2MGY5ZDk2ZGRhZTEuLmExNThmZGIyNDE4NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvY3NzL1N0eWxlUnVsZUltcG9ydC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJ1 bGVJbXBvcnQuaApAQCAtMzUsNyArMzUsNyBAQCBjbGFzcyBTdHlsZVNoZWV0Q29udGVudHM7CiBj bGFzcyBTdHlsZVJ1bGVJbXBvcnQgZmluYWwgOiBwdWJsaWMgU3R5bGVSdWxlQmFzZSB7CiAgICAg V1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7CiBwdWJsaWM6Ci0gICAgc3RhdGljIFJlZjxTdHlsZVJ1 bGVJbXBvcnQ+IGNyZWF0ZShjb25zdCBTdHJpbmcmIGhyZWYsIFJlZjxNZWRpYVF1ZXJ5U2V0PiYm KTsKKyAgICBzdGF0aWMgUmVmPFN0eWxlUnVsZUltcG9ydD4gY3JlYXRlKGNvbnN0IFN0cmluZyYg aHJlZiwgUmVmPE1lZGlhUXVlcnlTZXQ+JiYsIHN0ZDo6b3B0aW9uYWw8Q2FzY2FkZUxheWVyTmFt ZT4mJik7CiAKICAgICB+U3R5bGVSdWxlSW1wb3J0KCk7CiAgICAgCkBAIC01MiwxMCArNTIsMTIg QEAgcHVibGljOgogICAgIHZvaWQgcmVxdWVzdFN0eWxlU2hlZXQoKTsKICAgICBjb25zdCBDYWNo ZWRDU1NTdHlsZVNoZWV0KiBjYWNoZWRDU1NTdHlsZVNoZWV0KCkgY29uc3QgeyByZXR1cm4gbV9j YWNoZWRTaGVldC5nZXQoKTsgfQogCisgICAgY29uc3Qgc3RkOjpvcHRpb25hbDxDYXNjYWRlTGF5 ZXJOYW1lPiYgY2FzY2FkZUxheWVyTmFtZSgpIGNvbnN0IHsgcmV0dXJuIG1fY2FzY2FkZUxheWVy TmFtZTsgfQorCiBwcml2YXRlOgogICAgIC8vIE5PVEU6IFdlIHB1dCB0aGUgQ2FjaGVkU3R5bGVT aGVldENsaWVudCBpbiBhIG1lbWJlciBpbnN0ZWFkIG9mIGluaGVyaXRpbmcgZnJvbSBpdAogICAg IC8vIHRvIGF2b2lkIGFkZGluZyBhIHZwdHIgdG8gU3R5bGVSdWxlSW1wb3J0LgotY2xhc3MgSW1w b3J0ZWRTdHlsZVNoZWV0Q2xpZW50IGZpbmFsIDogcHVibGljIENhY2hlZFN0eWxlU2hlZXRDbGll bnQgeworICAgIGNsYXNzIEltcG9ydGVkU3R5bGVTaGVldENsaWVudCBmaW5hbCA6IHB1YmxpYyBD YWNoZWRTdHlsZVNoZWV0Q2xpZW50IHsKICAgICBwdWJsaWM6CiAgICAgICAgIEltcG9ydGVkU3R5 bGVTaGVldENsaWVudChTdHlsZVJ1bGVJbXBvcnQqIG93bmVyUnVsZSkgOiBtX293bmVyUnVsZShv d25lclJ1bGUpIHsgfQogICAgICAgICB2aXJ0dWFsIH5JbXBvcnRlZFN0eWxlU2hlZXRDbGllbnQo KSA9IGRlZmF1bHQ7CkBAIC03MCw3ICs3Miw3IEBAIGNsYXNzIEltcG9ydGVkU3R5bGVTaGVldENs aWVudCBmaW5hbCA6IHB1YmxpYyBDYWNoZWRTdHlsZVNoZWV0Q2xpZW50IHsKICAgICB2b2lkIHNl dENTU1N0eWxlU2hlZXQoY29uc3QgU3RyaW5nJiBocmVmLCBjb25zdCBVUkwmIGJhc2VVUkwsIGNv bnN0IFN0cmluZyYgY2hhcnNldCwgY29uc3QgQ2FjaGVkQ1NTU3R5bGVTaGVldCopOwogICAgIGZy aWVuZCBjbGFzcyBJbXBvcnRlZFN0eWxlU2hlZXRDbGllbnQ7CiAKLSAgICBTdHlsZVJ1bGVJbXBv cnQoY29uc3QgU3RyaW5nJiBocmVmLCBSZWY8TWVkaWFRdWVyeVNldD4mJik7CisgICAgU3R5bGVS dWxlSW1wb3J0KGNvbnN0IFN0cmluZyYgaHJlZiwgUmVmPE1lZGlhUXVlcnlTZXQ+JiYsIHN0ZDo6 b3B0aW9uYWw8Q2FzY2FkZUxheWVyTmFtZT4mJik7CiAKICAgICBTdHlsZVNoZWV0Q29udGVudHMq IG1fcGFyZW50U3R5bGVTaGVldCB7IG51bGxwdHIgfTsKIApAQCAtNzgsNiArODAsNyBAQCBjbGFz cyBJbXBvcnRlZFN0eWxlU2hlZXRDbGllbnQgZmluYWwgOiBwdWJsaWMgQ2FjaGVkU3R5bGVTaGVl dENsaWVudCB7CiAgICAgU3RyaW5nIG1fc3RySHJlZjsKICAgICBSZWZQdHI8TWVkaWFRdWVyeVNl dD4gbV9tZWRpYVF1ZXJpZXM7CiAgICAgUmVmUHRyPFN0eWxlU2hlZXRDb250ZW50cz4gbV9zdHls ZVNoZWV0OworICAgIHN0ZDo6b3B0aW9uYWw8Q2FzY2FkZUxheWVyTmFtZT4gbV9jYXNjYWRlTGF5 ZXJOYW1lOwogICAgIENhY2hlZFJlc291cmNlSGFuZGxlPENhY2hlZENTU1N0eWxlU2hlZXQ+IG1f Y2FjaGVkU2hlZXQ7CiAgICAgYm9vbCBtX2xvYWRpbmcgeyBmYWxzZSB9OwogfTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9wYXJzZXIvQ1NTUGFyc2VySW1wbC5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9jc3MvcGFyc2VyL0NTU1BhcnNlckltcGwuY3BwCmluZGV4IDFhOWQ3ZTg3N2ZlYS4u ZTViNzQzMDJlMGNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvcGFyc2VyL0NTU1Bh cnNlckltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9wYXJzZXIvQ1NTUGFyc2VySW1w bC5jcHAKQEAgLTUwNyw2ICs1MDcsMzIgQEAgUmVmUHRyPFN0eWxlUnVsZUNoYXJzZXQ+IENTU1Bh cnNlckltcGw6OmNvbnN1bWVDaGFyc2V0UnVsZShDU1NQYXJzZXJUb2tlblJhbmdlIHAKICAgICBy ZXR1cm4gU3R5bGVSdWxlQ2hhcnNldDo6Y3JlYXRlKCk7CiB9CiAKK2VudW0gY2xhc3MgQWxsb3dB bm9ueW1vdXMgeyBZZXMsIE5vIH07CitzdGF0aWMgc3RkOjpvcHRpb25hbDxDYXNjYWRlTGF5ZXJO YW1lPiBjb25zdW1lQ2FzY2FkZUxheWVyTmFtZShDU1NQYXJzZXJUb2tlblJhbmdlJiByYW5nZSwg QWxsb3dBbm9ueW1vdXMgYWxsb3dBbm9ueW1vdXMpCit7CisgICAgQ2FzY2FkZUxheWVyTmFtZSBu YW1lOworICAgIGlmIChyYW5nZS5hdEVuZCgpKSB7CisgICAgICAgIGlmIChhbGxvd0Fub255bW91 cyA9PSBBbGxvd0Fub255bW91czo6WWVzKQorICAgICAgICAgICAgcmV0dXJuIG5hbWU7CisgICAg ICAgIHJldHVybiB7IH07CisgICAgfQorCisgICAgd2hpbGUgKHRydWUpIHsKKyAgICAgICAgYXV0 byBuYW1lVG9rZW4gPSByYW5nZS5jb25zdW1lKCk7CisgICAgICAgIGlmIChuYW1lVG9rZW4udHlw ZSgpICE9IElkZW50VG9rZW4pCisgICAgICAgICAgICByZXR1cm4geyB9OworCisgICAgICAgIG5h bWUuYXBwZW5kKG5hbWVUb2tlbi52YWx1ZSgpLnRvQXRvbVN0cmluZygpKTsKKworICAgICAgICBp ZiAocmFuZ2UucGVlaygpLnR5cGUoKSAhPSBEZWxpbWl0ZXJUb2tlbiB8fCByYW5nZS5wZWVrKCku ZGVsaW1pdGVyKCkgIT0gJy4nKQorICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIHJhbmdlLmNv bnN1bWUoKTsKKyAgICB9CisKKyAgICByYW5nZS5jb25zdW1lV2hpdGVzcGFjZSgpOworICAgIHJl dHVybiBuYW1lOworfQorCiBSZWZQdHI8U3R5bGVSdWxlSW1wb3J0PiBDU1NQYXJzZXJJbXBsOjpj b25zdW1lSW1wb3J0UnVsZShDU1NQYXJzZXJUb2tlblJhbmdlIHByZWx1ZGUpCiB7CiAgICAgQXRv bVN0cmluZyB1cmkoY29uc3VtZVN0cmluZ09yVVJJKHByZWx1ZGUpKTsKQEAgLTUyMCw4ICs1NDYs MjkgQEAgUmVmUHRyPFN0eWxlUnVsZUltcG9ydD4gQ1NTUGFyc2VySW1wbDo6Y29uc3VtZUltcG9y dFJ1bGUoQ1NTUGFyc2VyVG9rZW5SYW5nZSBwcmUKICAgICAgICAgbV9vYnNlcnZlcldyYXBwZXIt Pm9ic2VydmVyKCkuc3RhcnRSdWxlQm9keShlbmRPZmZzZXQpOwogICAgICAgICBtX29ic2VydmVy V3JhcHBlci0+b2JzZXJ2ZXIoKS5lbmRSdWxlQm9keShlbmRPZmZzZXQpOwogICAgIH0KKworICAg IHByZWx1ZGUuY29uc3VtZVdoaXRlc3BhY2UoKTsKKworICAgIGF1dG8gY29uc3VtZUNhc2NhZGVM YXllciA9IFsmXSgpIC0+IHN0ZDo6b3B0aW9uYWw8Q2FzY2FkZUxheWVyTmFtZT4geworICAgICAg ICBpZiAoIW1fY29udGV4dC5jYXNjYWRlTGF5ZXJzRW5hYmxlZCkKKyAgICAgICAgICAgIHJldHVy biB7IH07CisgICAgICAgIAorICAgICAgICBhdXRvJiB0b2tlbiA9IHByZWx1ZGUucGVlaygpOwor ICAgICAgICBpZiAodG9rZW4udHlwZSgpID09IEZ1bmN0aW9uVG9rZW4gJiYgZXF1YWxJZ25vcmlu Z0FTQ0lJQ2FzZSh0b2tlbi52YWx1ZSgpLCAibGF5ZXIiKSkgeworICAgICAgICAgICAgYXV0byBj b250ZW50cyA9IENTU1Byb3BlcnR5UGFyc2VySGVscGVyczo6Y29uc3VtZUZ1bmN0aW9uKHByZWx1 ZGUpOworICAgICAgICAgICAgcmV0dXJuIGNvbnN1bWVDYXNjYWRlTGF5ZXJOYW1lKGNvbnRlbnRz LCBBbGxvd0Fub255bW91czo6Tm8pOworICAgICAgICB9CisgICAgICAgIGlmICh0b2tlbi50eXBl KCkgPT0gSWRlbnRUb2tlbiAmJiBlcXVhbElnbm9yaW5nQVNDSUlDYXNlKHRva2VuLnZhbHVlKCks ICJsYXllciIpKSB7CisgICAgICAgICAgICBwcmVsdWRlLmNvbnN1bWVJbmNsdWRpbmdXaGl0ZXNw YWNlKCk7CisgICAgICAgICAgICByZXR1cm4gQ2FzY2FkZUxheWVyTmFtZSB7IH07CisgICAgICAg IH0KKyAgICAgICAgcmV0dXJuIHsgfTsKKyAgICB9OworCisgICAgYXV0byBjYXNjYWRlTGF5ZXJO YW1lID0gY29uc3VtZUNhc2NhZGVMYXllcigpOworICAgIGF1dG8gbWVkaWFRdWVyeVNldCA9IE1l ZGlhUXVlcnlQYXJzZXI6OnBhcnNlTWVkaWFRdWVyeVNldChwcmVsdWRlLCBNZWRpYVF1ZXJ5UGFy c2VyQ29udGV4dChtX2NvbnRleHQpKTsKICAgICAKLSAgICByZXR1cm4gU3R5bGVSdWxlSW1wb3J0 OjpjcmVhdGUodXJpLCBNZWRpYVF1ZXJ5UGFyc2VyOjpwYXJzZU1lZGlhUXVlcnlTZXQocHJlbHVk ZSwgTWVkaWFRdWVyeVBhcnNlckNvbnRleHQobV9jb250ZXh0KSkucmVsZWFzZU5vbk51bGwoKSk7 CisgICAgcmV0dXJuIFN0eWxlUnVsZUltcG9ydDo6Y3JlYXRlKHVyaSwgbWVkaWFRdWVyeVNldC5y ZWxlYXNlTm9uTnVsbCgpLCBXVEZNb3ZlKGNhc2NhZGVMYXllck5hbWUpKTsKIH0KIAogUmVmUHRy PFN0eWxlUnVsZU5hbWVzcGFjZT4gQ1NTUGFyc2VySW1wbDo6Y29uc3VtZU5hbWVzcGFjZVJ1bGUo Q1NTUGFyc2VyVG9rZW5SYW5nZSBwcmVsdWRlKQpAQCAtNjg3LDMzICs3MzQsMTEgQEAgUmVmUHRy PFN0eWxlUnVsZUxheWVyPiBDU1NQYXJzZXJJbXBsOjpjb25zdW1lTGF5ZXJSdWxlKENTU1BhcnNl clRva2VuUmFuZ2UgcHJlbHUKIAogICAgIGF1dG8gcHJlbHVkZUNvcHkgPSBwcmVsdWRlOwogCi0g ICAgYXV0byBjb25zdW1lTmFtZSA9IFsmXSgpIC0+IHN0ZDo6b3B0aW9uYWw8Q2FzY2FkZUxheWVy TmFtZT4gewotICAgICAgICBDYXNjYWRlTGF5ZXJOYW1lIG5hbWU7Ci0gICAgICAgIC8vIEFub255 bW91cyBjYXNlLgotICAgICAgICBpZiAocHJlbHVkZS5hdEVuZCgpKQotICAgICAgICAgICAgcmV0 dXJuIG5hbWU7Ci0KLSAgICAgICAgd2hpbGUgKHRydWUpIHsKLSAgICAgICAgICAgIGF1dG8gbmFt ZVRva2VuID0gcHJlbHVkZS5jb25zdW1lKCk7Ci0gICAgICAgICAgICBpZiAobmFtZVRva2VuLnR5 cGUoKSAhPSBJZGVudFRva2VuKQotICAgICAgICAgICAgICAgIHJldHVybiB7IH07Ci0KLSAgICAg ICAgICAgIG5hbWUuYXBwZW5kKG5hbWVUb2tlbi52YWx1ZSgpLnRvQXRvbVN0cmluZygpKTsKLQot ICAgICAgICAgICAgaWYgKHByZWx1ZGUucGVlaygpLnR5cGUoKSAhPSBEZWxpbWl0ZXJUb2tlbiB8 fCBwcmVsdWRlLnBlZWsoKS5kZWxpbWl0ZXIoKSAhPSAnLicpCi0gICAgICAgICAgICAgICAgYnJl YWs7Ci0gICAgICAgICAgICBwcmVsdWRlLmNvbnN1bWUoKTsKLSAgICAgICAgfQotCi0gICAgICAg IHByZWx1ZGUuY29uc3VtZVdoaXRlc3BhY2UoKTsKLSAgICAgICAgcmV0dXJuIG5hbWU7Ci0gICAg fTsKLQogICAgIGlmICghYmxvY2spIHsKICAgICAgICAgLy8gTGlzdCBzeW50YXguCiAgICAgICAg IFZlY3RvcjxDYXNjYWRlTGF5ZXJOYW1lPiBuYW1lTGlzdDsKICAgICAgICAgd2hpbGUgKHRydWUp IHsKLSAgICAgICAgICAgIGF1dG8gbmFtZSA9IGNvbnN1bWVOYW1lKCk7CisgICAgICAgICAgICBh dXRvIG5hbWUgPSBjb25zdW1lQ2FzY2FkZUxheWVyTmFtZShwcmVsdWRlLCBBbGxvd0Fub255bW91 czo6Tm8pOwogICAgICAgICAgICAgaWYgKCFuYW1lKQogICAgICAgICAgICAgICAgIHJldHVybiBu dWxscHRyOwogICAgICAgICAgICAgbmFtZUxpc3QuYXBwZW5kKCpuYW1lKTsKQEAgLTczNyw3ICs3 NjIsNyBAQCBSZWZQdHI8U3R5bGVSdWxlTGF5ZXI+IENTU1BhcnNlckltcGw6OmNvbnN1bWVMYXll clJ1bGUoQ1NTUGFyc2VyVG9rZW5SYW5nZSBwcmVsdQogICAgICAgICByZXR1cm4gU3R5bGVSdWxl TGF5ZXI6OmNyZWF0ZShXVEZNb3ZlKG5hbWVMaXN0KSk7CiAgICAgfQogCi0gICAgYXV0byBuYW1l ID0gY29uc3VtZU5hbWUoKTsKKyAgICBhdXRvIG5hbWUgPSBjb25zdW1lQ2FzY2FkZUxheWVyTmFt ZShwcmVsdWRlLCBBbGxvd0Fub255bW91czo6WWVzKTsKICAgICBpZiAoIW5hbWUpCiAgICAgICAg IHJldHVybiBudWxscHRyOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9SdWxl U2V0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1J1bGVTZXQuY3BwCmluZGV4IGNjYTM5ZGMx YjMzYy4uMTdhNzlkMjk1NTlkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9SdWxl U2V0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9SdWxlU2V0LmNwcApAQCAtMzc2LDkg KzM3NiwxNyBAQCB2b2lkIFJ1bGVTZXQ6OkJ1aWxkZXI6OmFkZFJ1bGVzRnJvbVNoZWV0KGNvbnN0 IFN0eWxlU2hlZXRDb250ZW50cyYgc2hlZXQpCiAgICAgZm9yIChhdXRvJiBydWxlIDogc2hlZXQu aW1wb3J0UnVsZXMoKSkgewogICAgICAgICBpZiAoIXJ1bGUtPnN0eWxlU2hlZXQoKSkKICAgICAg ICAgICAgIGNvbnRpbnVlOworICAgICAgICAKKyAgICAgICAgaWYgKG1lZGlhUXVlcnlDb2xsZWN0 b3IucHVzaEFuZEV2YWx1YXRlKHJ1bGUtPm1lZGlhUXVlcmllcygpKSkgeworICAgICAgICAgICAg YXV0byYgY2FzY2FkZUxheWVyTmFtZSA9IHJ1bGUtPmNhc2NhZGVMYXllck5hbWUoKTsKKyAgICAg ICAgICAgIGlmIChjYXNjYWRlTGF5ZXJOYW1lKQorICAgICAgICAgICAgICAgIHB1c2hDYXNjYWRl TGF5ZXIoKmNhc2NhZGVMYXllck5hbWUpOwogCi0gICAgICAgIGlmIChtZWRpYVF1ZXJ5Q29sbGVj dG9yLnB1c2hBbmRFdmFsdWF0ZShydWxlLT5tZWRpYVF1ZXJpZXMoKSkpCiAgICAgICAgICAgICBh ZGRSdWxlc0Zyb21TaGVldCgqcnVsZS0+c3R5bGVTaGVldCgpKTsKKworICAgICAgICAgICAgaWYg KGNhc2NhZGVMYXllck5hbWUpCisgICAgICAgICAgICAgICAgcG9wQ2FzY2FkZUxheWVyKCpjYXNj YWRlTGF5ZXJOYW1lKTsKKyAgICAgICAgfQogICAgICAgICBtZWRpYVF1ZXJ5Q29sbGVjdG9yLnBv cChydWxlLT5tZWRpYVF1ZXJpZXMoKSk7CiAgICAgfQogCg==