232799 2021-11-07 11:55:11 -0800 Pass MatchedProperties PropertyCascade setters 2021-11-07 13:30:19 -0800 1 1 1 Unclassified WebKit CSS WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 koivisto koivisto webkit-bug-importer zalan oldest_to_newest 1812498 0 koivisto 2021-11-07 11:55:11 -0800 Fewer arguments and more expandable. 1812499 1 443515 koivisto 2021-11-07 11:57:26 -0800 Created attachment 443515 Patch 1812510 2 ews-feeder 2021-11-07 13:29:18 -0800 Committed r285395 (243952@main): <https://commits.webkit.org/243952@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 443515. 1812511 3 webkit-bug-importer 2021-11-07 13:30:19 -0800 <rdar://problem/85128205> 443515 2021-11-07 11:57:26 -0800 2021-11-07 13:29:19 -0800 Patch bug-232799-20211107215725.patch text/plain 6719 koivisto U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1MzkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzU0MDY2YWQzM2FhZWU5 NDRjNmQ0MTY0ZTNhNjg3MjkyZWMyZTczMS4uMjkwZmI5MzkwYWViMjFhYjE3NmEyYjhkZGQzZTUw MDRjZGQ4NjBmNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTExLTA3ICBBbnR0 aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBQYXNzIE1hdGNoZWRQcm9w ZXJ0aWVzIFByb3BlcnR5Q2FzY2FkZSBzZXR0ZXJzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzI3OTkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBSZWR1Y2UgdGhlIG51bWJlciBvZiBhcmd1bWVudHMgYW5k IG1ha2UgaXQgZWFzaWVyIHRvIGV4cGFuZC4KKworICAgICAgICAqIHN0eWxlL1Byb3BlcnR5Q2Fz Y2FkZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6UHJvcGVydHlDYXNjYWRlOjpzZXRQ cm9wZXJ0eUludGVybmFsKToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlOjpQcm9wZXJ0eUNhc2Nh ZGU6OnNldCk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6UHJvcGVydHlDYXNjYWRlOjpzZXRE ZWZlcnJlZCk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6UHJvcGVydHlDYXNjYWRlOjphZGRN YXRjaCk6CisgICAgICAgICogc3R5bGUvUHJvcGVydHlDYXNjYWRlLmg6CisKIDIwMjEtMTEtMDcg IEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUuY29tPgogCiAgICAgICAgIFVzZSBuYXJyb3dl ciB0eXBlcyBmb3Igc3R5bGUgc2NvcGUgb3JkaW5hbCBhbmQgY2FzY2FkZSBsYXllciBwcmlvcml0 eQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3R5bGUvUHJvcGVydHlDYXNjYWRlLmNwcCBi L1NvdXJjZS9XZWJDb3JlL3N0eWxlL1Byb3BlcnR5Q2FzY2FkZS5jcHAKaW5kZXggZTI5M2JhNjkz YjA0NTRmNzBhMGM1ZjdkNmEwOTNiMGE2Y2UzMjZhNC4uNTA1MTUyN2M2M2MyMTcwNmJhZGVkM2I1 MmM5MDVlY2UxYTRjZjI1ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3R5bGUvUHJvcGVy dHlDYXNjYWRlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9Qcm9wZXJ0eUNhc2NhZGUu Y3BwCkBAIC0xMDcsMjEgKzEwNywyMSBAQCB2b2lkIFByb3BlcnR5Q2FzY2FkZTo6YnVpbGRDYXNj YWRlKE9wdGlvblNldDxDYXNjYWRlTGV2ZWw+IGNhc2NhZGVMZXZlbHMpCiAgICAgfQogfQogCi12 b2lkIFByb3BlcnR5Q2FzY2FkZTo6c2V0UHJvcGVydHlJbnRlcm5hbChQcm9wZXJ0eSYgcHJvcGVy dHksIENTU1Byb3BlcnR5SUQgaWQsIENTU1ZhbHVlJiBjc3NWYWx1ZSwgdW5zaWduZWQgbGlua01h dGNoVHlwZSwgQ2FzY2FkZUxldmVsIGNhc2NhZGVMZXZlbCwgU2NvcGVPcmRpbmFsIHN0eWxlU2Nv cGVPcmRpbmFsKQordm9pZCBQcm9wZXJ0eUNhc2NhZGU6OnNldFByb3BlcnR5SW50ZXJuYWwoUHJv cGVydHkmIHByb3BlcnR5LCBDU1NQcm9wZXJ0eUlEIGlkLCBDU1NWYWx1ZSYgY3NzVmFsdWUsIGNv bnN0IE1hdGNoZWRQcm9wZXJ0aWVzJiBtYXRjaGVkUHJvcGVydGllcywgQ2FzY2FkZUxldmVsIGNh c2NhZGVMZXZlbCkKIHsKLSAgICBBU1NFUlQobGlua01hdGNoVHlwZSA8PSBTZWxlY3RvckNoZWNr ZXI6Ok1hdGNoQWxsKTsKKyAgICBBU1NFUlQobWF0Y2hlZFByb3BlcnRpZXMubGlua01hdGNoVHlw ZSA8PSBTZWxlY3RvckNoZWNrZXI6Ok1hdGNoQWxsKTsKICAgICBwcm9wZXJ0eS5pZCA9IGlkOwog ICAgIHByb3BlcnR5LmxldmVsID0gY2FzY2FkZUxldmVsOwotICAgIHByb3BlcnR5LnN0eWxlU2Nv cGVPcmRpbmFsID0gc3R5bGVTY29wZU9yZGluYWw7Ci0gICAgaWYgKGxpbmtNYXRjaFR5cGUgPT0g U2VsZWN0b3JDaGVja2VyOjpNYXRjaEFsbCkgeworICAgIHByb3BlcnR5LnN0eWxlU2NvcGVPcmRp bmFsID0gbWF0Y2hlZFByb3BlcnRpZXMuc3R5bGVTY29wZU9yZGluYWw7CisgICAgaWYgKG1hdGNo ZWRQcm9wZXJ0aWVzLmxpbmtNYXRjaFR5cGUgPT0gU2VsZWN0b3JDaGVja2VyOjpNYXRjaEFsbCkg ewogICAgICAgICBwcm9wZXJ0eS5jc3NWYWx1ZVswXSA9ICZjc3NWYWx1ZTsKICAgICAgICAgcHJv cGVydHkuY3NzVmFsdWVbU2VsZWN0b3JDaGVja2VyOjpNYXRjaExpbmtdID0gJmNzc1ZhbHVlOwog ICAgICAgICBwcm9wZXJ0eS5jc3NWYWx1ZVtTZWxlY3RvckNoZWNrZXI6Ok1hdGNoVmlzaXRlZF0g PSAmY3NzVmFsdWU7CiAgICAgfSBlbHNlCi0gICAgICAgIHByb3BlcnR5LmNzc1ZhbHVlW2xpbmtN YXRjaFR5cGVdID0gJmNzc1ZhbHVlOworICAgICAgICBwcm9wZXJ0eS5jc3NWYWx1ZVttYXRjaGVk UHJvcGVydGllcy5saW5rTWF0Y2hUeXBlXSA9ICZjc3NWYWx1ZTsKIH0KIAotdm9pZCBQcm9wZXJ0 eUNhc2NhZGU6OnNldChDU1NQcm9wZXJ0eUlEIGlkLCBDU1NWYWx1ZSYgY3NzVmFsdWUsIHVuc2ln bmVkIGxpbmtNYXRjaFR5cGUsIENhc2NhZGVMZXZlbCBjYXNjYWRlTGV2ZWwsIFNjb3BlT3JkaW5h bCBzdHlsZVNjb3BlT3JkaW5hbCkKK3ZvaWQgUHJvcGVydHlDYXNjYWRlOjpzZXQoQ1NTUHJvcGVy dHlJRCBpZCwgQ1NTVmFsdWUmIGNzc1ZhbHVlLCBjb25zdCBNYXRjaGVkUHJvcGVydGllcyYgbWF0 Y2hlZFByb3BlcnRpZXMsIENhc2NhZGVMZXZlbCBjYXNjYWRlTGV2ZWwpCiB7CiAgICAgaWYgKENT U1Byb3BlcnR5Ojppc0RpcmVjdGlvbkF3YXJlUHJvcGVydHkoaWQpKSB7CiAgICAgICAgIGF1dG8g ZGlyZWN0aW9uID0gdGhpcy0+ZGlyZWN0aW9uKCk7CkBAIC0xNDAsMTEgKzE0MCwxMSBAQCB2b2lk IFByb3BlcnR5Q2FzY2FkZTo6c2V0KENTU1Byb3BlcnR5SUQgaWQsIENTU1ZhbHVlJiBjc3NWYWx1 ZSwgdW5zaWduZWQgbGlua01hdAogICAgICAgICAgICAgUHJvcGVydHkgcHJvcGVydHk7CiAgICAg ICAgICAgICBwcm9wZXJ0eS5pZCA9IGlkOwogICAgICAgICAgICAgbWVtc2V0KHByb3BlcnR5LmNz c1ZhbHVlLCAwLCBzaXplb2YocHJvcGVydHkuY3NzVmFsdWUpKTsKLSAgICAgICAgICAgIHNldFBy b3BlcnR5SW50ZXJuYWwocHJvcGVydHksIGlkLCBjc3NWYWx1ZSwgbGlua01hdGNoVHlwZSwgY2Fz Y2FkZUxldmVsLCBzdHlsZVNjb3BlT3JkaW5hbCk7CisgICAgICAgICAgICBzZXRQcm9wZXJ0eUlu dGVybmFsKHByb3BlcnR5LCBpZCwgY3NzVmFsdWUsIG1hdGNoZWRQcm9wZXJ0aWVzLCBjYXNjYWRl TGV2ZWwpOwogICAgICAgICAgICAgbV9jdXN0b21Qcm9wZXJ0aWVzLnNldChjdXN0b21WYWx1ZS5u YW1lKCksIHByb3BlcnR5KTsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIFByb3BlcnR5 IHByb3BlcnR5ID0gY3VzdG9tUHJvcGVydHkoY3VzdG9tVmFsdWUubmFtZSgpKTsKLSAgICAgICAg ICAgIHNldFByb3BlcnR5SW50ZXJuYWwocHJvcGVydHksIGlkLCBjc3NWYWx1ZSwgbGlua01hdGNo VHlwZSwgY2FzY2FkZUxldmVsLCBzdHlsZVNjb3BlT3JkaW5hbCk7CisgICAgICAgICAgICBzZXRQ cm9wZXJ0eUludGVybmFsKHByb3BlcnR5LCBpZCwgY3NzVmFsdWUsIG1hdGNoZWRQcm9wZXJ0aWVz LCBjYXNjYWRlTGV2ZWwpOwogICAgICAgICAgICAgbV9jdXN0b21Qcm9wZXJ0aWVzLnNldChjdXN0 b21WYWx1ZS5uYW1lKCksIHByb3BlcnR5KTsKICAgICAgICAgfQogICAgICAgICByZXR1cm47CkBA IC0xNTMsMTcgKzE1MywxNyBAQCB2b2lkIFByb3BlcnR5Q2FzY2FkZTo6c2V0KENTU1Byb3BlcnR5 SUQgaWQsIENTU1ZhbHVlJiBjc3NWYWx1ZSwgdW5zaWduZWQgbGlua01hdAogICAgIGlmICghbV9w cm9wZXJ0eUlzUHJlc2VudFtpZF0pCiAgICAgICAgIG1lbXNldChwcm9wZXJ0eS5jc3NWYWx1ZSwg MCwgc2l6ZW9mKHByb3BlcnR5LmNzc1ZhbHVlKSk7CiAgICAgbV9wcm9wZXJ0eUlzUHJlc2VudC5z ZXQoaWQpOwotICAgIHNldFByb3BlcnR5SW50ZXJuYWwocHJvcGVydHksIGlkLCBjc3NWYWx1ZSwg bGlua01hdGNoVHlwZSwgY2FzY2FkZUxldmVsLCBzdHlsZVNjb3BlT3JkaW5hbCk7CisgICAgc2V0 UHJvcGVydHlJbnRlcm5hbChwcm9wZXJ0eSwgaWQsIGNzc1ZhbHVlLCBtYXRjaGVkUHJvcGVydGll cywgY2FzY2FkZUxldmVsKTsKIH0KIAotdm9pZCBQcm9wZXJ0eUNhc2NhZGU6OnNldERlZmVycmVk KENTU1Byb3BlcnR5SUQgaWQsIENTU1ZhbHVlJiBjc3NWYWx1ZSwgdW5zaWduZWQgbGlua01hdGNo VHlwZSwgQ2FzY2FkZUxldmVsIGNhc2NhZGVMZXZlbCwgU2NvcGVPcmRpbmFsIHN0eWxlU2NvcGVP cmRpbmFsKQordm9pZCBQcm9wZXJ0eUNhc2NhZGU6OnNldERlZmVycmVkKENTU1Byb3BlcnR5SUQg aWQsIENTU1ZhbHVlJiBjc3NWYWx1ZSwgY29uc3QgTWF0Y2hlZFByb3BlcnRpZXMmIG1hdGNoZWRQ cm9wZXJ0aWVzLCBDYXNjYWRlTGV2ZWwgY2FzY2FkZUxldmVsKQogewogICAgIEFTU0VSVCghQ1NT UHJvcGVydHk6OmlzRGlyZWN0aW9uQXdhcmVQcm9wZXJ0eShpZCkpOwogICAgIEFTU0VSVChzaG91 bGRBcHBseVByb3BlcnR5SW5QYXJzZU9yZGVyKGlkKSk7CiAKICAgICBQcm9wZXJ0eSBwcm9wZXJ0 eTsKICAgICBtZW1zZXQocHJvcGVydHkuY3NzVmFsdWUsIDAsIHNpemVvZihwcm9wZXJ0eS5jc3NW YWx1ZSkpOwotICAgIHNldFByb3BlcnR5SW50ZXJuYWwocHJvcGVydHksIGlkLCBjc3NWYWx1ZSwg bGlua01hdGNoVHlwZSwgY2FzY2FkZUxldmVsLCBzdHlsZVNjb3BlT3JkaW5hbCk7CisgICAgc2V0 UHJvcGVydHlJbnRlcm5hbChwcm9wZXJ0eSwgaWQsIGNzc1ZhbHVlLCBtYXRjaGVkUHJvcGVydGll cywgY2FzY2FkZUxldmVsKTsKICAgICBtX2RlZmVycmVkUHJvcGVydGllcy5hcHBlbmQocHJvcGVy dHkpOwogfQogCkBAIC0xOTgsOSArMTk4LDkgQEAgYm9vbCBQcm9wZXJ0eUNhc2NhZGU6OmFkZE1h dGNoKGNvbnN0IE1hdGNoZWRQcm9wZXJ0aWVzJiBtYXRjaGVkUHJvcGVydGllcywgQ2FzY2EKICAg ICAgICAgICAgIGNvbnRpbnVlOwogCiAgICAgICAgIGlmIChzaG91bGRBcHBseVByb3BlcnR5SW5Q YXJzZU9yZGVyKHByb3BlcnR5SUQpKQotICAgICAgICAgICAgc2V0RGVmZXJyZWQocHJvcGVydHlJ RCwgKmN1cnJlbnQudmFsdWUoKSwgbWF0Y2hlZFByb3BlcnRpZXMubGlua01hdGNoVHlwZSwgY2Fz Y2FkZUxldmVsLCBtYXRjaGVkUHJvcGVydGllcy5zdHlsZVNjb3BlT3JkaW5hbCk7CisgICAgICAg ICAgICBzZXREZWZlcnJlZChwcm9wZXJ0eUlELCAqY3VycmVudC52YWx1ZSgpLCBtYXRjaGVkUHJv cGVydGllcywgY2FzY2FkZUxldmVsKTsKICAgICAgICAgZWxzZQotICAgICAgICAgICAgc2V0KHBy b3BlcnR5SUQsICpjdXJyZW50LnZhbHVlKCksIG1hdGNoZWRQcm9wZXJ0aWVzLmxpbmtNYXRjaFR5 cGUsIGNhc2NhZGVMZXZlbCwgbWF0Y2hlZFByb3BlcnRpZXMuc3R5bGVTY29wZU9yZGluYWwpOwor ICAgICAgICAgICAgc2V0KHByb3BlcnR5SUQsICpjdXJyZW50LnZhbHVlKCksIG1hdGNoZWRQcm9w ZXJ0aWVzLCBjYXNjYWRlTGV2ZWwpOwogICAgIH0KIAogICAgIHJldHVybiBoYXNJbXBvcnRhbnRQ cm9wZXJ0aWVzOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3R5bGUvUHJvcGVydHlDYXNj YWRlLmggYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9Qcm9wZXJ0eUNhc2NhZGUuaAppbmRleCBlZWFk MDBlYWYyNDc3MzllMmQzODY5MDE5YjdlYjEwNDI4N2Y3YzQ1Li4zZmExZjhiZDQyMzJmMjJjNWQy YTQ3ZmYyMmVkMjcwZGY4YmM1MDYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9Q cm9wZXJ0eUNhc2NhZGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9Qcm9wZXJ0eUNhc2Nh ZGUuaApAQCAtNzcsOSArNzcsOSBAQCBwcml2YXRlOgogICAgIHZvaWQgYWRkSW1wb3J0YW50TWF0 Y2hlcyhDYXNjYWRlTGV2ZWwpOwogICAgIGJvb2wgYWRkTWF0Y2goY29uc3QgTWF0Y2hlZFByb3Bl cnRpZXMmLCBDYXNjYWRlTGV2ZWwsIGJvb2wgaW1wb3J0YW50KTsKIAotICAgIHZvaWQgc2V0KENT U1Byb3BlcnR5SUQsIENTU1ZhbHVlJiwgdW5zaWduZWQgbGlua01hdGNoVHlwZSwgQ2FzY2FkZUxl dmVsLCBTY29wZU9yZGluYWwpOwotICAgIHZvaWQgc2V0RGVmZXJyZWQoQ1NTUHJvcGVydHlJRCwg Q1NTVmFsdWUmLCB1bnNpZ25lZCBsaW5rTWF0Y2hUeXBlLCBDYXNjYWRlTGV2ZWwsIFNjb3BlT3Jk aW5hbCk7Ci0gICAgc3RhdGljIHZvaWQgc2V0UHJvcGVydHlJbnRlcm5hbChQcm9wZXJ0eSYsIENT U1Byb3BlcnR5SUQsIENTU1ZhbHVlJiwgdW5zaWduZWQgbGlua01hdGNoVHlwZSwgQ2FzY2FkZUxl dmVsLCBTY29wZU9yZGluYWwpOworICAgIHZvaWQgc2V0KENTU1Byb3BlcnR5SUQsIENTU1ZhbHVl JiwgY29uc3QgTWF0Y2hlZFByb3BlcnRpZXMmLCBDYXNjYWRlTGV2ZWwpOworICAgIHZvaWQgc2V0 RGVmZXJyZWQoQ1NTUHJvcGVydHlJRCwgQ1NTVmFsdWUmLCBjb25zdCBNYXRjaGVkUHJvcGVydGll cyYsIENhc2NhZGVMZXZlbCk7CisgICAgc3RhdGljIHZvaWQgc2V0UHJvcGVydHlJbnRlcm5hbChQ cm9wZXJ0eSYsIENTU1Byb3BlcnR5SUQsIENTU1ZhbHVlJiwgY29uc3QgTWF0Y2hlZFByb3BlcnRp ZXMmLCBDYXNjYWRlTGV2ZWwpOwogCiAgICAgRGlyZWN0aW9uIHJlc29sdmVEaXJlY3Rpb25BbmRX cml0aW5nTW9kZShEaXJlY3Rpb24gaW5oZXJpdGVkRGlyZWN0aW9uKSBjb25zdDsKIAo=