21986 2008-10-30 13:36:52 -0700 adopt CFURLCopySharedURLCache 2008-10-30 14:17:38 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Normal --- 1 darin darin oldest_to_newest 97157 0 darin 2008-10-30 13:36:52 -0700 CFNetwork is changing this entry point in a future version and we need to update WebKit to cope with it. 97162 1 24780 darin 2008-10-30 13:50:49 -0700 Created attachment 24780 patch 97169 2 24780 sam 2008-10-30 14:14:45 -0700 Comment on attachment 24780 patch r=me 97171 3 darin 2008-10-30 14:17:38 -0700 http://trac.webkit.org/changeset/38010 24780 2008-10-30 13:50:49 -0700 2008-10-30 14:14:45 -0700 patch OpenSourceCFURLCachePatch.txt text/plain 3339 darin SW5kZXg6IFdlYktpdC93aW4vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC93aW4vQ2hh bmdlTG9nCShyZXZpc2lvbiAzODAwNikKKysrIFdlYktpdC93aW4vQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMDgtMTAtMzAgIERhcmluIEFkbGVyICA8ZGFyaW5A YXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIC0gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxOTg2CisgICAg ICAgICAgPHJkYXI6Ly9wcm9ibGVtLzYyOTQyODU+IGFkb3B0IENGVVJMQ29weVNoYXJlZFVSTENh Y2hlCisKKyAgICAgICAgKiBXZWJWaWV3LmNwcDoKKyAgICAgICAgKFdlYlZpZXc6OnNldENhY2hl TW9kZWwpOiBVc2UgQ0ZVUkxDb3B5U2hhcmVkVVJMQ2FjaGUgaWYgcHJlc2VudC4KKwogMjAwOC0x MC0zMCAgRGFuIEJlcm5zdGVpbiAgPG1pdHpAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2Vk IGJ5IFNhbSBXZWluaWcuCkluZGV4OiBXZWJLaXQvd2luL1dlYlZpZXcuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYktpdC93aW4vV2ViVmlldy5jcHAJKHJldmlzaW9uIDM4MDAzKQorKysgV2ViS2l0L3dp bi9XZWJWaWV3LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTA1LDcgKzEwNSw2IEBACiAjaW5jbHVk ZSA8Q0ZOZXR3b3JrL0NGVVJMQ2FjaGVQcml2Lmg+CiAjaW5jbHVkZSA8Q0ZOZXR3b3JrL0NGVVJM UHJvdG9jb2xQcml2Lmg+CiAjaW5jbHVkZSA8Q29yZUZvdW5kYXRpb24vQ29yZUZvdW5kYXRpb24u aD4KLSNpbmNsdWRlIDxXZWJLaXRTeXN0ZW1JbnRlcmZhY2UvV2ViS2l0U3lzdGVtSW50ZXJmYWNl Lmg+CiAjaW5jbHVkZSA8d3RmL0hhc2hTZXQuaD4KICNpbmNsdWRlIDxkaW1tLmg+CiAjaW5jbHVk ZSA8b2xlYWNjLmg+CkBAIC0zNjcsMTMgKzM2NiwxNiBAQCB2b2lkIFdlYlZpZXc6OnNldENhY2hl TW9kZWwoV2ViQ2FjaGVNb2RlCiAgICAgaWYgKHNfZGlkU2V0Q2FjaGVNb2RlbCAmJiBjYWNoZU1v ZGVsID09IHNfY2FjaGVNb2RlbCkKICAgICAgICAgcmV0dXJuOwogCi0gICAgUmV0YWluUHRyPENG U3RyaW5nUmVmPiBjZnVybENhY2hlRGlyZWN0b3J5KEFkb3B0Q0YsIHdrQ29weUZvdW5kYXRpb25D YWNoZURpcmVjdG9yeSgpKTsKKyNpZmRlZiBDRlVSTENhY2hlQ29weVNoYXJlZFVSTENhY2hlUHJl c2VudAorICAgIFJldGFpblB0cjxDRlVSTENhY2hlUmVmPiBjZnVybENhY2hlKEFkb3B0Q0YsIENG VVJMQ2FjaGVDb3B5U2hhcmVkVVJMQ2FjaGUoKSk7CisjZWxzZQorICAgIFJldGFpblB0cjxDRlVS TENhY2hlUmVmPiBjZnVybENhY2hlID0gQ0ZVUkxDYWNoZVNoYXJlZFVSTENhY2hlKCk7CisjZW5k aWYKKworICAgIFJldGFpblB0cjxDRlN0cmluZ1JlZj4gY2Z1cmxDYWNoZURpcmVjdG9yeShBZG9w dENGLCBfQ0ZVUkxDYWNoZUNvcHlDYWNoZURpcmVjdG9yeShjZnVybENhY2hlLmdldCgpKSk7CiAg ICAgaWYgKCFjZnVybENhY2hlRGlyZWN0b3J5KQogICAgICAgICBjZnVybENhY2hlRGlyZWN0b3J5 LmFkb3B0Q0YoV2ViQ29yZTo6bG9jYWxVc2VyU3BlY2lmaWNTdG9yYWdlRGlyZWN0b3J5KCkuY3Jl YXRlQ0ZTdHJpbmcoKSk7CiAKLQotICAgIENGVVJMQ2FjaGVSZWYgY2Z1cmxTaGFyZWRDYWNoZSA9 IENGVVJMQ2FjaGVTaGFyZWRVUkxDYWNoZSgpOwotCiAgICAgLy8gQXMgYSBmdWRnZSBmYWN0b3Is IHVzZSAxMDAwIGluc3RlYWQgb2YgMTAyNCwgaW4gY2FzZSB0aGUgcmVwb3J0ZWQgYnl0ZSAKICAg ICAvLyBjb3VudCBkb2Vzbid0IGFsaWduIGV4YWN0bHkgdG8gYSBtZWdhYnl0ZSBib3VuZGFyeS4K ICAgICB1bnNpZ25lZCBsb25nIGxvbmcgbWVtU2l6ZSA9IFdlYk1lbW9yeVNpemUoKSAvIDEwMjQg LyAxMDAwOwpAQCAtNDEzLDcgKzQxNSw3IEBAIHZvaWQgV2ViVmlldzo6c2V0Q2FjaGVNb2RlbChX ZWJDYWNoZU1vZGUKICAgICAgICAgY2Z1cmxDYWNoZU1lbW9yeUNhcGFjaXR5ID0gMDsKIAogICAg ICAgICAvLyBGb3VuZGF0aW9uIGRpc2sgY2FjaGUgY2FwYWNpdHkgKGluIGJ5dGVzKQotICAgICAg ICBjZnVybENhY2hlRGlza0NhcGFjaXR5ID0gQ0ZVUkxDYWNoZURpc2tDYXBhY2l0eShjZnVybFNo YXJlZENhY2hlKTsKKyAgICAgICAgY2Z1cmxDYWNoZURpc2tDYXBhY2l0eSA9IENGVVJMQ2FjaGVE aXNrQ2FwYWNpdHkoY2Z1cmxDYWNoZS5nZXQoKSk7CiAKICAgICAgICAgYnJlYWs7CiAgICAgfQpA QCAtNTMyLDE3ICs1MzQsMTcgQEAgdm9pZCBXZWJWaWV3OjpzZXRDYWNoZU1vZGVsKFdlYkNhY2hl TW9kZQogICAgIH0KICAgICBkZWZhdWx0OgogICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsK LSAgICB9OworICAgIH0KIAogICAgIC8vIERvbid0IHNocmluayBhIGJpZyBkaXNrIGNhY2hlLCBz aW5jZSB0aGF0IHdvdWxkIGNhdXNlIGNodXJuLgotICAgIGNmdXJsQ2FjaGVEaXNrQ2FwYWNpdHkg PSBtYXgoY2Z1cmxDYWNoZURpc2tDYXBhY2l0eSwgQ0ZVUkxDYWNoZURpc2tDYXBhY2l0eShjZnVy bFNoYXJlZENhY2hlKSk7CisgICAgY2Z1cmxDYWNoZURpc2tDYXBhY2l0eSA9IG1heChjZnVybENh Y2hlRGlza0NhcGFjaXR5LCBDRlVSTENhY2hlRGlza0NhcGFjaXR5KGNmdXJsQ2FjaGUuZ2V0KCkp KTsKIAogICAgIGNhY2hlKCktPnNldENhcGFjaXRpZXMoY2FjaGVNaW5EZWFkQ2FwYWNpdHksIGNh Y2hlTWF4RGVhZENhcGFjaXR5LCBjYWNoZVRvdGFsQ2FwYWNpdHkpOwogICAgIGNhY2hlKCktPnNl dERlYWREZWNvZGVkRGF0YURlbGV0aW9uSW50ZXJ2YWwoZGVhZERlY29kZWREYXRhRGVsZXRpb25J bnRlcnZhbCk7CiAgICAgcGFnZUNhY2hlKCktPnNldENhcGFjaXR5KHBhZ2VDYWNoZUNhcGFjaXR5 KTsKIAotICAgIENGVVJMQ2FjaGVTZXRNZW1vcnlDYXBhY2l0eShjZnVybFNoYXJlZENhY2hlLCBj ZnVybENhY2hlTWVtb3J5Q2FwYWNpdHkpOwotICAgIENGVVJMQ2FjaGVTZXREaXNrQ2FwYWNpdHko Y2Z1cmxTaGFyZWRDYWNoZSwgY2Z1cmxDYWNoZURpc2tDYXBhY2l0eSk7CisgICAgQ0ZVUkxDYWNo ZVNldE1lbW9yeUNhcGFjaXR5KGNmdXJsQ2FjaGUuZ2V0KCksIGNmdXJsQ2FjaGVNZW1vcnlDYXBh Y2l0eSk7CisgICAgQ0ZVUkxDYWNoZVNldERpc2tDYXBhY2l0eShjZnVybENhY2hlLmdldCgpLCBj ZnVybENhY2hlRGlza0NhcGFjaXR5KTsKIAogICAgIHNfZGlkU2V0Q2FjaGVNb2RlbCA9IHRydWU7 CiAgICAgc19jYWNoZU1vZGVsID0gY2FjaGVNb2RlbDsK