77191 2012-01-27 01:16:36 -0800 [GTK] Add a GKeyFile especialization to GOwnPtr 2012-01-27 06:27:43 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 1 cgarcia webkit-unassigned gustavo oldest_to_newest 543883 0 cgarcia 2012-01-27 01:16:36 -0800 It's used by printing code in WebKit2 543934 1 124284 cgarcia 2012-01-27 03:29:46 -0800 Created attachment 124284 Patch 544022 2 cgarcia 2012-01-27 06:27:43 -0800 Committed r106117: <http://trac.webkit.org/changeset/106117> 124284 2012-01-27 03:29:46 -0800 2012-01-27 06:15:27 -0800 Patch wk-ownptr-keyfile.diff text/plain 6512 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IGY2NTg5ZWIuLjg1MjhhZjIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTAxLTI3ICBDYXJsb3MgR2FyY2lh IENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXSBBZGQgYSBHS2V5 RmlsZSBlc3BlY2lhbGl6YXRpb24gdG8gR093blB0cgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzcxOTEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIHd0Zi9nb2JqZWN0L0dPd25QdHIuY3BwOgorICAgICAg ICAoV1RGOjpHS2V5RmlsZSk6IEltcGxlbWVudCBmcmVlT3duZWRHUHRyIGZvciBHS2V5RmlsZS4K KyAgICAgICAgKiB3dGYvZ29iamVjdC9HT3duUHRyLmg6IEFkZCBHS2V5RmlsZSB0ZW1wbGF0ZS4K KyAgICAgICAgKiB3dGYvZ29iamVjdC9HVHlwZWRlZnMuaDogQWRkIGZvcndhcmQgZGVjbGFyYXRp b24gZm9yIEdLZXlGaWxlLgorCiAyMDEyLTAxLTI1ICBZdXJ5IFNlbWlraGF0c2t5ICA8eXVyeXNA Y2hyb21pdW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IHNob3VsZCBiZSBwb3NzaWJs ZSB0byBvcGVuIGZ1bmN0aW9uIGRlY2xhcmF0aW9uIGZyb20gc2NyaXB0IHBvcG92ZXIKZGlmZiAt LWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93dGYvZ29iamVjdC9HT3duUHRyLmNwcCBiL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS93dGYvZ29iamVjdC9HT3duUHRyLmNwcAppbmRleCA0MTU4Njg5 Li5jNzI3OTU2IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd3RmL2dvYmplY3Qv R093blB0ci5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3d0Zi9nb2JqZWN0L0dPd25Q dHIuY3BwCkBAIC01NSw2ICs1NSwxMiBAQCB0ZW1wbGF0ZSA8PiB2b2lkIGZyZWVPd25lZEdQdHI8 R1RpbWVyPihHVGltZXIqIHB0cikKICAgICAgICAgZ190aW1lcl9kZXN0cm95KHB0cik7CiB9CiAK K3RlbXBsYXRlIDw+IHZvaWQgZnJlZU93bmVkR1B0cjxHS2V5RmlsZT4oR0tleUZpbGUqIHB0cikK K3sKKyAgICBpZiAocHRyKQorICAgICAgICBnX2tleV9maWxlX2ZyZWUocHRyKTsKK30KKwogfSAv LyBuYW1lc3BhY2UgV1RGCiAKICNlbmRpZiAvLyBFTkFCTEUoR0xJQl9TVVBQT1JUKQpkaWZmIC0t Z2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3d0Zi9nb2JqZWN0L0dPd25QdHIuaCBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS93dGYvZ29iamVjdC9HT3duUHRyLmgKaW5kZXggNTkzYjgzOC4uMjIx OTcxZiAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3d0Zi9nb2JqZWN0L0dPd25Q dHIuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd3RmL2dvYmplY3QvR093blB0ci5oCkBA IC0zOCw2ICszOCw3IEBAIHRlbXBsYXRlPD4gdm9pZCBmcmVlT3duZWRHUHRyPEdMaXN0PihHTGlz dCopOwogdGVtcGxhdGU8PiB2b2lkIGZyZWVPd25lZEdQdHI8R1BhdHRlcm5TcGVjPihHUGF0dGVy blNwZWMqKTsKIHRlbXBsYXRlPD4gdm9pZCBmcmVlT3duZWRHUHRyPEdEaXI+KEdEaXIqKTsKIHRl bXBsYXRlPD4gdm9pZCBmcmVlT3duZWRHUHRyPEdUaW1lcj4oR1RpbWVyKik7Cit0ZW1wbGF0ZTw+ IHZvaWQgZnJlZU93bmVkR1B0cjxHS2V5RmlsZT4oR0tleUZpbGUqKTsKIAogdGVtcGxhdGUgPHR5 cGVuYW1lIFQ+IGNsYXNzIEdPd25QdHIgewogICAgIFdURl9NQUtFX05PTkNPUFlBQkxFKEdPd25Q dHIpOwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3d0Zi9nb2JqZWN0L0dUeXBl ZGVmcy5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3d0Zi9nb2JqZWN0L0dUeXBlZGVmcy5oCmlu ZGV4IDIyYTBhYTIuLmUyYjJiYTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93 dGYvZ29iamVjdC9HVHlwZWRlZnMuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd3RmL2dv YmplY3QvR1R5cGVkZWZzLmgKQEAgLTU5LDYgKzU5LDcgQEAgdHlwZWRlZiBzdHJ1Y3QgX0dTb3Vy Y2UgR1NvdXJjZTsKIHR5cGVkZWYgc3RydWN0IF9HVmFyaWFudCBHVmFyaWFudDsKIHR5cGVkZWYg dW5pb24gX0dka0V2ZW50IEdka0V2ZW50OwogdHlwZWRlZiBzdHJ1Y3QgX0dUaW1lciBHVGltZXI7 Cit0eXBlZGVmIHN0cnVjdCBfR0tleUZpbGUgR0tleUZpbGU7CiAKICNpZiBVU0UoQ0FJUk8pCiB0 eXBlZGVmIHN0cnVjdCBfY2Fpcm9fc3VyZmFjZSBjYWlyb19zdXJmYWNlX3Q7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5k ZXggZGIxMTAxOS4uM2E3NTI4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTAx LTI3ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KKworICAgICAg ICBbR1RLXSBBZGQgYSBHS2V5RmlsZSBlc3BlY2lhbGl6YXRpb24gdG8gR093blB0cgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzcxOTEKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNoYXJlZC9ndGsvQXJn dW1lbnRDb2RlcnNHdGsuY3BwOgorICAgICAgICAoQ29yZUlQQzo6ZGVjb2RlR0tleUZpbGUpOiBV c2UgR093blB0ciBmb3IgR0tleUZpbGUuCisgICAgICAgIChDb3JlSVBDOjplbmNvZGUpOiBEaXR0 by4KKyAgICAgICAgKENvcmVJUEM6OmRlY29kZSk6IERpdHRvLgorCiAyMDEyLTAxLTI2ICBDYXJs b3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBB ZGQgYmFzaWMgcHJpbnRpbmcgc3VwcG9ydCB0byBXZWJLaXQyCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9TaGFyZWQvZ3RrL0FyZ3VtZW50Q29kZXJzR3RrLmNwcCBiL1NvdXJjZS9XZWJLaXQy L1NoYXJlZC9ndGsvQXJndW1lbnRDb2RlcnNHdGsuY3BwCmluZGV4IGFkOTNjNTUuLjhiODAyZTkg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9ndGsvQXJndW1lbnRDb2RlcnNHdGsu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9ndGsvQXJndW1lbnRDb2RlcnNHdGsuY3Bw CkBAIC0yMjYsMjEgKzIyNiwxOCBAQCBzdGF0aWMgdm9pZCBlbmNvZGVHS2V5RmlsZShBcmd1bWVu dEVuY29kZXIqIGVuY29kZXIsIEdLZXlGaWxlKiBrZXlGaWxlKQogICAgIGVuY29kZXItPmVuY29k ZShkYXRhUmVmZXJlbmNlKTsKIH0KIAotc3RhdGljIGJvb2wgZGVjb2RlR0tleUZpbGUoQXJndW1l bnREZWNvZGVyKiBkZWNvZGVyLCBHS2V5RmlsZSoqIGtleUZpbGUpCitzdGF0aWMgYm9vbCBkZWNv ZGVHS2V5RmlsZShBcmd1bWVudERlY29kZXIqIGRlY29kZXIsIEdPd25QdHI8R0tleUZpbGU+JiBr ZXlGaWxlKQogewogICAgIERhdGFSZWZlcmVuY2UgZGF0YVJlZmVyZW5jZTsKICAgICBpZiAoIWRl Y29kZXItPmRlY29kZShkYXRhUmVmZXJlbmNlKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0g ICAgaWYgKCFkYXRhUmVmZXJlbmNlLnNpemUoKSkgewotICAgICAgICAqa2V5RmlsZSA9IDA7Cisg ICAgaWYgKCFkYXRhUmVmZXJlbmNlLnNpemUoKSkKICAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAg fQogCi0gICAgKmtleUZpbGUgPSBnX2tleV9maWxlX25ldygpOwotICAgIGlmICghZ19rZXlfZmls ZV9sb2FkX2Zyb21fZGF0YSgqa2V5RmlsZSwgcmVpbnRlcnByZXRfY2FzdDxjb25zdCBnY2hhcio+ KGRhdGFSZWZlcmVuY2UuZGF0YSgpKSwgZGF0YVJlZmVyZW5jZS5zaXplKCksIEdfS0VZX0ZJTEVf Tk9ORSwgMCkpIHsKLSAgICAgICAgZ19rZXlfZmlsZV9mcmVlKCprZXlGaWxlKTsKLSAgICAgICAg KmtleUZpbGUgPSAwOworICAgIGtleUZpbGUuc2V0KGdfa2V5X2ZpbGVfbmV3KCkpOworICAgIGlm ICghZ19rZXlfZmlsZV9sb2FkX2Zyb21fZGF0YShrZXlGaWxlLmdldCgpLCByZWludGVycHJldF9j YXN0PGNvbnN0IGdjaGFyKj4oZGF0YVJlZmVyZW5jZS5kYXRhKCkpLCBkYXRhUmVmZXJlbmNlLnNp emUoKSwgR19LRVlfRklMRV9OT05FLCAwKSkgeworICAgICAgICBrZXlGaWxlLmNsZWFyKCk7CiAg ICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9CiAKQEAgLTI0OSw1MCArMjQ2LDQ2IEBAIHN0YXRp YyBib29sIGRlY29kZUdLZXlGaWxlKEFyZ3VtZW50RGVjb2RlciogZGVjb2RlciwgR0tleUZpbGUq KiBrZXlGaWxlKQogCiB2b2lkIGVuY29kZShBcmd1bWVudEVuY29kZXIqIGVuY29kZXIsIEd0a1By aW50U2V0dGluZ3MqIHByaW50U2V0dGluZ3MpCiB7Ci0gICAgR0tleUZpbGUqIGtleUZpbGUgPSBn X2tleV9maWxlX25ldygpOwotICAgIGd0a19wcmludF9zZXR0aW5nc190b19rZXlfZmlsZShwcmlu dFNldHRpbmdzLCBrZXlGaWxlLCAiUHJpbnQgU2V0dGluZ3MiKTsKLSAgICBlbmNvZGVHS2V5Rmls ZShlbmNvZGVyLCBrZXlGaWxlKTsKLSAgICBnX2tleV9maWxlX2ZyZWUoa2V5RmlsZSk7CisgICAg R093blB0cjxHS2V5RmlsZT4ga2V5RmlsZShnX2tleV9maWxlX25ldygpKTsKKyAgICBndGtfcHJp bnRfc2V0dGluZ3NfdG9fa2V5X2ZpbGUocHJpbnRTZXR0aW5ncywga2V5RmlsZS5nZXQoKSwgIlBy aW50IFNldHRpbmdzIik7CisgICAgZW5jb2RlR0tleUZpbGUoZW5jb2Rlciwga2V5RmlsZS5nZXQo KSk7CiB9CiAKIGJvb2wgZGVjb2RlKEFyZ3VtZW50RGVjb2RlciogZGVjb2RlciwgR1JlZlB0cjxH dGtQcmludFNldHRpbmdzPiYgcHJpbnRTZXR0aW5ncykKIHsKLSAgICBHS2V5RmlsZSoga2V5Rmls ZTsKLSAgICBpZiAoIWRlY29kZUdLZXlGaWxlKGRlY29kZXIsICZrZXlGaWxlKSkKKyAgICBHT3du UHRyPEdLZXlGaWxlPiBrZXlGaWxlOworICAgIGlmICghZGVjb2RlR0tleUZpbGUoZGVjb2Rlciwg a2V5RmlsZSkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIHByaW50U2V0dGluZ3MgPSBh ZG9wdEdSZWYoZ3RrX3ByaW50X3NldHRpbmdzX25ldygpKTsKICAgICBpZiAoIWtleUZpbGUpCiAg ICAgICAgIHJldHVybiB0cnVlOwogCi0gICAgaWYgKCFndGtfcHJpbnRfc2V0dGluZ3NfbG9hZF9r ZXlfZmlsZShwcmludFNldHRpbmdzLmdldCgpLCBrZXlGaWxlLCAiUHJpbnQgU2V0dGluZ3MiLCAw KSkKKyAgICBpZiAoIWd0a19wcmludF9zZXR0aW5nc19sb2FkX2tleV9maWxlKHByaW50U2V0dGlu Z3MuZ2V0KCksIGtleUZpbGUuZ2V0KCksICJQcmludCBTZXR0aW5ncyIsIDApKQogICAgICAgICBw cmludFNldHRpbmdzID0gMDsKLSAgICBnX2tleV9maWxlX2ZyZWUoa2V5RmlsZSk7CiAKICAgICBy ZXR1cm4gcHJpbnRTZXR0aW5nczsKIH0KIAogdm9pZCBlbmNvZGUoQXJndW1lbnRFbmNvZGVyKiBl bmNvZGVyLCBHdGtQYWdlU2V0dXAqIHBhZ2VTZXR1cCkKIHsKLSAgICBHS2V5RmlsZSoga2V5Rmls ZSA9IGdfa2V5X2ZpbGVfbmV3KCk7Ci0gICAgZ3RrX3BhZ2Vfc2V0dXBfdG9fa2V5X2ZpbGUocGFn ZVNldHVwLCBrZXlGaWxlLCAiUGFnZSBTZXR1cCIpOwotICAgIGVuY29kZUdLZXlGaWxlKGVuY29k ZXIsIGtleUZpbGUpOwotICAgIGdfa2V5X2ZpbGVfZnJlZShrZXlGaWxlKTsKKyAgICBHT3duUHRy PEdLZXlGaWxlPiBrZXlGaWxlKGdfa2V5X2ZpbGVfbmV3KCkpOworICAgIGd0a19wYWdlX3NldHVw X3RvX2tleV9maWxlKHBhZ2VTZXR1cCwga2V5RmlsZS5nZXQoKSwgIlBhZ2UgU2V0dXAiKTsKKyAg ICBlbmNvZGVHS2V5RmlsZShlbmNvZGVyLCBrZXlGaWxlLmdldCgpKTsKIH0KIAogYm9vbCBkZWNv ZGUoQXJndW1lbnREZWNvZGVyKiBkZWNvZGVyLCBHUmVmUHRyPEd0a1BhZ2VTZXR1cD4mIHBhZ2VT ZXR1cCkKIHsKLSAgICBHS2V5RmlsZSoga2V5RmlsZTsKLSAgICBpZiAoIWRlY29kZUdLZXlGaWxl KGRlY29kZXIsICZrZXlGaWxlKSkKKyAgICBHT3duUHRyPEdLZXlGaWxlPiBrZXlGaWxlOworICAg IGlmICghZGVjb2RlR0tleUZpbGUoZGVjb2Rlciwga2V5RmlsZSkpCiAgICAgICAgIHJldHVybiBm YWxzZTsKIAogICAgIHBhZ2VTZXR1cCA9IGFkb3B0R1JlZihndGtfcGFnZV9zZXR1cF9uZXcoKSk7 CiAgICAgaWYgKCFrZXlGaWxlKQogICAgICAgICByZXR1cm4gdHJ1ZTsKIAotICAgIGlmICghZ3Rr X3BhZ2Vfc2V0dXBfbG9hZF9rZXlfZmlsZShwYWdlU2V0dXAuZ2V0KCksIGtleUZpbGUsICJQYWdl IFNldHVwIiwgMCkpCisgICAgaWYgKCFndGtfcGFnZV9zZXR1cF9sb2FkX2tleV9maWxlKHBhZ2VT ZXR1cC5nZXQoKSwga2V5RmlsZS5nZXQoKSwgIlBhZ2UgU2V0dXAiLCAwKSkKICAgICAgICAgcGFn ZVNldHVwID0gMDsKLSAgICBnX2tleV9maWxlX2ZyZWUoa2V5RmlsZSk7CiAKICAgICByZXR1cm4g cGFnZVNldHVwOwogfQo=