222871 2021-03-06 14:13:52 -0800 [perf dashboard] Modernize DataModelObject and LabeledObject 2021-03-06 16:28:14 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 rniwa rniwa dewei_zhu saam webkit-bug-importer ysuzuki zhifei_fang oldest_to_newest 1736844 0 rniwa 2021-03-06 14:13:52 -0800 Use more modern JS in DataModelObject and LabeledObject classes. 1736846 1 422508 rniwa 2021-03-06 14:21:08 -0800 Created attachment 422508 Patch 1736854 2 dewei_zhu 2021-03-06 15:50:44 -0800 r=me 1736860 3 rniwa 2021-03-06 16:27:57 -0800 Committed r274044 (234980@main): <https://commits.webkit.org/234980@main> 1736861 4 webkit-bug-importer 2021-03-06 16:28:14 -0800 <rdar://problem/75137860> 422508 2021-03-06 14:21:08 -0800 2021-03-06 15:50:28 -0800 Patch bug-222871-20210306142107.patch text/plain 5474 rniwa U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0MDMxCmRpZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJmLndl YmtpdC5vcmcvQ2hhbmdlTG9nIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwpp bmRleCA4NDZkNmIxM2Q1MDYzMzYxOGJiNjI0OTE0ZTdkMTFjOTllY2UxMGU0Li45ZmJmM2VjMWM5 ODAyZTY3MGRmNTFkMGY0MzQ5YjhkMTUxMTM2MzZjIDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJm LndlYmtpdC5vcmcvQ2hhbmdlTG9nCisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyOCBAQAorMjAyMS0wMy0wNiAgUnlvc3VrZSBOaXdhICA8cm5pd2FA d2Via2l0Lm9yZz4KKworICAgICAgICBbcGVyZiBkYXNoYm9hcmRdIE1vZGVybml6ZSBEYXRhTW9k ZWxPYmplY3QgYW5kIExhYmVsZWRPYmplY3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIyMjg3MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFVzZSBjb25zdC9sZXQgaW5zdGVhZCBvZiB2YXIsIGFzeW5jL2F3 YWl0IGluc3RlYWQgb2YgUHJvbWlzZS50aGVuLCBhbmQgTWFwIGluc3RlYWQKKyAgICAgICAgb2Yg YSByZWd1bGFyIG9iamVjdCBmb3IgYSBkaWN0aW9uYXJ5LgorCisgICAgICAgIEFsc28gZGVmaW5l IGluc3RhbmNlIGZpZWxkcyBpbiB0aGUgY2xhc3MgZGVjbGFyYXRpb24gaW5zdGVhZCBvZiBzaW1w bHkgYWRkaW5nIHRoZW0KKyAgICAgICAgaW4gdGhlIGNsYXNzIGNvbnN0cnVjdG9ycywgYW5kIHNl dCB0aGUgZGVmYXVsdCBwYXJhbWV0ZXIgdmFsdWVzIGluc3RlYWQgb2YgcmVseWluZworICAgICAg ICBvbiB0aGUgdW5zcGVjaWZpZWQgYXJndW1lbnQgYmVpbmcgdW5kZWZpbmVkLgorCisgICAgICAg ICogcHVibGljL3YzL21vZGVscy9kYXRhLW1vZGVsLmpzOgorICAgICAgICAoRGF0YU1vZGVsT2Jq ZWN0LmVuc3VyZVNpbmdsZXRvbik6CisgICAgICAgIChEYXRhTW9kZWxPYmplY3QubmFtZWRTdGF0 aWNNYXApOgorICAgICAgICAoRGF0YU1vZGVsT2JqZWN0LmVuc3VyZU5hbWVkU3RhdGljTWFwKToK KyAgICAgICAgKERhdGFNb2RlbE9iamVjdC5maW5kQnlJZCk6CisgICAgICAgIChEYXRhTW9kZWxP YmplY3QubGlzdEZvclN0YXRpY01hcCk6CisgICAgICAgIChEYXRhTW9kZWxPYmplY3QuYXN5bmMg Y2FjaGVkRmV0Y2gpOgorICAgICAgICAoRGF0YU1vZGVsT2JqZWN0KToKKyAgICAgICAgKExhYmVs ZWRPYmplY3Quc29ydEJ5TmFtZSk6CisgICAgICAgIChEYXRhTW9kZWxPYmplY3QuY2FjaGVkRmV0 Y2gpOiBEZWxldGVkLgorCiAyMDIxLTAzLTA2ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQu b3JnPgogCiAgICAgICAgIFtwZXJmIGRhc2hib2FyZF0gTW9kZXJuaXplIE1lYXN1cmVtZW50U2V0 CmRpZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGljL3YzL21vZGVscy9k YXRhLW1vZGVsLmpzIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy92My9tb2RlbHMv ZGF0YS1tb2RlbC5qcwppbmRleCBmMTg5Mjk4YTQ3YjQ1OGRjYWI3YjdiYTlmMzU1ZmViOWY0ZWM4 MGNhLi44NDUzNWYwYzIwNzI4MWM3NmQ2MmYzMDU4MjRhMTFmNmNkNGQzMDQ2IDEwMDY0NAotLS0g YS9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGljL3YzL21vZGVscy9kYXRhLW1vZGVsLmpz CisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvdjMvbW9kZWxzL2RhdGEtbW9k ZWwuanMKQEAgLTEsNiArMSw4IEBACiAndXNlIHN0cmljdCc7CiAKIGNsYXNzIERhdGFNb2RlbE9i amVjdCB7CisgICAgX2lkOworCiAgICAgY29uc3RydWN0b3IoaWQpCiAgICAgewogICAgICAgICB0 aGlzLl9pZCA9IGlkOwpAQCAtMTAsNyArMTIsNyBAQCBjbGFzcyBEYXRhTW9kZWxPYmplY3Qgewog CiAgICAgc3RhdGljIGVuc3VyZVNpbmdsZXRvbihpZCwgb2JqZWN0KQogICAgIHsKLSAgICAgICAg dmFyIHNpbmdsZXRvbiA9IHRoaXMuZmluZEJ5SWQoaWQpOworICAgICAgICBjb25zdCBzaW5nbGV0 b24gPSB0aGlzLmZpbmRCeUlkKGlkKTsKICAgICAgICAgaWYgKHNpbmdsZXRvbikgewogICAgICAg ICAgICAgc2luZ2xldG9uLnVwZGF0ZVNpbmdsZXRvbihvYmplY3QpCiAgICAgICAgICAgICByZXR1 cm4gc2luZ2xldG9uOwpAQCAtMjQsMTggKzI2LDIxIEBAIGNsYXNzIERhdGFNb2RlbE9iamVjdCB7 CiAKICAgICBzdGF0aWMgbmFtZWRTdGF0aWNNYXAobmFtZSkKICAgICB7Ci0gICAgICAgIHZhciBz dGF0aWNNYXAgPSB0aGlzW0RhdGFNb2RlbE9iamVjdC5TdGF0aWNNYXBTeW1ib2xdOwotICAgICAg ICByZXR1cm4gc3RhdGljTWFwID8gc3RhdGljTWFwW25hbWVdIDogbnVsbDsKKyAgICAgICAgY29u c3Qgc3RhdGljTWFwID0gdGhpc1tEYXRhTW9kZWxPYmplY3QuU3RhdGljTWFwU3ltYm9sXTsKKyAg ICAgICAgcmV0dXJuIHN0YXRpY01hcCA/IHN0YXRpY01hcC5nZXQobmFtZSkgOiBudWxsOwogICAg IH0KIAogICAgIHN0YXRpYyBlbnN1cmVOYW1lZFN0YXRpY01hcChuYW1lKQogICAgIHsKICAgICAg ICAgaWYgKCF0aGlzW0RhdGFNb2RlbE9iamVjdC5TdGF0aWNNYXBTeW1ib2xdKQotICAgICAgICAg ICAgdGhpc1tEYXRhTW9kZWxPYmplY3QuU3RhdGljTWFwU3ltYm9sXSA9IHt9OwotICAgICAgICB2 YXIgc3RhdGljTWFwID0gdGhpc1tEYXRhTW9kZWxPYmplY3QuU3RhdGljTWFwU3ltYm9sXTsKLSAg ICAgICAgaWYgKCFzdGF0aWNNYXBbbmFtZV0pCi0gICAgICAgICAgICBzdGF0aWNNYXBbbmFtZV0g PSB7fTsKLSAgICAgICAgcmV0dXJuIHN0YXRpY01hcFtuYW1lXTsKKyAgICAgICAgICAgIHRoaXNb RGF0YU1vZGVsT2JqZWN0LlN0YXRpY01hcFN5bWJvbF0gPSBuZXcgTWFwOworICAgICAgICBjb25z dCBzdGF0aWNNYXAgPSB0aGlzW0RhdGFNb2RlbE9iamVjdC5TdGF0aWNNYXBTeW1ib2xdOworICAg ICAgICBsZXQgbmFtZWRNYXAgPSBzdGF0aWNNYXAuZ2V0KG5hbWUpOworICAgICAgICBpZiAoIW5h bWVkTWFwKSB7CisgICAgICAgICAgICBuYW1lZE1hcCA9IHsgfTsgLy8gVXNlIGEgcmVndWxhciBv YmplY3QgdG8gaW1wbGljaXRseSBjb252ZXJ0IGVhY2gga2V5IHRvIGEgc3RyaW5nLgorICAgICAg ICAgICAgc3RhdGljTWFwLnNldChuYW1lLCBuYW1lZE1hcCk7CisgICAgICAgIH0KKyAgICAgICAg cmV0dXJuIG5hbWVkTWFwOwogICAgIH0KIAogICAgIG5hbWVkU3RhdGljTWFwKG5hbWUpIHsgcmV0 dXJuIHRoaXMuX19wcm90b19fLmNvbnN0cnVjdG9yLm5hbWVkU3RhdGljTWFwKG5hbWUpOyB9CkBA IC00MywxNiArNDgsMTYgQEAgY2xhc3MgRGF0YU1vZGVsT2JqZWN0IHsKIAogICAgIHN0YXRpYyBm aW5kQnlJZChpZCkKICAgICB7Ci0gICAgICAgIHZhciBpZE1hcCA9IHRoaXMubmFtZWRTdGF0aWNN YXAoJ2lkJyk7CisgICAgICAgIGNvbnN0IGlkTWFwID0gdGhpcy5uYW1lZFN0YXRpY01hcCgnaWQn KTsKICAgICAgICAgcmV0dXJuIGlkTWFwID8gaWRNYXBbaWRdIDogbnVsbDsKICAgICB9CiAKICAg ICBzdGF0aWMgbGlzdEZvclN0YXRpY01hcChuYW1lKQogICAgIHsKLSAgICAgICAgdmFyIGxpc3Qg PSBbXTsKLSAgICAgICAgdmFyIGlkTWFwID0gdGhpcy5uYW1lZFN0YXRpY01hcChuYW1lKTsKKyAg ICAgICAgY29uc3QgbGlzdCA9IFtdOworICAgICAgICBjb25zdCBpZE1hcCA9IHRoaXMubmFtZWRT dGF0aWNNYXAobmFtZSk7CiAgICAgICAgIGlmIChpZE1hcCkgewotICAgICAgICAgICAgZm9yICh2 YXIgaWQgaW4gaWRNYXApCisgICAgICAgICAgICBmb3IgKGNvbnN0IGlkIGluIGlkTWFwKQogICAg ICAgICAgICAgICAgIGxpc3QucHVzaChpZE1hcFtpZF0pOwogICAgICAgICB9CiAgICAgICAgIHJl dHVybiBsaXN0OwpAQCAtNjAsNyArNjUsNyBAQCBjbGFzcyBEYXRhTW9kZWxPYmplY3QgewogCiAg ICAgc3RhdGljIGFsbCgpIHsgcmV0dXJuIHRoaXMubGlzdEZvclN0YXRpY01hcCgnaWQnKTsgfQog Ci0gICAgc3RhdGljIGNhY2hlZEZldGNoKHBhdGgsIHBhcmFtcywgbm9DYWNoZSkKKyAgICBzdGF0 aWMgYXN5bmMgY2FjaGVkRmV0Y2gocGF0aCwgcGFyYW1zID0geyB9LCBub0NhY2hlID0gZmFsc2Up CiAgICAgewogICAgICAgICBjb25zdCBxdWVyeSA9IFtdOwogICAgICAgICBpZiAocGFyYW1zKSB7 CkBAIC03MywxMyArNzgsMTUgQEAgY2xhc3MgRGF0YU1vZGVsT2JqZWN0IHsKICAgICAgICAgaWYg KG5vQ2FjaGUpCiAgICAgICAgICAgICByZXR1cm4gUmVtb3RlQVBJLmdldEpTT05XaXRoU3RhdHVz KHBhdGgpOwogCi0gICAgICAgIHZhciBjYWNoZU1hcCA9IHRoaXMuZW5zdXJlTmFtZWRTdGF0aWNN YXAoRGF0YU1vZGVsT2JqZWN0LkNhY2hlTWFwU3ltYm9sKTsKLSAgICAgICAgaWYgKCFjYWNoZU1h cFtwYXRoXSkKLSAgICAgICAgICAgIGNhY2hlTWFwW3BhdGhdID0gUmVtb3RlQVBJLmdldEpTT05X aXRoU3RhdHVzKHBhdGgpOworICAgICAgICBjb25zdCBjYWNoZU1hcCA9IHRoaXMuZW5zdXJlTmFt ZWRTdGF0aWNNYXAoRGF0YU1vZGVsT2JqZWN0LkNhY2hlTWFwU3ltYm9sKTsKKyAgICAgICAgbGV0 IHByb21pc2UgPSBjYWNoZU1hcFtwYXRoXTsKKyAgICAgICAgaWYgKCFwcm9taXNlKSB7CisgICAg ICAgICAgICBwcm9taXNlID0gUmVtb3RlQVBJLmdldEpTT05XaXRoU3RhdHVzKHBhdGgpOworICAg ICAgICAgICAgY2FjaGVNYXBbcGF0aF0gPSBwcm9taXNlOworICAgICAgICB9CiAKLSAgICAgICAg cmV0dXJuIGNhY2hlTWFwW3BhdGhdLnRoZW4oKGNvbnRlbnQpID0+IHsKLSAgICAgICAgICAgIHJl dHVybiBKU09OLnBhcnNlKEpTT04uc3RyaW5naWZ5KGNvbnRlbnQpKTsKLSAgICAgICAgfSk7Cisg ICAgICAgIGNvbnN0IGNvbnRlbnQgPSBhd2FpdCBjYWNoZU1hcFtwYXRoXTsKKyAgICAgICAgcmV0 dXJuIEpTT04ucGFyc2UoSlNPTi5zdHJpbmdpZnkoY29udGVudCkpOwogICAgIH0KIAogfQpAQCAt ODcsNiArOTQsOCBAQCBEYXRhTW9kZWxPYmplY3QuU3RhdGljTWFwU3ltYm9sID0gU3ltYm9sKCk7 CiBEYXRhTW9kZWxPYmplY3QuQ2FjaGVNYXBTeW1ib2wgPSBTeW1ib2woKTsKIAogY2xhc3MgTGFi ZWxlZE9iamVjdCBleHRlbmRzIERhdGFNb2RlbE9iamVjdCB7CisgICAgX25hbWU7CisKICAgICBj b25zdHJ1Y3RvcihpZCwgb2JqZWN0KQogICAgIHsKICAgICAgICAgc3VwZXIoaWQpOwpAQCAtOTcs NyArMTA2LDcgQEAgY2xhc3MgTGFiZWxlZE9iamVjdCBleHRlbmRzIERhdGFNb2RlbE9iamVjdCB7 CiAKICAgICBzdGF0aWMgc29ydEJ5TmFtZShsaXN0KQogICAgIHsKLSAgICAgICAgcmV0dXJuIGxp c3Quc29ydChmdW5jdGlvbiAoYSwgYikgeworICAgICAgICByZXR1cm4gbGlzdC5zb3J0KChhLCBi KSA9PiB7CiAgICAgICAgICAgICBpZiAoYS5uYW1lKCkgPCBiLm5hbWUoKSkKICAgICAgICAgICAg ICAgICByZXR1cm4gLTE7CiAgICAgICAgICAgICBlbHNlIGlmIChhLm5hbWUoKSA+IGIubmFtZSgp KQo=