31506 2009-11-13 23:32:11 -0800 [GTK] Style cleanup for GOwnPtr 2009-11-17 12:38:54 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 0 mrobinson webkit-unassigned commit-queue oldest_to_newest 163649 0 mrobinson 2009-11-13 23:32:11 -0800 - Code inside the namespace should not be indented. - glib includes should be replaced by foward declarations. - The reinterpret_cast to a void* in freeOwnedGPtr is unecessary. 163650 1 43223 mrobinson 2009-11-13 23:40:41 -0800 Created attachment 43223 Style cleanups for GOwnPtr Attached a patch for this issue. I was inspired to do this by Alp Toker's request in https://bugs.webkit.org/show_bug.cgi?id=21599 . 163720 2 43223 abarth 2009-11-14 23:20:12 -0800 Comment on attachment 43223 Style cleanups for GOwnPtr The diff is slightly hard to read, but this looks correct as far as I can tell. 164311 3 43223 commit-queue 2009-11-17 12:38:49 -0800 Comment on attachment 43223 Style cleanups for GOwnPtr Clearing flags on attachment: 43223 Committed r51086: <http://trac.webkit.org/changeset/51086> 164312 4 commit-queue 2009-11-17 12:38:54 -0800 All reviewed patches have been landed. Closing bug. 43223 2009-11-13 23:40:41 -0800 2009-11-17 12:38:49 -0800 Style cleanups for GOwnPtr 0001-Remove-forward-declaration-in-GOwnPtr.patch text/plain 7293 mrobinson RnJvbSAzM2M1NjA0ZTg1OWM1YzJlZjU3MDdmMWYzYTg3NjdjOTlhNDRiMjgyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXJ0aW4gUm9iaW5zb24gPG1hcnRpbi5qYW1lcy5yb2JpbnNv bkBnbWFpbC5jb20+CkRhdGU6IEZyaSwgMTMgTm92IDIwMDkgMjM6MzY6NTEgLTA4MDAKU3ViamVj dDogW1BBVENIXSBSZW1vdmUgZm9yd2FyZCBkZWNsYXJhdGlvbiBpbiBHT3duUHRyLgoKLS0tCiBK YXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgICAgICAgfCAgIDI5ICsrKysrKysrCiBKYXZhU2NyaXB0 Q29yZS93dGYvR093blB0ci5jcHAgfCAgICAyICsKIEphdmFTY3JpcHRDb3JlL3d0Zi9HT3duUHRy LmggICB8ICAxNTQgKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLQogMyBm aWxlcyBjaGFuZ2VkLCAxMzIgaW5zZXJ0aW9ucygrKSwgNTMgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nIGIvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9n CmluZGV4IDgyMTY0MDEuLjIzNTAzYWUgMTAwNjQ0Ci0tLSBhL0phdmFTY3JpcHRDb3JlL0NoYW5n ZUxvZworKysgYi9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzMiBAQAorMjAw OS0xMS0xMyAgTWFydGluIFJvYmluc29uICA8bWFydGluLmphbWVzLnJvYmluc29uQGdtYWlsLmNv bT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbR1RL XSBTdHlsZSBjbGVhbnVwIGZvciBHT3duUHRyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0zMTUwNgorCisgICAgICAgIFJlbW92ZSBmb3J3YXJkIGRlY2xh cmF0aW9uIGluIEdPd25QdHIgYW5kIGRvIHNvbWUgc3R5bGUgY2xlYW51cC4KKworICAgICAgICAq IHd0Zi9HT3duUHRyLmNwcDoKKyAgICAgICAgKiB3dGYvR093blB0ci5oOgorICAgICAgICAoV1RG OjpHT3duUHRyOjpHT3duUHRyKToKKyAgICAgICAgKFdURjo6R093blB0cjo6fkdPd25QdHIpOgor ICAgICAgICAoV1RGOjpHT3duUHRyOjpnZXQpOgorICAgICAgICAoV1RGOjpHT3duUHRyOjpyZWxl YXNlKToKKyAgICAgICAgKFdURjo6R093blB0cjo6b3V0UHRyKToKKyAgICAgICAgKFdURjo6R093 blB0cjo6c2V0KToKKyAgICAgICAgKFdURjo6R093blB0cjo6Y2xlYXIpOgorICAgICAgICAoV1RG OjpHT3duUHRyOjpvcGVyYXRvciopOgorICAgICAgICAoV1RGOjpHT3duUHRyOjpvcGVyYXRvci0+ KToKKyAgICAgICAgKFdURjo6R093blB0cjo6b3BlcmF0b3IhKToKKyAgICAgICAgKFdURjo6R093 blB0cjo6b3BlcmF0b3IgVW5zcGVjaWZpZWRCb29sVHlwZSk6CisgICAgICAgIChXVEY6OkdPd25Q dHI6OnN3YXApOgorICAgICAgICAoV1RGOjpzd2FwKToKKyAgICAgICAgKFdURjo6b3BlcmF0b3I9 PSk6CisgICAgICAgIChXVEY6Om9wZXJhdG9yIT0pOgorICAgICAgICAoV1RGOjpnZXRQdHIpOgor ICAgICAgICAoV1RGOjpmcmVlT3duZWRHUHRyKToKKwogMjAwOS0xMS0xMyAgWm9sdGFuIEhlcmN6 ZWcgIDx6aGVyY3plZ0BpbmYudS1zemVnZWQuaHU+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgR2F2 aW4gQmFycmFjbG91Z2guCmRpZmYgLS1naXQgYS9KYXZhU2NyaXB0Q29yZS93dGYvR093blB0ci5j cHAgYi9KYXZhU2NyaXB0Q29yZS93dGYvR093blB0ci5jcHAKaW5kZXggNDMyODg1Zi4uODk5OTk2 MiAxMDA2NDQKLS0tIGEvSmF2YVNjcmlwdENvcmUvd3RmL0dPd25QdHIuY3BwCisrKyBiL0phdmFT Y3JpcHRDb3JlL3d0Zi9HT3duUHRyLmNwcApAQCAtMTksNiArMTksOCBAQAogI2luY2x1ZGUgImNv bmZpZy5oIgogI2luY2x1ZGUgIkdPd25QdHIuaCIKIAorI2luY2x1ZGUgPGdsaWIuaD4KKwogbmFt ZXNwYWNlIFdURiB7CiAKIHRlbXBsYXRlIDw+IHZvaWQgZnJlZU93bmVkR1B0cjxHRXJyb3I+KEdF cnJvciogcHRyKQpkaWZmIC0tZ2l0IGEvSmF2YVNjcmlwdENvcmUvd3RmL0dPd25QdHIuaCBiL0ph dmFTY3JpcHRDb3JlL3d0Zi9HT3duUHRyLmgKaW5kZXggNDk5MzM0OC4uYWQyYzMwZSAxMDA2NDQK LS0tIGEvSmF2YVNjcmlwdENvcmUvd3RmL0dPd25QdHIuaAorKysgYi9KYXZhU2NyaXB0Q29yZS93 dGYvR093blB0ci5oCkBAIC0yMyw3NCArMjMsMTIyIEBACiAjZGVmaW5lIEdPd25QdHJfaAogCiAj aW5jbHVkZSA8YWxnb3JpdGhtPgotI2luY2x1ZGUgPGdsaWIuaD4KICNpbmNsdWRlIDx3dGYvQXNz ZXJ0aW9ucy5oPgogI2luY2x1ZGUgPHd0Zi9Ob25jb3B5YWJsZS5oPgogCisvLyBGb3J3YXJkIGRl bGNhcmF0aW9ucyBhdCB0aGlzIHBvaW50IGF2b2lkIHRoZSBuZWVkIHRvIGluY2x1ZGUgR0xpYiBp bmNsdWRlcworLy8gaW4gV1RGIGhlYWRlcnMuCit0eXBlZGVmIHN0cnVjdCBfR0Vycm9yIEdFcnJv cjsKK3R5cGVkZWYgc3RydWN0IF9HTGlzdCBHTGlzdDsKK3R5cGVkZWYgc3RydWN0IF9HQ29uZCBH Q29uZDsKK3R5cGVkZWYgc3RydWN0IF9HTXV0ZXggR011dGV4OwordHlwZWRlZiBzdHJ1Y3QgX0dQ YXR0ZXJuU3BlYyBHUGF0dGVyblNwZWM7Cit0eXBlZGVmIHN0cnVjdCBfR0RpciBHRGlyOwordHlw ZWRlZiBzdHJ1Y3QgX0dIYXNoVGFibGUgR0hhc2hUYWJsZTsKK2V4dGVybiAiQyIgdm9pZCBnX2Zy ZWUodm9pZCopOworCiBuYW1lc3BhY2UgV1RGIHsKLSAgICB0ZW1wbGF0ZSA8dHlwZW5hbWUgVD4g aW5saW5lIHZvaWQgZnJlZU93bmVkR1B0cihUKiBwdHIpIHsgZ19mcmVlKHJlaW50ZXJwcmV0X2Nh c3Q8dm9pZCo+KHB0cikpOyB9Ci0gICAgdGVtcGxhdGU8PiB2b2lkIGZyZWVPd25lZEdQdHI8R0Vy cm9yPihHRXJyb3IqKTsKLSAgICB0ZW1wbGF0ZTw+IHZvaWQgZnJlZU93bmVkR1B0cjxHTGlzdD4o R0xpc3QqKTsKLSAgICB0ZW1wbGF0ZTw+IHZvaWQgZnJlZU93bmVkR1B0cjxHQ29uZD4oR0NvbmQq KTsKLSAgICB0ZW1wbGF0ZTw+IHZvaWQgZnJlZU93bmVkR1B0cjxHTXV0ZXg+KEdNdXRleCopOwot ICAgIHRlbXBsYXRlPD4gdm9pZCBmcmVlT3duZWRHUHRyPEdQYXR0ZXJuU3BlYz4oR1BhdHRlcm5T cGVjKik7Ci0gICAgdGVtcGxhdGU8PiB2b2lkIGZyZWVPd25lZEdQdHI8R0Rpcj4oR0RpciopOwot ICAgIHRlbXBsYXRlPD4gdm9pZCBmcmVlT3duZWRHUHRyPEdIYXNoVGFibGU+KEdIYXNoVGFibGUq KTsKLQotICAgIHRlbXBsYXRlIDx0eXBlbmFtZSBUPiBjbGFzcyBHT3duUHRyIDogcHVibGljIE5v bmNvcHlhYmxlIHsKLSAgICBwdWJsaWM6Ci0gICAgICAgIGV4cGxpY2l0IEdPd25QdHIoVCogcHRy ID0gMCkgOiBtX3B0cihwdHIpIHsgfQotICAgICAgICB+R093blB0cigpIHsgZnJlZU93bmVkR1B0 cihtX3B0cik7IH0KLQotICAgICAgICBUKiBnZXQoKSBjb25zdCB7IHJldHVybiBtX3B0cjsgfQot ICAgICAgICBUKiByZWxlYXNlKCkgeyBUKiBwdHIgPSBtX3B0cjsgbV9wdHIgPSAwOyByZXR1cm4g cHRyOyB9Ci0gICAgICAgIFQqJiBvdXRQdHIoKSB7IEFTU0VSVCghbV9wdHIpOyByZXR1cm4gbV9w dHI7IH0KLQotICAgICAgICB2b2lkIHNldChUKiBwdHIpIHsgQVNTRVJUKCFwdHIgfHwgbV9wdHIg IT0gcHRyKTsgZnJlZU93bmVkR1B0cihtX3B0cik7IG1fcHRyID0gcHRyOyB9Ci0gICAgICAgIHZv aWQgY2xlYXIoKSB7IGZyZWVPd25lZEdQdHIobV9wdHIpOyBtX3B0ciA9IDA7IH0KLQotICAgICAg ICBUJiBvcGVyYXRvciooKSBjb25zdCB7IEFTU0VSVChtX3B0cik7IHJldHVybiAqbV9wdHI7IH0K LSAgICAgICAgVCogb3BlcmF0b3ItPigpIGNvbnN0IHsgQVNTRVJUKG1fcHRyKTsgcmV0dXJuIG1f cHRyOyB9Ci0KLSAgICAgICAgYm9vbCBvcGVyYXRvciEoKSBjb25zdCB7IHJldHVybiAhbV9wdHI7 IH0KLQotICAgICAgICAvLyBUaGlzIGNvbnZlcnNpb24gb3BlcmF0b3IgYWxsb3dzIGltcGxpY2l0 IGNvbnZlcnNpb24gdG8gYm9vbCBidXQgbm90IHRvIG90aGVyIGludGVnZXIgdHlwZXMuCi0gICAg ICAgIHR5cGVkZWYgVCogR093blB0cjo6KlVuc3BlY2lmaWVkQm9vbFR5cGU7Ci0gICAgICAgIG9w ZXJhdG9yIFVuc3BlY2lmaWVkQm9vbFR5cGUoKSBjb25zdCB7IHJldHVybiBtX3B0ciA/ICZHT3du UHRyOjptX3B0ciA6IDA7IH0KLQotICAgICAgICB2b2lkIHN3YXAoR093blB0ciYgbykgeyBzdGQ6 OnN3YXAobV9wdHIsIG8ubV9wdHIpOyB9Ci0KLSAgICBwcml2YXRlOgotICAgICAgICBUKiBtX3B0 cjsKLSAgICB9OwotICAgIAotICAgIHRlbXBsYXRlIDx0eXBlbmFtZSBUPiBpbmxpbmUgdm9pZCBz d2FwKEdPd25QdHI8VD4mIGEsIEdPd25QdHI8VD4mIGIpIHsgYS5zd2FwKGIpOyB9Ci0KLSAgICB0 ZW1wbGF0ZSA8dHlwZW5hbWUgVCwgdHlwZW5hbWUgVT4gaW5saW5lIGJvb2wgb3BlcmF0b3I9PShj b25zdCBHT3duUHRyPFQ+JiBhLCBVKiBiKQotICAgIHsgCi0gICAgICAgIHJldHVybiBhLmdldCgp ID09IGI7IAorCit0ZW1wbGF0ZSA8dHlwZW5hbWUgVD4gaW5saW5lIHZvaWQgZnJlZU93bmVkR1B0 cihUKiBwdHIpOwordGVtcGxhdGU8PiB2b2lkIGZyZWVPd25lZEdQdHI8R0Vycm9yPihHRXJyb3Iq KTsKK3RlbXBsYXRlPD4gdm9pZCBmcmVlT3duZWRHUHRyPEdMaXN0PihHTGlzdCopOwordGVtcGxh dGU8PiB2b2lkIGZyZWVPd25lZEdQdHI8R0NvbmQ+KEdDb25kKik7Cit0ZW1wbGF0ZTw+IHZvaWQg ZnJlZU93bmVkR1B0cjxHTXV0ZXg+KEdNdXRleCopOwordGVtcGxhdGU8PiB2b2lkIGZyZWVPd25l ZEdQdHI8R1BhdHRlcm5TcGVjPihHUGF0dGVyblNwZWMqKTsKK3RlbXBsYXRlPD4gdm9pZCBmcmVl T3duZWRHUHRyPEdEaXI+KEdEaXIqKTsKK3RlbXBsYXRlPD4gdm9pZCBmcmVlT3duZWRHUHRyPEdI YXNoVGFibGU+KEdIYXNoVGFibGUqKTsKKwordGVtcGxhdGUgPHR5cGVuYW1lIFQ+IGNsYXNzIEdP d25QdHIgOiBwdWJsaWMgTm9uY29weWFibGUgeworcHVibGljOgorICAgIGV4cGxpY2l0IEdPd25Q dHIoVCogcHRyID0gMCkgOiBtX3B0cihwdHIpIHsgfQorICAgIH5HT3duUHRyKCkgeyBmcmVlT3du ZWRHUHRyKG1fcHRyKTsgfQorCisgICAgVCogZ2V0KCkgY29uc3QgeyByZXR1cm4gbV9wdHI7IH0K KyAgICBUKiByZWxlYXNlKCkKKyAgICB7CisgICAgICAgIFQqIHB0ciA9IG1fcHRyOworICAgICAg ICBtX3B0ciA9IDA7CisgICAgICAgIHJldHVybiBwdHI7CisgICAgfQorCisgICAgVComIG91dFB0 cigpCisgICAgeworICAgICAgICBBU1NFUlQoIW1fcHRyKTsKKyAgICAgICAgcmV0dXJuIG1fcHRy OwogICAgIH0KLSAgICAKLSAgICB0ZW1wbGF0ZSA8dHlwZW5hbWUgVCwgdHlwZW5hbWUgVT4gaW5s aW5lIGJvb2wgb3BlcmF0b3I9PShUKiBhLCBjb25zdCBHT3duUHRyPFU+JiBiKSAKKworICAgIHZv aWQgc2V0KFQqIHB0cikKICAgICB7Ci0gICAgICAgIHJldHVybiBhID09IGIuZ2V0KCk7IAorICAg ICAgICBBU1NFUlQoIXB0ciB8fCBtX3B0ciAhPSBwdHIpOworICAgICAgICBmcmVlT3duZWRHUHRy KG1fcHRyKTsKKyAgICAgICAgbV9wdHIgPSBwdHI7CiAgICAgfQogCi0gICAgdGVtcGxhdGUgPHR5 cGVuYW1lIFQsIHR5cGVuYW1lIFU+IGlubGluZSBib29sIG9wZXJhdG9yIT0oY29uc3QgR093blB0 cjxUPiYgYSwgVSogYikKKyAgICB2b2lkIGNsZWFyKCkKICAgICB7Ci0gICAgICAgIHJldHVybiBh LmdldCgpICE9IGI7IAorICAgICAgICBmcmVlT3duZWRHUHRyKG1fcHRyKTsKKyAgICAgICAgbV9w dHIgPSAwOwogICAgIH0KIAotICAgIHRlbXBsYXRlIDx0eXBlbmFtZSBULCB0eXBlbmFtZSBVPiBp bmxpbmUgYm9vbCBvcGVyYXRvciE9KFQqIGEsIGNvbnN0IEdPd25QdHI8VT4mIGIpCi0gICAgeyAK LSAgICAgICAgcmV0dXJuIGEgIT0gYi5nZXQoKTsgCisgICAgVCYgb3BlcmF0b3IqKCkgY29uc3QK KyAgICB7CisgICAgICAgIEFTU0VSVChtX3B0cik7CisgICAgICAgIHJldHVybiAqbV9wdHI7CiAg ICAgfQotICAgIAotICAgIHRlbXBsYXRlIDx0eXBlbmFtZSBUPiBpbmxpbmUgdHlwZW5hbWUgR093 blB0cjxUPjo6UHRyVHlwZSBnZXRQdHIoY29uc3QgR093blB0cjxUPiYgcCkKKworICAgIFQqIG9w ZXJhdG9yLT4oKSBjb25zdAogICAgIHsKLSAgICAgICAgcmV0dXJuIHAuZ2V0KCk7CisgICAgICAg IEFTU0VSVChtX3B0cik7CisgICAgICAgIHJldHVybiBtX3B0cjsKICAgICB9CiAKKyAgICBib29s IG9wZXJhdG9yISgpIGNvbnN0IHsgcmV0dXJuICFtX3B0cjsgfQorCisgICAgLy8gVGhpcyBjb252 ZXJzaW9uIG9wZXJhdG9yIGFsbG93cyBpbXBsaWNpdCBjb252ZXJzaW9uIHRvIGJvb2wgYnV0IG5v dCB0byBvdGhlciBpbnRlZ2VyIHR5cGVzLgorICAgIHR5cGVkZWYgVCogR093blB0cjo6KlVuc3Bl Y2lmaWVkQm9vbFR5cGU7CisgICAgb3BlcmF0b3IgVW5zcGVjaWZpZWRCb29sVHlwZSgpIGNvbnN0 IHsgcmV0dXJuIG1fcHRyID8gJkdPd25QdHI6Om1fcHRyIDogMDsgfQorCisgICAgdm9pZCBzd2Fw KEdPd25QdHImIG8pIHsgc3RkOjpzd2FwKG1fcHRyLCBvLm1fcHRyKTsgfQorCitwcml2YXRlOgor ICAgIFQqIG1fcHRyOworfTsKKwordGVtcGxhdGUgPHR5cGVuYW1lIFQ+IGlubGluZSB2b2lkIHN3 YXAoR093blB0cjxUPiYgYSwgR093blB0cjxUPiYgYikKK3sKKyAgICBhLnN3YXAoYik7Cit9CisK K3RlbXBsYXRlIDx0eXBlbmFtZSBULCB0eXBlbmFtZSBVPiBpbmxpbmUgYm9vbCBvcGVyYXRvcj09 KGNvbnN0IEdPd25QdHI8VD4mIGEsIFUqIGIpCit7IAorICAgIHJldHVybiBhLmdldCgpID09IGI7 IAorfQorCit0ZW1wbGF0ZSA8dHlwZW5hbWUgVCwgdHlwZW5hbWUgVT4gaW5saW5lIGJvb2wgb3Bl cmF0b3I9PShUKiBhLCBjb25zdCBHT3duUHRyPFU+JiBiKSAKK3sKKyAgICByZXR1cm4gYSA9PSBi LmdldCgpOyAKK30KKwordGVtcGxhdGUgPHR5cGVuYW1lIFQsIHR5cGVuYW1lIFU+IGlubGluZSBi b29sIG9wZXJhdG9yIT0oY29uc3QgR093blB0cjxUPiYgYSwgVSogYikKK3sKKyAgICByZXR1cm4g YS5nZXQoKSAhPSBiOyAKK30KKwordGVtcGxhdGUgPHR5cGVuYW1lIFQsIHR5cGVuYW1lIFU+IGlu bGluZSBib29sIG9wZXJhdG9yIT0oVCogYSwgY29uc3QgR093blB0cjxVPiYgYikKK3sgCisgICAg cmV0dXJuIGEgIT0gYi5nZXQoKTsgCit9CisKK3RlbXBsYXRlIDx0eXBlbmFtZSBUPiBpbmxpbmUg dHlwZW5hbWUgR093blB0cjxUPjo6UHRyVHlwZSBnZXRQdHIoY29uc3QgR093blB0cjxUPiYgcCkK K3sKKyAgICByZXR1cm4gcC5nZXQoKTsKK30KKwordGVtcGxhdGUgPHR5cGVuYW1lIFQ+IGlubGlu ZSB2b2lkIGZyZWVPd25lZEdQdHIoVCogcHRyKQoreworICAgIGdfZnJlZShwdHIpOworfQorCiB9 IC8vIG5hbWVzcGFjZSBXVEYKIAogdXNpbmcgV1RGOjpHT3duUHRyOwotLSAKMS42LjAuNAoK