21603 2008-10-14 15:18:33 -0700 [GTK] Minor fixes to GOwnPtr 2008-10-17 14:17:19 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC All RESOLVED FIXED Gtk P2 Normal --- 1 marco.barisione marco.barisione oldest_to_newest 95365 0 marco.barisione 2008-10-14 15:18:33 -0700 As Darin asked on comment 10 to bug #20483 we should fix some minor issues in GOwnPtr: - Style fixes - freeOwnedPtr should be renamed to make it clear that it's for glib - rawPtr should assert that the pointer is null - rawPtr should have a better name 95370 1 24351 marco.barisione 2008-10-14 16:13:40 -0700 Created attachment 24351 Patcj 95774 2 jmalonzo 2008-10-17 14:17:19 -0700 Landed in r37660 24351 2008-10-14 16:13:40 -0700 2008-10-14 23:26:59 -0700 Patcj gownptr-minor-fixes.patch text/plain 5757 marco.barisione SW5kZXg6IEphdmFTY3JpcHRDb3JlL3d0Zi9HT3duUHRyLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZh U2NyaXB0Q29yZS93dGYvR093blB0ci5jcHAJKHJldmlzaW9uIDM3NTk1KQorKysgSmF2YVNjcmlw dENvcmUvd3RmL0dPd25QdHIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMSwzNiArMjEsMzYgQEAK IAogbmFtZXNwYWNlIFdURiB7CiAKLXRlbXBsYXRlIDw+IHZvaWQgZnJlZU93bmVkUHRyPEdFcnJv cj4oR0Vycm9yKiBwdHIpCit0ZW1wbGF0ZSA8PiB2b2lkIGZyZWVPd25lZEdQdHI8R0Vycm9yPihH RXJyb3IqIHB0cikKIHsKICAgICBpZiAocHRyKQogICAgICAgICBnX2Vycm9yX2ZyZWUocHRyKTsK IH0KIAotdGVtcGxhdGUgPD4gdm9pZCBmcmVlT3duZWRQdHI8R0xpc3Q+KEdMaXN0KiBwdHIpCit0 ZW1wbGF0ZSA8PiB2b2lkIGZyZWVPd25lZEdQdHI8R0xpc3Q+KEdMaXN0KiBwdHIpCiB7CiAgICAg Z19saXN0X2ZyZWUocHRyKTsKIH0KIAotdGVtcGxhdGUgPD4gdm9pZCBmcmVlT3duZWRQdHI8R0Nv bmQ+KEdDb25kKiBwdHIpCit0ZW1wbGF0ZSA8PiB2b2lkIGZyZWVPd25lZEdQdHI8R0NvbmQ+KEdD b25kKiBwdHIpCiB7CiAgICAgaWYgKHB0cikKICAgICAgICAgZ19jb25kX2ZyZWUocHRyKTsKIH0K IAotdGVtcGxhdGUgPD4gdm9pZCBmcmVlT3duZWRQdHI8R011dGV4PihHTXV0ZXgqIHB0cikKK3Rl bXBsYXRlIDw+IHZvaWQgZnJlZU93bmVkR1B0cjxHTXV0ZXg+KEdNdXRleCogcHRyKQogewogICAg IGlmIChwdHIpCiAgICAgICAgIGdfbXV0ZXhfZnJlZShwdHIpOwogfQogCi10ZW1wbGF0ZSA8PiB2 b2lkIGZyZWVPd25lZFB0cjxHUGF0dGVyblNwZWM+KEdQYXR0ZXJuU3BlYyogcHRyKQordGVtcGxh dGUgPD4gdm9pZCBmcmVlT3duZWRHUHRyPEdQYXR0ZXJuU3BlYz4oR1BhdHRlcm5TcGVjKiBwdHIp CiB7CiAgICAgaWYgKHB0cikKICAgICAgICAgZ19wYXR0ZXJuX3NwZWNfZnJlZShwdHIpOwogfQog Ci10ZW1wbGF0ZSA8PiB2b2lkIGZyZWVPd25lZFB0cjxHRGlyPihHRGlyKiBwdHIpCit0ZW1wbGF0 ZSA8PiB2b2lkIGZyZWVPd25lZEdQdHI8R0Rpcj4oR0RpciogcHRyKQogewogICAgIGlmIChwdHIp CiAgICAgICAgIGdfZGlyX2Nsb3NlKHB0cik7CkluZGV4OiBKYXZhU2NyaXB0Q29yZS93dGYvVGhy ZWFkaW5nLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gSmF2YVNjcmlwdENvcmUvd3RmL1RocmVhZGluZy5oCShy ZXZpc2lvbiAzNzU5NSkKKysrIEphdmFTY3JpcHRDb3JlL3d0Zi9UaHJlYWRpbmcuaAkod29ya2lu ZyBjb3B5KQpAQCAtNjIsNiArNjIsNyBAQAogI2luY2x1ZGUgPHd0Zi9Bc3NlcnRpb25zLmg+CiAj aW5jbHVkZSA8d3RmL0xvY2tlci5oPgogI2luY2x1ZGUgPHd0Zi9Ob25jb3B5YWJsZS5oPgorCiAj aWYgUExBVEZPUk0oR1RLKQogI2luY2x1ZGUgPHd0Zi9HT3duUHRyLmg+CiAjZW5kaWYKSW5kZXg6 IEphdmFTY3JpcHRDb3JlL3d0Zi9HT3duUHRyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gSmF2YVNjcmlwdENv cmUvd3RmL0dPd25QdHIuaAkocmV2aXNpb24gMzc1OTUpCisrKyBKYXZhU2NyaXB0Q29yZS93dGYv R093blB0ci5oCSh3b3JraW5nIGNvcHkpCkBAIC0yOCwyNSArMjgsMjUgQEAKICNpbmNsdWRlIDx3 dGYvTm9uY29weWFibGUuaD4KIAogbmFtZXNwYWNlIFdURiB7Ci0gICAgdGVtcGxhdGUgPHR5cGVu YW1lIFQ+IGlubGluZSB2b2lkIGZyZWVPd25lZFB0cihUKiBwdHIpIHsgZ19mcmVlKHJlaW50ZXJw cmV0X2Nhc3Q8dm9pZCo+KHB0cikpOyB9Ci0gICAgdGVtcGxhdGU8PiB2b2lkIGZyZWVPd25lZFB0 cjxHRXJyb3I+KEdFcnJvciopOwotICAgIHRlbXBsYXRlPD4gdm9pZCBmcmVlT3duZWRQdHI8R0xp c3Q+KEdMaXN0Kik7Ci0gICAgdGVtcGxhdGU8PiB2b2lkIGZyZWVPd25lZFB0cjxHQ29uZD4oR0Nv bmQqKTsKLSAgICB0ZW1wbGF0ZTw+IHZvaWQgZnJlZU93bmVkUHRyPEdNdXRleD4oR011dGV4Kik7 Ci0gICAgdGVtcGxhdGU8PiB2b2lkIGZyZWVPd25lZFB0cjxHUGF0dGVyblNwZWM+KEdQYXR0ZXJu U3BlYyopOwotICAgIHRlbXBsYXRlPD4gdm9pZCBmcmVlT3duZWRQdHI8R0Rpcj4oR0RpciopOwor ICAgIHRlbXBsYXRlIDx0eXBlbmFtZSBUPiBpbmxpbmUgdm9pZCBmcmVlT3duZWRHUHRyKFQqIHB0 cikgeyBnX2ZyZWUocmVpbnRlcnByZXRfY2FzdDx2b2lkKj4ocHRyKSk7IH0KKyAgICB0ZW1wbGF0 ZTw+IHZvaWQgZnJlZU93bmVkR1B0cjxHRXJyb3I+KEdFcnJvciopOworICAgIHRlbXBsYXRlPD4g dm9pZCBmcmVlT3duZWRHUHRyPEdMaXN0PihHTGlzdCopOworICAgIHRlbXBsYXRlPD4gdm9pZCBm cmVlT3duZWRHUHRyPEdDb25kPihHQ29uZCopOworICAgIHRlbXBsYXRlPD4gdm9pZCBmcmVlT3du ZWRHUHRyPEdNdXRleD4oR011dGV4Kik7CisgICAgdGVtcGxhdGU8PiB2b2lkIGZyZWVPd25lZEdQ dHI8R1BhdHRlcm5TcGVjPihHUGF0dGVyblNwZWMqKTsKKyAgICB0ZW1wbGF0ZTw+IHZvaWQgZnJl ZU93bmVkR1B0cjxHRGlyPihHRGlyKik7CiAKICAgICB0ZW1wbGF0ZSA8dHlwZW5hbWUgVD4gY2xh c3MgR093blB0ciA6IE5vbmNvcHlhYmxlIHsKICAgICBwdWJsaWM6CiAgICAgICAgIGV4cGxpY2l0 IEdPd25QdHIoVCogcHRyID0gMCkgOiBtX3B0cihwdHIpIHsgfQotICAgICAgICB+R093blB0cigp IHsgZnJlZU93bmVkUHRyKG1fcHRyKTsgfQorICAgICAgICB+R093blB0cigpIHsgZnJlZU93bmVk R1B0cihtX3B0cik7IH0KIAogICAgICAgICBUKiBnZXQoKSBjb25zdCB7IHJldHVybiBtX3B0cjsg fQogICAgICAgICBUKiByZWxlYXNlKCkgeyBUKiBwdHIgPSBtX3B0cjsgbV9wdHIgPSAwOyByZXR1 cm4gcHRyOyB9Ci0gICAgICAgIFQqJiByYXdQdHIoKSB7IHJldHVybiBtX3B0cjsgfQorICAgICAg ICBUKiYgb3V0UHRyKCkgeyBBU1NFUlQoIW1fcHRyKTsgcmV0dXJuIG1fcHRyOyB9CiAKLSAgICAg ICAgdm9pZCBzZXQoVCogcHRyKSB7IEFTU0VSVCghcHRyIHx8IG1fcHRyICE9IHB0cik7IGZyZWVP d25lZFB0cihtX3B0cik7IG1fcHRyID0gcHRyOyB9Ci0gICAgICAgIHZvaWQgY2xlYXIoKSB7IGZy ZWVPd25lZFB0cihtX3B0cik7IG1fcHRyID0gMDsgfQorICAgICAgICB2b2lkIHNldChUKiBwdHIp IHsgQVNTRVJUKCFwdHIgfHwgbV9wdHIgIT0gcHRyKTsgZnJlZU93bmVkR1B0cihtX3B0cik7IG1f cHRyID0gcHRyOyB9CisgICAgICAgIHZvaWQgY2xlYXIoKSB7IGZyZWVPd25lZEdQdHIobV9wdHIp OyBtX3B0ciA9IDA7IH0KIAogICAgICAgICBUJiBvcGVyYXRvciooKSBjb25zdCB7IEFTU0VSVCht X3B0cik7IHJldHVybiAqbV9wdHI7IH0KICAgICAgICAgVCogb3BlcmF0b3ItPigpIGNvbnN0IHsg QVNTRVJUKG1fcHRyKTsgcmV0dXJuIG1fcHRyOyB9CkluZGV4OiBKYXZhU2NyaXB0Q29yZS9DaGFu Z2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCShyZXZpc2lvbiAz NzU5NSkKKysrIEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI2IEBACisyMDA4LTEwLTE0ICBNYXJjbyBCYXJpc2lvbmUgIDxtYXJjby5iYXJpc2lvbmVA Y29sbGFib3JhLmNvLnVrPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTYwMwor ICAgICAgICBbR1RLXSBNaW5vciBmaXhlcyB0byBHT3duUHRyCisKKyAgICAgICAgKiB3dGYvR093 blB0ci5jcHA6IFJlbmFtZSBmcmVlT3dubmVkUHRyIHRvIGZyZWVPd25lZEdQdHIuCisgICAgICAg IChXVEY6OkdFcnJvcik6CisgICAgICAgIChXVEY6OkdMaXN0KToKKyAgICAgICAgKFdURjo6R0Nv bmQpOgorICAgICAgICAoV1RGOjpHTXV0ZXgpOgorICAgICAgICAoV1RGOjpHUGF0dGVyblNwZWMp OgorICAgICAgICAoV1RGOjpHRGlyKToKKyAgICAgICAgKiB3dGYvR093blB0ci5oOiBSZW5hbWUg ZnJlZU93bmVkR1B0ciB0byBmcmVlT3duZWRHUHRyIGFuZCByYXdQdHIgdG8KKyAgICAgICAgb3V0 UHRyLgorICAgICAgICAoV1RGOjpmcmVlT3duZWRHUHRyKToKKyAgICAgICAgKFdURjo6R093blB0 cjo6fkdPd25QdHIpOgorICAgICAgICAoV1RGOjpHT3duUHRyOjpvdXRQdHIpOgorICAgICAgICAo V1RGOjpHT3duUHRyOjpzZXQpOgorICAgICAgICAoV1RGOjpHT3duUHRyOjpjbGVhcik6CisgICAg ICAgICogd3RmL1RocmVhZGluZy5oOiBTdHlsZSBmaXhlcy4KKwogMjAwOC0xMC0xNCAgQWxleGV5 IFByb3NrdXJ5YWtvdiAgPGFwQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFy aW4gQWRsZXIuCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2d0ay9NZWRpYVBsYXll clByaXZhdGVHU3RyZWFtZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvZ3RrL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAJKHJldmlzaW9uIDM3NTk1 KQorKysgV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ndGsvTWVkaWFQbGF5ZXJQcml2YXRlR1N0 cmVhbWVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTcsNyArNTcsNyBAQAogICAgICAgICBHT3du UHRyPEdFcnJvcj4gZXJyOwogICAgICAgICBHT3duUHRyPGdjaGFyPiBkZWJ1ZzsKIAotICAgICAg ICBnc3RfbWVzc2FnZV9wYXJzZV9lcnJvcihtZXNzYWdlLCAmZXJyLnJhd1B0cigpLCAmZGVidWcu cmF3UHRyKCkpOworICAgICAgICBnc3RfbWVzc2FnZV9wYXJzZV9lcnJvcihtZXNzYWdlLCAmZXJy Lm91dFB0cigpLCAmZGVidWcub3V0UHRyKCkpOwogICAgICAgICBpZiAoZXJyLT5jb2RlID09IDMp IHsKICAgICAgICAgICAgIExPR19WRVJCT1NFKE1lZGlhLCAiRmlsZSBub3QgZm91bmQiKTsKICAg ICAgICAgICAgIE1lZGlhUGxheWVyUHJpdmF0ZSogbXAgPSByZWludGVycHJldF9jYXN0PE1lZGlh UGxheWVyUHJpdmF0ZSo+KGRhdGEpOwpJbmRleDogV2ViQ29yZS9DaGFuZ2VMb2cKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViQ29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDM3NTk1KQorKysgV2ViQ29yZS9DaGFu Z2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxMSBAQAorMjAwOC0xMC0xNCAgTWFyY28g QmFyaXNpb25lICA8bWFyY28uYmFyaXNpb25lQGNvbGxhYm9yYS5jby51az4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNz L2d0ay9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 bWVkaWFQbGF5ZXJQcml2YXRlRXJyb3JDYWxsYmFjayk6IEdPd25QdHI6OnJhd1B0ciBoYXMgYmVl bgorICAgICAgICByZW5hbWVkIHRvIG91dFB0cgorCiAyMDA4LTEwLTE0ICBDaHJpcyBNYXJyaW4g IDxjbWFycmluQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4K