201989 2019-09-19 09:53:11 -0700 Refactoring: fix broken indentation in JSNonDestructibleProxy.h. 2019-09-19 12:03:20 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 mark.lam mark.lam commit-queue ews-watchlist keith_miller msaboff saam tzagallo webkit-bug-importer oldest_to_newest 1572388 0 mark.lam 2019-09-19 09:53:11 -0700 ... 1572389 1 379139 mark.lam 2019-09-19 09:56:26 -0700 Created attachment 379139 proposed patch. 1572400 2 379139 saam 2019-09-19 10:13:54 -0700 Comment on attachment 379139 proposed patch. I thought we tried to avoid changes like this, even when the prior code didn't conform to WK style? 1572407 3 mark.lam 2019-09-19 10:37:41 -0700 We do do these kinds of refactoring as a separate patch. For example, see: 2014: https://trac.webkit.org/r173269 many files https://trac.webkit.org/r171606 PropertyNameArray.h https://trac.webkit.org/r166278 Heap.h 2013: https://trac.webkit.org/r143171 JSGlobalObject.h and JSGlobalObjectFunctions.h 1572414 4 379139 mark.lam 2019-09-19 10:59:31 -0700 Comment on attachment 379139 proposed patch. Thanks for the review. 1572424 5 379139 commit-queue 2019-09-19 12:02:12 -0700 Comment on attachment 379139 proposed patch. Clearing flags on attachment: 379139 Committed r250099: <https://trac.webkit.org/changeset/250099> 1572425 6 commit-queue 2019-09-19 12:02:13 -0700 All reviewed patches have been landed. Closing bug. 1572426 7 webkit-bug-importer 2019-09-19 12:03:20 -0700 <rdar://problem/55528429> 379139 2019-09-19 09:56:26 -0700 2019-09-19 12:02:12 -0700 proposed patch. bug-201989.patch text/plain 6813 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjUwMDk0KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBA CisyMDE5LTA5LTE5ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBS ZWZhY3RvcmluZzogZml4IGJyb2tlbiBpbmRlbnRhdGlvbiBpbiBKU05vbkRlc3RydWN0aWJsZVBy b3h5LmguCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MDE5ODkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBU aGlzIHBhdGNoIG9ubHkgdW5pbmRlbnQgdGhlIGNvZGUgdG8gZ2V0IGl0IGJhY2sgdG8gY29tcGxp YW50IGZvcm1hdHRpbmcuCisgICAgICAgIFRoZXJlIGlzIG5vIGFjdHVhbCBjb2RlIGNoYW5nZS4K KworICAgICAgICAqIHJ1bnRpbWUvSlNOb25EZXN0cnVjdGlibGVQcm94eS5oOgorICAgICAgICAo SlNDOjpKU05vbkRlc3RydWN0aWJsZVByb3h5OjpzdWJzcGFjZUZvcik6CisgICAgICAgIChKU0M6 OkpTTm9uRGVzdHJ1Y3RpYmxlUHJveHk6OmNyZWF0ZSk6CisgICAgICAgIChKU0M6OkpTTm9uRGVz dHJ1Y3RpYmxlUHJveHk6OmNyZWF0ZVN0cnVjdHVyZSk6CisgICAgICAgIChKU0M6OkpTTm9uRGVz dHJ1Y3RpYmxlUHJveHk6OkpTTm9uRGVzdHJ1Y3RpYmxlUHJveHkpOgorCiAyMDE5LTA5LTE5ICBN YXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXBsYWNlIEpTVmFsdWUg I2RlZmluZXMgd2l0aCBzdGF0aWMgY29uc3RleHByIHZhbHVlcy4KSW5kZXg6IFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9ydW50aW1lL0pTTm9uRGVzdHJ1Y3RpYmxlUHJveHkuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU05vbkRlc3RydWN0aWJsZVByb3h5LmgJ KHJldmlzaW9uIDI1MDA5NCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTTm9u RGVzdHJ1Y3RpYmxlUHJveHkuaAkod29ya2luZyBjb3B5KQpAQCAtMjksNTMgKzI5LDUzIEBACiAK IG5hbWVzcGFjZSBKU0MgewogCi0gICAgY2xhc3MgSlNOb25EZXN0cnVjdGlibGVQcm94eSA6IHB1 YmxpYyBKU1Byb3h5IHsKLSAgICAgICAgcHVibGljOgotICAgICAgICAgICAgdXNpbmcgQmFzZSA9 IEpTUHJveHk7Ci0gICAgICAgICAgICBzdGF0aWMgY29uc3RleHByIHVuc2lnbmVkIFN0cnVjdHVy ZUZsYWdzID0gQmFzZTo6U3RydWN0dXJlRmxhZ3M7Ci0gICAgICAgICAgICBzdGF0aWMgY29uc3Rl eHByIGJvb2wgbmVlZHNEZXN0cnVjdGlvbiA9IGZhbHNlOwotCi0gICAgICAgICAgICB0ZW1wbGF0 ZTx0eXBlbmFtZSBDZWxsVHlwZSwgU3Vic3BhY2VBY2Nlc3MgbW9kZT4KLSAgICAgICAgICAgICAg ICBzdGF0aWMgQ29tcGxldGVTdWJzcGFjZSogc3Vic3BhY2VGb3IoVk0mIHZtKQotICAgICAgICAg ICAgICAgIHsKLSAgICAgICAgICAgICAgICAgICAgLy8gSlNQcm94eSBpcyBKU0Rlc3RydWNpdGJs ZU9iamVjdCwgYnV0IHdlIG1ha2UgdGhpcyBKU05vbkRlc3RydWN0aWJsZVByb3h5IG5vbi1kZXN0 cnVjdGlibGUgYnkgdXNpbmcgbm9uLWRlc3RydWN0aWJsZSBzdWJzcGFjZS4KLSAgICAgICAgICAg ICAgICAgICAgLy8gVGhlIG1vdGl2YXRpb24gYmVoaW5kIHRoaXMgaXMgKDEpIGV4Y2VwdCBmb3Ig SlNXaW5kb3dQcm94eSBKU1Byb3h5IGRvZXMgbm90IG5lZWQgdG8gYmUgZGVzdHJ1Y3RpYmxlLCBh bmQgKDIpIHN1YnNwYWNlIG9mIGRlc3RydWN0aWJsZQotICAgICAgICAgICAgICAgICAgICAvLyBh bmQgbm9uLWRlc3RydWN0aWJsZSBvYmplY3RzIGFyZSBzZXBhcmF0ZWQgYW5kIEpTUHJveHkgaXMg dXNpbmcgb25lIE1hcmtlZEJsb2NrIG9ubHkgZm9yIEpTUHJveHkgY2xhc3MgaW4gdGhlIEpTQyBm cmFtZXdvcmsgYW5kIHdhc3RpbmcgbWVtb3J5LgotICAgICAgICAgICAgICAgICAgICAvLyBCYXNp Y2FsbHksIHRvIG1ha2Ugb2JqZWN0cyBkZXN0cnVjdGlibGUsIG9iamVjdHMgbmVlZCB0byBpbmhl cml0IEpTRGVzdHJ1Y3RpYmxlT2JqZWN0LiBJdCBob2xkcyBhIGNsYXNzSW5mbyBhdCBhIHNwZWNp ZmljIG9mZnNldAotICAgICAgICAgICAgICAgICAgICAvLyBzbyB0aGF0IEhlYXAgY2FuIGdldCBt ZXRob2RUYWJsZTo6ZGVzdHJveSBldmVuIGlmIHN0cnVjdHVyZXMgaGVsZCBieSBvYmplY3RzIGFy ZSBkZXN0cm95ZWQgYmVmb3JlIG9iamVjdHMnIGRlc3RydWN0aW9ucy4gQnV0IHRoaXMKLSAgICAg ICAgICAgICAgICAgICAgLy8gcmVxdWlyZW1lbnQgZm9yY2VzIEpTUHJveHkgdG8gaW5oZXJpdCBK U0Rlc3RydWN0aWJsZU9iamVjdCBmb3IgSlNXaW5kb3dQcm94eSBldmVuIHdoaWxlIHRoZSBvdGhl ciBKU1Byb3h5IGRvZXMgbm90IG5lZWQgdG8gYmUKLSAgICAgICAgICAgICAgICAgICAgLy8gZGVz dHJ1Y3RpYmxlLiBXZSBjcmVhdGUgSlNOb25EZXN0cnVjdGlibGVQcm94eSwgd2hpY2ggaXMgYSBz dWJjbGFzcyBvZiBKU1Byb3h5LCBhbmQgbWFrZSBpdCBub24tZGVzdHJ1Y3RpYmxlIHNvIHRoYXQg d2Ugc3RpbGwga2VlcAotICAgICAgICAgICAgICAgICAgICAvLyBKU1dpbmRvd1Byb3h5IGRlc3Ry dWN0aWJsZSB3aGlsZSBtYWtpbmcgSlNOb25EZXN0cnVjdGlibGVQcm94eSBub24tZGVzdHJ1Y3Rp YmxlLgotICAgICAgICAgICAgICAgICAgICByZXR1cm4gSlNOb25GaW5hbE9iamVjdDo6c3Vic3Bh Y2VGb3I8Q2VsbFR5cGUsIG1vZGU+KHZtKTsKLSAgICAgICAgICAgICAgICB9Ci0KLSAgICAgICAg ICAgIHN0YXRpYyBKU05vbkRlc3RydWN0aWJsZVByb3h5KiBjcmVhdGUoVk0mIHZtLCBTdHJ1Y3R1 cmUqIHN0cnVjdHVyZSwgSlNPYmplY3QqIHRhcmdldCkKLSAgICAgICAgICAgIHsKLSAgICAgICAg ICAgICAgICBKU05vbkRlc3RydWN0aWJsZVByb3h5KiBwcm94eSA9IG5ldyAoTm90TnVsbCwgYWxs b2NhdGVDZWxsPEpTTm9uRGVzdHJ1Y3RpYmxlUHJveHk+KHZtLmhlYXApKSBKU05vbkRlc3RydWN0 aWJsZVByb3h5KHZtLCBzdHJ1Y3R1cmUpOwotICAgICAgICAgICAgICAgIHByb3h5LT5maW5pc2hD cmVhdGlvbih2bSwgdGFyZ2V0KTsKLSAgICAgICAgICAgICAgICByZXR1cm4gcHJveHk7Ci0gICAg ICAgICAgICB9Ci0KLSAgICAgICAgICAgIHN0YXRpYyBKU05vbkRlc3RydWN0aWJsZVByb3h5KiBj cmVhdGUoVk0mIHZtLCBTdHJ1Y3R1cmUqIHN0cnVjdHVyZSkKLSAgICAgICAgICAgIHsKLSAgICAg ICAgICAgICAgICBKU05vbkRlc3RydWN0aWJsZVByb3h5KiBwcm94eSA9IG5ldyAoTm90TnVsbCwg YWxsb2NhdGVDZWxsPEpTTm9uRGVzdHJ1Y3RpYmxlUHJveHk+KHZtLmhlYXApKSBKU05vbkRlc3Ry dWN0aWJsZVByb3h5KHZtLCBzdHJ1Y3R1cmUpOwotICAgICAgICAgICAgICAgIHByb3h5LT5maW5p c2hDcmVhdGlvbih2bSk7Ci0gICAgICAgICAgICAgICAgcmV0dXJuIHByb3h5OwotICAgICAgICAg ICAgfQotCi0gICAgICAgICAgICBzdGF0aWMgU3RydWN0dXJlKiBjcmVhdGVTdHJ1Y3R1cmUoVk0m IHZtLCBKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0LCBKU1ZhbHVlIHByb3RvdHlwZSwgSlNU eXBlIHByb3h5VHlwZSkKLSAgICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICBBU1NFUlQocHJv eHlUeXBlID09IEltcHVyZVByb3h5VHlwZSB8fCBwcm94eVR5cGUgPT0gUHVyZUZvcndhcmRpbmdQ cm94eVR5cGUpOwotICAgICAgICAgICAgICAgIHJldHVybiBTdHJ1Y3R1cmU6OmNyZWF0ZSh2bSwg Z2xvYmFsT2JqZWN0LCBwcm90b3R5cGUsIFR5cGVJbmZvKHByb3h5VHlwZSwgU3RydWN0dXJlRmxh Z3MpLCBpbmZvKCkpOwotICAgICAgICAgICAgfQotCi0gICAgICAgICAgICBERUNMQVJFX0VYUE9S VF9JTkZPOwotCi0gICAgICAgIHByb3RlY3RlZDoKLSAgICAgICAgICAgIEpTTm9uRGVzdHJ1Y3Rp YmxlUHJveHkoVk0mIHZtLCBTdHJ1Y3R1cmUqIHN0cnVjdHVyZSkKLSAgICAgICAgICAgICAgICA6 IEJhc2Uodm0sIHN0cnVjdHVyZSkKLSAgICAgICAgICAgIHsKLSAgICAgICAgICAgIH0KLSAgICB9 OworY2xhc3MgSlNOb25EZXN0cnVjdGlibGVQcm94eSA6IHB1YmxpYyBKU1Byb3h5IHsKK3B1Ymxp YzoKKyAgICB1c2luZyBCYXNlID0gSlNQcm94eTsKKyAgICBzdGF0aWMgY29uc3RleHByIHVuc2ln bmVkIFN0cnVjdHVyZUZsYWdzID0gQmFzZTo6U3RydWN0dXJlRmxhZ3M7CisgICAgc3RhdGljIGNv bnN0ZXhwciBib29sIG5lZWRzRGVzdHJ1Y3Rpb24gPSBmYWxzZTsKKworICAgIHRlbXBsYXRlPHR5 cGVuYW1lIENlbGxUeXBlLCBTdWJzcGFjZUFjY2VzcyBtb2RlPgorICAgIHN0YXRpYyBDb21wbGV0 ZVN1YnNwYWNlKiBzdWJzcGFjZUZvcihWTSYgdm0pCisgICAgeworICAgICAgICAvLyBKU1Byb3h5 IGlzIEpTRGVzdHJ1Y2l0YmxlT2JqZWN0LCBidXQgd2UgbWFrZSB0aGlzIEpTTm9uRGVzdHJ1Y3Rp YmxlUHJveHkgbm9uLWRlc3RydWN0aWJsZSBieSB1c2luZyBub24tZGVzdHJ1Y3RpYmxlIHN1YnNw YWNlLgorICAgICAgICAvLyBUaGUgbW90aXZhdGlvbiBiZWhpbmQgdGhpcyBpcyAoMSkgZXhjZXB0 IGZvciBKU1dpbmRvd1Byb3h5IEpTUHJveHkgZG9lcyBub3QgbmVlZCB0byBiZSBkZXN0cnVjdGli bGUsIGFuZCAoMikgc3Vic3BhY2Ugb2YgZGVzdHJ1Y3RpYmxlCisgICAgICAgIC8vIGFuZCBub24t ZGVzdHJ1Y3RpYmxlIG9iamVjdHMgYXJlIHNlcGFyYXRlZCBhbmQgSlNQcm94eSBpcyB1c2luZyBv bmUgTWFya2VkQmxvY2sgb25seSBmb3IgSlNQcm94eSBjbGFzcyBpbiB0aGUgSlNDIGZyYW1ld29y ayBhbmQgd2FzdGluZyBtZW1vcnkuCisgICAgICAgIC8vIEJhc2ljYWxseSwgdG8gbWFrZSBvYmpl Y3RzIGRlc3RydWN0aWJsZSwgb2JqZWN0cyBuZWVkIHRvIGluaGVyaXQgSlNEZXN0cnVjdGlibGVP YmplY3QuIEl0IGhvbGRzIGEgY2xhc3NJbmZvIGF0IGEgc3BlY2lmaWMgb2Zmc2V0CisgICAgICAg IC8vIHNvIHRoYXQgSGVhcCBjYW4gZ2V0IG1ldGhvZFRhYmxlOjpkZXN0cm95IGV2ZW4gaWYgc3Ry dWN0dXJlcyBoZWxkIGJ5IG9iamVjdHMgYXJlIGRlc3Ryb3llZCBiZWZvcmUgb2JqZWN0cycgZGVz dHJ1Y3Rpb25zLiBCdXQgdGhpcworICAgICAgICAvLyByZXF1aXJlbWVudCBmb3JjZXMgSlNQcm94 eSB0byBpbmhlcml0IEpTRGVzdHJ1Y3RpYmxlT2JqZWN0IGZvciBKU1dpbmRvd1Byb3h5IGV2ZW4g d2hpbGUgdGhlIG90aGVyIEpTUHJveHkgZG9lcyBub3QgbmVlZCB0byBiZQorICAgICAgICAvLyBk ZXN0cnVjdGlibGUuIFdlIGNyZWF0ZSBKU05vbkRlc3RydWN0aWJsZVByb3h5LCB3aGljaCBpcyBh IHN1YmNsYXNzIG9mIEpTUHJveHksIGFuZCBtYWtlIGl0IG5vbi1kZXN0cnVjdGlibGUgc28gdGhh dCB3ZSBzdGlsbCBrZWVwCisgICAgICAgIC8vIEpTV2luZG93UHJveHkgZGVzdHJ1Y3RpYmxlIHdo aWxlIG1ha2luZyBKU05vbkRlc3RydWN0aWJsZVByb3h5IG5vbi1kZXN0cnVjdGlibGUuCisgICAg ICAgIHJldHVybiBKU05vbkZpbmFsT2JqZWN0OjpzdWJzcGFjZUZvcjxDZWxsVHlwZSwgbW9kZT4o dm0pOworICAgIH0KKworICAgIHN0YXRpYyBKU05vbkRlc3RydWN0aWJsZVByb3h5KiBjcmVhdGUo Vk0mIHZtLCBTdHJ1Y3R1cmUqIHN0cnVjdHVyZSwgSlNPYmplY3QqIHRhcmdldCkKKyAgICB7Cisg ICAgICAgIEpTTm9uRGVzdHJ1Y3RpYmxlUHJveHkqIHByb3h5ID0gbmV3IChOb3ROdWxsLCBhbGxv Y2F0ZUNlbGw8SlNOb25EZXN0cnVjdGlibGVQcm94eT4odm0uaGVhcCkpIEpTTm9uRGVzdHJ1Y3Rp YmxlUHJveHkodm0sIHN0cnVjdHVyZSk7CisgICAgICAgIHByb3h5LT5maW5pc2hDcmVhdGlvbih2 bSwgdGFyZ2V0KTsKKyAgICAgICAgcmV0dXJuIHByb3h5OworICAgIH0KKworICAgIHN0YXRpYyBK U05vbkRlc3RydWN0aWJsZVByb3h5KiBjcmVhdGUoVk0mIHZtLCBTdHJ1Y3R1cmUqIHN0cnVjdHVy ZSkKKyAgICB7CisgICAgICAgIEpTTm9uRGVzdHJ1Y3RpYmxlUHJveHkqIHByb3h5ID0gbmV3IChO b3ROdWxsLCBhbGxvY2F0ZUNlbGw8SlNOb25EZXN0cnVjdGlibGVQcm94eT4odm0uaGVhcCkpIEpT Tm9uRGVzdHJ1Y3RpYmxlUHJveHkodm0sIHN0cnVjdHVyZSk7CisgICAgICAgIHByb3h5LT5maW5p c2hDcmVhdGlvbih2bSk7CisgICAgICAgIHJldHVybiBwcm94eTsKKyAgICB9CisKKyAgICBzdGF0 aWMgU3RydWN0dXJlKiBjcmVhdGVTdHJ1Y3R1cmUoVk0mIHZtLCBKU0dsb2JhbE9iamVjdCogZ2xv YmFsT2JqZWN0LCBKU1ZhbHVlIHByb3RvdHlwZSwgSlNUeXBlIHByb3h5VHlwZSkKKyAgICB7Cisg ICAgICAgIEFTU0VSVChwcm94eVR5cGUgPT0gSW1wdXJlUHJveHlUeXBlIHx8IHByb3h5VHlwZSA9 PSBQdXJlRm9yd2FyZGluZ1Byb3h5VHlwZSk7CisgICAgICAgIHJldHVybiBTdHJ1Y3R1cmU6OmNy ZWF0ZSh2bSwgZ2xvYmFsT2JqZWN0LCBwcm90b3R5cGUsIFR5cGVJbmZvKHByb3h5VHlwZSwgU3Ry dWN0dXJlRmxhZ3MpLCBpbmZvKCkpOworICAgIH0KKworICAgIERFQ0xBUkVfRVhQT1JUX0lORk87 CisKK3Byb3RlY3RlZDoKKyAgICBKU05vbkRlc3RydWN0aWJsZVByb3h5KFZNJiB2bSwgU3RydWN0 dXJlKiBzdHJ1Y3R1cmUpCisgICAgICAgIDogQmFzZSh2bSwgc3RydWN0dXJlKQorICAgIHsKKyAg ICB9Cit9OwogCiB9IC8vIG5hbWVzcGFjZSBKU0MK