128475 2014-02-08 15:09:10 -0800 Rename a field and some variables in JSLock to better describe what they contain 2014-02-08 16:41:39 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mark.lam mark.lam fpizlo ggaren mhahnenberg mmirman msaboff oliver oldest_to_newest 978442 0 mark.lam 2014-02-08 15:09:10 -0800 Patch coming. 978444 1 223587 mark.lam 2014-02-08 15:14:20 -0800 Created attachment 223587 a trivial patch: renames only. 978464 2 mark.lam 2014-02-08 16:41:39 -0800 Thanks for the review. efl-wk2 bot failed because of: Building CXX object Source/WebKit2/CMakeFiles/WebKit2.dir/WebProcess/InjectedBundle/InjectedBundle.cpp.o c++: internal compiler error: Killed (program cc1plus) Hence, it's not related to this patch. Landed in r163730: <http://trac.webkit.org/r163730>. 223587 2014-02-08 15:14:20 -0800 2014-02-08 16:32:42 -0800 a trivial patch: renames only. bug-128475.patch text/plain 5804 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTYzNzI2KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBA CisyMDE0LTAyLTA4ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBS ZW5hbWUgYSBmaWVsZCBhbmQgc29tZSB2YXJpYWJsZXMgaW4gSlNMb2NrIHRvIGJldHRlciBkZXNj cmliZSB3aGF0IHRoZXkgY29udGFpbi4KKyAgICAgICAgPGh0dHBzOi8vd2Via2l0Lm9yZy9iLzEy ODQ3NT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IHJ1bnRpbWUvSlNMb2NrLmNwcDoKKyAgICAgICAgKEpTQzo6SlNMb2NrOjpkcm9wQWxsTG9ja3Mp OgorICAgICAgICAoSlNDOjpKU0xvY2s6OmRyb3BBbGxMb2Nrc1VuY29uZGl0aW9uYWxseSk6Cisg ICAgICAgIChKU0M6OkpTTG9jazo6Z3JhYkFsbExvY2tzKToKKyAgICAgICAgKEpTQzo6SlNMb2Nr OjpEcm9wQWxsTG9ja3M6OkRyb3BBbGxMb2Nrcyk6CisgICAgICAgIChKU0M6OkpTTG9jazo6RHJv cEFsbExvY2tzOjp+RHJvcEFsbExvY2tzKToKKyAgICAgICAgKiBydW50aW1lL0pTTG9jay5oOgor CiAyMDE0LTAyLTA4ICBNYXJrIFJvd2UgIDxtcm93ZUBhcHBsZS5jb20+CiAKICAgICAgICAgPGh0 dHBzOi8vd2Via2l0Lm9yZy9iLzEyODQ1Mj4gRG9uJ3QgZHVwbGljYXRlIHRoZSBsaXN0IG9mIGlu cHV0IGZpbGVzIGZvciBwb3N0cHJvY2Vzcy1oZWFkZXJzLnNoCkluZGV4OiBTb3VyY2UvSmF2YVNj cmlwdENvcmUvcnVudGltZS9KU0xvY2suY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9ydW50aW1lL0pTTG9jay5jcHAJKHJldmlzaW9uIDE2MzcwMCkKKysrIFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTTG9jay5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIxMSw4 ICsyMTEsOCBAQCB1bnNpZ25lZCBKU0xvY2s6OmRyb3BBbGxMb2NrcyhTcGluTG9jayYgCiAgICAg QVNTRVJUX1VOVVNFRChzcGluTG9jaywgc3BpbkxvY2suSXNIZWxkKCkpOwogICAgIC8vIENoZWNr IGlmIHRoaXMgdGhyZWFkIGlzIGN1cnJlbnRseSBob2xkaW5nIHRoZSBsb2NrLgogICAgIC8vIEZJ WE1FOiBNYXliZSB3ZSB3YW50IHRvIHJlcXVpcmUgdGhpcywgZ3VhcmQgd2l0aCBhbiBBU1NFUlQ/ Ci0gICAgdW5zaWduZWQgbG9ja0NvdW50ID0gbV9sb2NrQ291bnQ7Ci0gICAgaWYgKCFsb2NrQ291 bnQgfHwgbV9vd25lclRocmVhZCAhPSBXVEY6OmN1cnJlbnRUaHJlYWQoKSkKKyAgICB1bnNpZ25l ZCBsb2Nrc1RvRHJvcCA9IG1fbG9ja0NvdW50OworICAgIGlmICghbG9ja3NUb0Ryb3AgfHwgbV9v d25lclRocmVhZCAhPSBXVEY6OmN1cnJlbnRUaHJlYWQoKSkKICAgICAgICAgcmV0dXJuIDA7CiAK ICAgICAvLyBEb24ndCBkcm9wIHRoZSBsb2NrcyBpZiB0aGV5J3ZlIGFscmVhZHkgYmVlbiBkcm9w cGVkIG9uY2UuCkBAIC0yMzQsNyArMjM0LDcgQEAgdW5zaWduZWQgSlNMb2NrOjpkcm9wQWxsTG9j a3MoU3BpbkxvY2smIAogICAgICAgICBtX3ZtLT51cGRhdGVTdGFja0xpbWl0V2l0aFJlc2VydmVk Wm9uZVNpemUod3RmVGhyZWFkRGF0YSgpLnNhdmVkUmVzZXJ2ZWRab25lU2l6ZSgpKTsKICAgICB9 CiAgICAgbV9sb2NrLnVubG9jaygpOwotICAgIHJldHVybiBsb2NrQ291bnQ7CisgICAgcmV0dXJu IGxvY2tzVG9Ecm9wOwogfQogCiB1bnNpZ25lZCBKU0xvY2s6OmRyb3BBbGxMb2Nrc1VuY29uZGl0 aW9uYWxseShTcGluTG9jayYgc3BpbkxvY2spCkBAIC0yNDIsOCArMjQyLDggQEAgdW5zaWduZWQg SlNMb2NrOjpkcm9wQWxsTG9ja3NVbmNvbmRpdGlvbgogICAgIEFTU0VSVF9VTlVTRUQoc3Bpbkxv Y2ssIHNwaW5Mb2NrLklzSGVsZCgpKTsKICAgICAvLyBDaGVjayBpZiB0aGlzIHRocmVhZCBpcyBj dXJyZW50bHkgaG9sZGluZyB0aGUgbG9jay4KICAgICAvLyBGSVhNRTogTWF5YmUgd2Ugd2FudCB0 byByZXF1aXJlIHRoaXMsIGd1YXJkIHdpdGggYW4gQVNTRVJUPwotICAgIHVuc2lnbmVkIGxvY2tD b3VudCA9IG1fbG9ja0NvdW50OwotICAgIGlmICghbG9ja0NvdW50IHx8IG1fb3duZXJUaHJlYWQg IT0gV1RGOjpjdXJyZW50VGhyZWFkKCkpCisgICAgdW5zaWduZWQgbG9ja3NUb0Ryb3AgPSBtX2xv Y2tDb3VudDsKKyAgICBpZiAoIWxvY2tzVG9Ecm9wIHx8IG1fb3duZXJUaHJlYWQgIT0gV1RGOjpj dXJyZW50VGhyZWFkKCkpCiAgICAgICAgIHJldHVybiAwOwogCiAgICAgV1RGVGhyZWFkRGF0YSYg dGhyZWFkRGF0YSA9IHd0ZlRocmVhZERhdGEoKTsKQEAgLTI1OSwyMSArMjU5LDIxIEBAIHVuc2ln bmVkIEpTTG9jazo6ZHJvcEFsbExvY2tzVW5jb25kaXRpb24KICAgICAgICAgbV92bS0+dXBkYXRl U3RhY2tMaW1pdFdpdGhSZXNlcnZlZFpvbmVTaXplKHd0ZlRocmVhZERhdGEoKS5zYXZlZFJlc2Vy dmVkWm9uZVNpemUoKSk7CiAgICAgfQogICAgIG1fbG9jay51bmxvY2soKTsKLSAgICByZXR1cm4g bG9ja0NvdW50OworICAgIHJldHVybiBsb2Nrc1RvRHJvcDsKIH0KIAotdm9pZCBKU0xvY2s6Omdy YWJBbGxMb2Nrcyh1bnNpZ25lZCBsb2NrQ291bnQsIFNwaW5Mb2NrJiBzcGluTG9jaykKK3ZvaWQg SlNMb2NrOjpncmFiQWxsTG9ja3ModW5zaWduZWQgZHJvcHBlZExvY2tDb3VudCwgU3BpbkxvY2sm IHNwaW5Mb2NrKQogewogICAgIEFTU0VSVChzcGluTG9jay5Jc0hlbGQoKSk7CiAgICAgLy8gSWYg bm8gbG9ja3Mgd2VyZSBkcm9wcGVkLCBub3RoaW5nIHRvIGRvIQotICAgIGlmICghbG9ja0NvdW50 KQorICAgIGlmICghZHJvcHBlZExvY2tDb3VudCkKICAgICAgICAgcmV0dXJuOwogCiAgICAgVGhy ZWFkSWRlbnRpZmllciBjdXJyZW50VGhyZWFkID0gV1RGOjpjdXJyZW50VGhyZWFkKCk7CiAgICAg Ly8gQ2hlY2sgaWYgdGhpcyB0aHJlYWQgaXMgY3VycmVudGx5IGhvbGRpbmcgdGhlIGxvY2suCiAg ICAgLy8gRklYTUU6IE1heWJlIHdlIHdhbnQgdG8gcHJvaGliaXQgdGhpcywgZ3VhcmQgYWdhaW5z dCB3aXRoIGFuIEFTU0VSVD8KICAgICBpZiAobV9vd25lclRocmVhZCA9PSBjdXJyZW50VGhyZWFk ICYmIG1fbG9ja0NvdW50KSB7Ci0gICAgICAgIG1fbG9ja0NvdW50ICs9IGxvY2tDb3VudDsKKyAg ICAgICAgbV9sb2NrQ291bnQgKz0gZHJvcHBlZExvY2tDb3VudDsKICAgICAgICAgLS1tX2xvY2tE cm9wRGVwdGg7CiAgICAgICAgIHJldHVybjsKICAgICB9CkBAIC0yODQsNyArMjg0LDcgQEAgdm9p ZCBKU0xvY2s6OmdyYWJBbGxMb2Nrcyh1bnNpZ25lZCBsb2NrQwogCiAgICAgbV9vd25lclRocmVh ZCA9IGN1cnJlbnRUaHJlYWQ7CiAgICAgQVNTRVJUKCFtX2xvY2tDb3VudCk7Ci0gICAgbV9sb2Nr Q291bnQgPSBsb2NrQ291bnQ7CisgICAgbV9sb2NrQ291bnQgPSBkcm9wcGVkTG9ja0NvdW50Owog ICAgIC0tbV9sb2NrRHJvcERlcHRoOwogCiAgICAgV1RGVGhyZWFkRGF0YSYgdGhyZWFkRGF0YSA9 IHd0ZlRocmVhZERhdGEoKTsKQEAgLTI5NCw3ICsyOTQsNyBAQCB2b2lkIEpTTG9jazo6Z3JhYkFs bExvY2tzKHVuc2lnbmVkIGxvY2tDCiB9CiAKIEpTTG9jazo6RHJvcEFsbExvY2tzOjpEcm9wQWxs TG9ja3MoRXhlY1N0YXRlKiBleGVjLCBBbHdheXNEcm9wTG9ja3NUYWcgYWx3YXlzRHJvcExvY2tz KQotICAgIDogbV9sb2NrQ291bnQoMCkKKyAgICA6IG1fZHJvcHBlZExvY2tDb3VudCgwKQogICAg ICwgbV92bShleGVjID8gJmV4ZWMtPnZtKCkgOiBudWxscHRyKQogewogICAgIGlmICghbV92bSkK QEAgLTMwMywxMyArMzAzLDEzIEBAIEpTTG9jazo6RHJvcEFsbExvY2tzOjpEcm9wQWxsTG9ja3Mo RXhlY1MKICAgICBTcGluTG9ja0hvbGRlciBob2xkZXIoJnNwaW5Mb2NrKTsKIAogICAgIGlmIChh bHdheXNEcm9wTG9ja3MpCi0gICAgICAgIG1fbG9ja0NvdW50ID0gbV92bS0+YXBpTG9jaygpLmRy b3BBbGxMb2Nrc1VuY29uZGl0aW9uYWxseShzcGluTG9jayk7CisgICAgICAgIG1fZHJvcHBlZExv Y2tDb3VudCA9IG1fdm0tPmFwaUxvY2soKS5kcm9wQWxsTG9ja3NVbmNvbmRpdGlvbmFsbHkoc3Bp bkxvY2spOwogICAgIGVsc2UKLSAgICAgICAgbV9sb2NrQ291bnQgPSBtX3ZtLT5hcGlMb2NrKCku ZHJvcEFsbExvY2tzKHNwaW5Mb2NrKTsKKyAgICAgICAgbV9kcm9wcGVkTG9ja0NvdW50ID0gbV92 bS0+YXBpTG9jaygpLmRyb3BBbGxMb2NrcyhzcGluTG9jayk7CiB9CiAKIEpTTG9jazo6RHJvcEFs bExvY2tzOjpEcm9wQWxsTG9ja3MoVk0qIHZtLCBBbHdheXNEcm9wTG9ja3NUYWcgYWx3YXlzRHJv cExvY2tzKQotICAgIDogbV9sb2NrQ291bnQoMCkKKyAgICA6IG1fZHJvcHBlZExvY2tDb3VudCgw KQogICAgICwgbV92bSh2bSkKIHsKICAgICBpZiAoIW1fdm0pCkBAIC0zMTgsOSArMzE4LDkgQEAg SlNMb2NrOjpEcm9wQWxsTG9ja3M6OkRyb3BBbGxMb2NrcyhWTSogdgogICAgIFNwaW5Mb2NrSG9s ZGVyIGhvbGRlcigmc3BpbkxvY2spOwogCiAgICAgaWYgKGFsd2F5c0Ryb3BMb2NrcykKLSAgICAg ICAgbV9sb2NrQ291bnQgPSBtX3ZtLT5hcGlMb2NrKCkuZHJvcEFsbExvY2tzVW5jb25kaXRpb25h bGx5KHNwaW5Mb2NrKTsKKyAgICAgICAgbV9kcm9wcGVkTG9ja0NvdW50ID0gbV92bS0+YXBpTG9j aygpLmRyb3BBbGxMb2Nrc1VuY29uZGl0aW9uYWxseShzcGluTG9jayk7CiAgICAgZWxzZQotICAg ICAgICBtX2xvY2tDb3VudCA9IG1fdm0tPmFwaUxvY2soKS5kcm9wQWxsTG9ja3Moc3BpbkxvY2sp OworICAgICAgICBtX2Ryb3BwZWRMb2NrQ291bnQgPSBtX3ZtLT5hcGlMb2NrKCkuZHJvcEFsbExv Y2tzKHNwaW5Mb2NrKTsKIH0KIAogSlNMb2NrOjpEcm9wQWxsTG9ja3M6On5Ecm9wQWxsTG9ja3Mo KQpAQCAtMzI5LDcgKzMyOSw3IEBAIEpTTG9jazo6RHJvcEFsbExvY2tzOjp+RHJvcEFsbExvY2tz KCkKICAgICAgICAgcmV0dXJuOwogICAgIFNwaW5Mb2NrJiBzcGluTG9jayA9IG1fdm0tPmFwaUxv Y2soKS5tX3NwaW5Mb2NrOwogICAgIFNwaW5Mb2NrSG9sZGVyIGhvbGRlcigmc3BpbkxvY2spOwot ICAgIG1fdm0tPmFwaUxvY2soKS5ncmFiQWxsTG9ja3MobV9sb2NrQ291bnQsIHNwaW5Mb2NrKTsK KyAgICBtX3ZtLT5hcGlMb2NrKCkuZ3JhYkFsbExvY2tzKG1fZHJvcHBlZExvY2tDb3VudCwgc3Bp bkxvY2spOwogfQogCiB9IC8vIG5hbWVzcGFjZSBKU0MKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9ydW50aW1lL0pTTG9jay5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9ydW50aW1lL0pTTG9jay5oCShyZXZpc2lvbiAxNjM3MDApCisrKyBTb3VyY2UvSmF2YVNjcmlw dENvcmUvcnVudGltZS9KU0xvY2suaAkod29ya2luZyBjb3B5KQpAQCAtMTA4LDcgKzEwOCw3IEBA IG5hbWVzcGFjZSBKU0MgewogICAgICAgICAgICAgSlNfRVhQT1JUX1BSSVZBVEUgfkRyb3BBbGxM b2NrcygpOwogICAgICAgICAgICAgCiAgICAgICAgIHByaXZhdGU6Ci0gICAgICAgICAgICBpbnRw dHJfdCBtX2xvY2tDb3VudDsKKyAgICAgICAgICAgIGludHB0cl90IG1fZHJvcHBlZExvY2tDb3Vu dDsKICAgICAgICAgICAgIFJlZlB0cjxWTT4gbV92bTsKICAgICAgICAgfTsKIAo=