58605 2011-04-14 16:50:25 -0700 Add CF-Preference based backend for WebKit2 preferences 2011-04-14 17:47:30 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 sam sam oldest_to_newest 386181 0 sam 2011-04-14 16:50:25 -0700 Add CF-Preference based backend for WebKit2 preferences 386192 1 89686 sam 2011-04-14 17:02:31 -0700 Created attachment 89686 Patch 386230 2 sam 2011-04-14 17:47:30 -0700 Committed r83918: <http://trac.webkit.org/changeset/83918> 89686 2011-04-14 17:02:31 -0700 2011-04-14 17:45:53 -0700 Patch bug-58605-20110414170230.patch text/plain 6192 sam SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDgzOTEyKQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTEtMDQtMTQgIFNhbSBXZWlu aWcgIDxzYW1Ad2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBBZGQgQ0ZQcmVmZXJlbmNlIGJhc2VkIGJhY2tlbmQgZm9yIFdlYktpdDIg cHJlZmVyZW5jZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTU4NjA1CisKKyAgICAgICAgKiBVSVByb2Nlc3MvY2YvV2ViUHJlZmVyZW5jZXNDRi5jcHA6 CisgICAgICAgIChXZWJLaXQ6OmNmU3RyaW5nRnJvbVdlYkNvcmVTdHJpbmcpOgorICAgICAgICAo V2ViS2l0OjptYWtlS2V5KToKKyAgICAgICAgKFdlYktpdDo6c2V0U3RyaW5nVmFsdWVJZkluVXNl ckRlZmF1bHRzKToKKyAgICAgICAgKFdlYktpdDo6c2V0Qm9vbFZhbHVlSWZJblVzZXJEZWZhdWx0 cyk6CisgICAgICAgIChXZWJLaXQ6OnNldFVJbnQzMlZhbHVlSWZJblVzZXJEZWZhdWx0cyk6Cisg ICAgICAgIChXZWJLaXQ6OnNldERvdWJsZVZhbHVlSWZJblVzZXJEZWZhdWx0cyk6CisgICAgICAg IChXZWJLaXQ6OldlYlByZWZlcmVuY2VzOjpwbGF0Zm9ybUluaXRpYWxpemVTdG9yZSk6CisgICAg ICAgIChXZWJLaXQ6OldlYlByZWZlcmVuY2VzOjpwbGF0Zm9ybVVwZGF0ZVN0cmluZ1ZhbHVlRm9y S2V5KToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJlZmVyZW5jZXM6OnBsYXRmb3JtVXBkYXRlQm9v bFZhbHVlRm9yS2V5KToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJlZmVyZW5jZXM6OnBsYXRmb3Jt VXBkYXRlVUludDMyVmFsdWVGb3JLZXkpOgorICAgICAgICAoV2ViS2l0OjpXZWJQcmVmZXJlbmNl czo6cGxhdGZvcm1VcGRhdGVEb3VibGVWYWx1ZUZvcktleSk6CisgICAgICAgIEltcGxlbWVudCBw bGF0Zm9ybSBmdW5jdGlvbnMgdXNpbmcgQ0ZQcmVmZXJlbmNlcyBBUEkuCisKIDIwMTEtMDQtMTQg IEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IFNhbSBXZWluaWcuCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvY2YvV2ViUHJlZmVy ZW5jZXNDRi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2NmL1dl YlByZWZlcmVuY2VzQ0YuY3BwCShyZXZpc2lvbiA4MzkwOSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9jZi9XZWJQcmVmZXJlbmNlc0NGLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjYsMjgg KzI2LDExOSBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIldlYlByZWZlcmVuY2Vz LmgiCiAKKyNpbmNsdWRlIDx3dGYvUmV0YWluUHRyLmg+CisjaW5jbHVkZSA8d3RmL3RleHQvU3Ry aW5nQ29uY2F0ZW5hdGUuaD4KKwogI2lmICFQTEFURk9STShNQUMpCiAKIG5hbWVzcGFjZSBXZWJL aXQgewogCitzdGF0aWMgUmV0YWluUHRyPENGU3RyaW5nUmVmPiBjZlN0cmluZ0Zyb21XZWJDb3Jl U3RyaW5nKGNvbnN0IFN0cmluZyYgc3RyaW5nKQoreworICAgIHJldHVybiBSZXRhaW5QdHI8Q0ZT dHJpbmdSZWY+KEFkb3B0Q0YsIENGU3RyaW5nQ3JlYXRlV2l0aENoYXJhY3RlcnMoMCwgcmVpbnRl cnByZXRfY2FzdDxjb25zdCBVbmlDaGFyKj4oc3RyaW5nLmNoYXJhY3RlcnMoKSksIHN0cmluZy5s ZW5ndGgoKSkpOworfQorCitzdGF0aWMgaW5saW5lIFJldGFpblB0cjxDRlN0cmluZ1JlZj4gbWFr ZUtleShjb25zdCBTdHJpbmcmIGlkZW50aWZpZXIsIGNvbnN0IFN0cmluZyYgYmFzZUtleSkKK3sK KyAgICByZXR1cm4gY2ZTdHJpbmdGcm9tV2ViQ29yZVN0cmluZyhtYWtlU3RyaW5nKGlkZW50aWZp ZXIsICIuV2ViS2l0MiIsIGJhc2VLZXkpKTsKK30KKworc3RhdGljIHZvaWQgc2V0U3RyaW5nVmFs dWVJZkluVXNlckRlZmF1bHRzKGNvbnN0IFN0cmluZyYgaWRlbnRpZmllciwgY29uc3QgU3RyaW5n JiBiYXNlS2V5LCBXZWJQcmVmZXJlbmNlc1N0b3JlJiBzdG9yZSkKK3sKKyAgICBSZXRhaW5QdHI8 Q0ZQcm9wZXJ0eUxpc3RSZWY+IHZhbHVlKEFkb3B0Q0YsIENGUHJlZmVyZW5jZXNDb3B5QXBwVmFs dWUobWFrZUtleShpZGVudGlmaWVyLCBiYXNlS2V5KS5nZXQoKSwga0NGUHJlZmVyZW5jZXNDdXJy ZW50QXBwbGljYXRpb24pKTsKKyAgICBpZiAoIXZhbHVlKQorICAgICAgICByZXR1cm47CisgICAg aWYgKENGR2V0VHlwZUlEKHZhbHVlLmdldCgpKSAhPSBDRlN0cmluZ0dldFR5cGVJRCgpKQorICAg ICAgICByZXR1cm47CisKKyAgICBzdG9yZS5zZXRTdHJpbmdWYWx1ZUZvcktleShiYXNlS2V5LCAo Q0ZTdHJpbmdSZWYpdmFsdWUuZ2V0KCkpOworfQorCitzdGF0aWMgdm9pZCBzZXRCb29sVmFsdWVJ ZkluVXNlckRlZmF1bHRzKGNvbnN0IFN0cmluZyYgaWRlbnRpZmllciwgY29uc3QgU3RyaW5nJiBi YXNlS2V5LCBXZWJQcmVmZXJlbmNlc1N0b3JlJiBzdG9yZSkKK3sKKyAgICBSZXRhaW5QdHI8Q0ZQ cm9wZXJ0eUxpc3RSZWY+IHZhbHVlKEFkb3B0Q0YsIENGUHJlZmVyZW5jZXNDb3B5QXBwVmFsdWUo bWFrZUtleShpZGVudGlmaWVyLCBiYXNlS2V5KS5nZXQoKSwga0NGUHJlZmVyZW5jZXNDdXJyZW50 QXBwbGljYXRpb24pKTsKKyAgICBpZiAoIXZhbHVlKQorICAgICAgICByZXR1cm47CisgICAgaWYg KENGR2V0VHlwZUlEKHZhbHVlLmdldCgpKSAhPSBDRkJvb2xlYW5HZXRUeXBlSUQoKSkKKyAgICAg ICAgcmV0dXJuOworCisgICAgc3RvcmUuc2V0Qm9vbFZhbHVlRm9yS2V5KGJhc2VLZXksIENGQm9v bGVhbkdldFZhbHVlKChDRkJvb2xlYW5SZWYpdmFsdWUuZ2V0KCkpID8gdHJ1ZSA6IGZhbHNlKTsK K30KKworc3RhdGljIHZvaWQgc2V0VUludDMyVmFsdWVJZkluVXNlckRlZmF1bHRzKGNvbnN0IFN0 cmluZyYgaWRlbnRpZmllciwgY29uc3QgU3RyaW5nJiBiYXNlS2V5LCBXZWJQcmVmZXJlbmNlc1N0 b3JlJiBzdG9yZSkKK3sKKyAgICBSZXRhaW5QdHI8Q0ZQcm9wZXJ0eUxpc3RSZWY+IHZhbHVlKEFk b3B0Q0YsIENGUHJlZmVyZW5jZXNDb3B5QXBwVmFsdWUobWFrZUtleShpZGVudGlmaWVyLCBiYXNl S2V5KS5nZXQoKSwga0NGUHJlZmVyZW5jZXNDdXJyZW50QXBwbGljYXRpb24pKTsKKyAgICBpZiAo IXZhbHVlKQorICAgICAgICByZXR1cm47CisgICAgaWYgKENGR2V0VHlwZUlEKHZhbHVlLmdldCgp KSAhPSBDRk51bWJlckdldFR5cGVJRCgpKQorICAgICAgICByZXR1cm47CisgICAgaW50MzJfdCBp bnRWYWx1ZSA9IDA7CisgICAgaWYgKCFDRk51bWJlckdldFZhbHVlKChDRk51bWJlclJlZil2YWx1 ZS5nZXQoKSwga0NGTnVtYmVyU0ludDMyVHlwZSwgJmludFZhbHVlKSkKKyAgICAgICAgcmV0dXJu OworCisgICAgc3RvcmUuc2V0VUludDMyVmFsdWVGb3JLZXkoYmFzZUtleSwgaW50VmFsdWUpOwor fQorCitzdGF0aWMgdm9pZCBzZXREb3VibGVWYWx1ZUlmSW5Vc2VyRGVmYXVsdHMoY29uc3QgU3Ry aW5nJiBpZGVudGlmaWVyLCBjb25zdCBTdHJpbmcmIGJhc2VLZXksIFdlYlByZWZlcmVuY2VzU3Rv cmUmIHN0b3JlKQoreworICAgIFJldGFpblB0cjxDRlByb3BlcnR5TGlzdFJlZj4gdmFsdWUoQWRv cHRDRiwgQ0ZQcmVmZXJlbmNlc0NvcHlBcHBWYWx1ZShtYWtlS2V5KGlkZW50aWZpZXIsIGJhc2VL ZXkpLmdldCgpLCBrQ0ZQcmVmZXJlbmNlc0N1cnJlbnRBcHBsaWNhdGlvbikpOworICAgIGlmICgh dmFsdWUpCisgICAgICAgIHJldHVybjsKKyAgICBpZiAoQ0ZHZXRUeXBlSUQodmFsdWUuZ2V0KCkp ICE9IENGTnVtYmVyR2V0VHlwZUlEKCkpCisgICAgICAgIHJldHVybjsKKyAgICBkb3VibGUgZG91 YmxlVmFsdWUgPSAwOworICAgIGlmICghQ0ZOdW1iZXJHZXRWYWx1ZSgoQ0ZOdW1iZXJSZWYpdmFs dWUuZ2V0KCksIGtDRk51bWJlckRvdWJsZVR5cGUsICZkb3VibGVWYWx1ZSkpCisgICAgICAgIHJl dHVybjsKKworICAgIHN0b3JlLnNldERvdWJsZVZhbHVlRm9yS2V5KGJhc2VLZXksIGRvdWJsZVZh bHVlKTsKK30KKwogdm9pZCBXZWJQcmVmZXJlbmNlczo6cGxhdGZvcm1Jbml0aWFsaXplU3RvcmUo KQogeworICAgIGlmICghbV9pZGVudGlmaWVyKQorICAgICAgICByZXR1cm47CisKKyNkZWZpbmUg SU5JVElBTElaRV9QUkVGRVJFTkNFX0ZST01fTlNVU0VSREVGQVVMVFMoS2V5VXBwZXIsIEtleUxv d2VyLCBUeXBlTmFtZSwgVHlwZSwgRGVmYXVsdFZhbHVlKSBcCisgICAgc2V0IyNUeXBlTmFtZSMj VmFsdWVJZkluVXNlckRlZmF1bHRzKG1faWRlbnRpZmllciwgV2ViUHJlZmVyZW5jZXNLZXk6Oktl eUxvd2VyIyNLZXkoKSwgbV9zdG9yZSk7CisKKyAgICBGT1JfRUFDSF9XRUJLSVRfUFJFRkVSRU5D RShJTklUSUFMSVpFX1BSRUZFUkVOQ0VfRlJPTV9OU1VTRVJERUZBVUxUUykKKworI3VuZGVmIElO SVRJQUxJWkVfUFJFRkVSRU5DRV9GUk9NX05TVVNFUkRFRkFVTFRTCisKIH0KIAotdm9pZCBXZWJQ cmVmZXJlbmNlczo6cGxhdGZvcm1VcGRhdGVTdHJpbmdWYWx1ZUZvcktleShjb25zdCBTdHJpbmcm LCBjb25zdCBTdHJpbmcmKQordm9pZCBXZWJQcmVmZXJlbmNlczo6cGxhdGZvcm1VcGRhdGVTdHJp bmdWYWx1ZUZvcktleShjb25zdCBTdHJpbmcmIGtleSwgY29uc3QgU3RyaW5nJiB2YWx1ZSkKIHsK KyAgICBpZiAoIW1faWRlbnRpZmllcikKKyAgICAgICAgcmV0dXJuOworCisgICAgQ0ZQcmVmZXJl bmNlc1NldEFwcFZhbHVlKG1ha2VLZXkobV9pZGVudGlmaWVyLCBrZXkpLmdldCgpLCBjZlN0cmlu Z0Zyb21XZWJDb3JlU3RyaW5nKHZhbHVlKS5nZXQoKSwga0NGUHJlZmVyZW5jZXNDdXJyZW50QXBw bGljYXRpb24pOwogfQogCi12b2lkIFdlYlByZWZlcmVuY2VzOjpwbGF0Zm9ybVVwZGF0ZUJvb2xW YWx1ZUZvcktleShjb25zdCBTdHJpbmcmLCBib29sKQordm9pZCBXZWJQcmVmZXJlbmNlczo6cGxh dGZvcm1VcGRhdGVCb29sVmFsdWVGb3JLZXkoY29uc3QgU3RyaW5nJiBrZXksIGJvb2wgdmFsdWUp CiB7CisgICAgaWYgKCFtX2lkZW50aWZpZXIpCisgICAgICAgIHJldHVybjsKKworICAgIENGUHJl ZmVyZW5jZXNTZXRBcHBWYWx1ZShtYWtlS2V5KG1faWRlbnRpZmllciwga2V5KS5nZXQoKSwgdmFs dWUgPyBrQ0ZCb29sZWFuVHJ1ZSA6IGtDRkJvb2xlYW5GYWxzZSwga0NGUHJlZmVyZW5jZXNDdXJy ZW50QXBwbGljYXRpb24pOwogfQogCi12b2lkIFdlYlByZWZlcmVuY2VzOjpwbGF0Zm9ybVVwZGF0 ZVVJbnQzMlZhbHVlRm9yS2V5KGNvbnN0IFN0cmluZyYsIHVpbnQzMl90KQordm9pZCBXZWJQcmVm ZXJlbmNlczo6cGxhdGZvcm1VcGRhdGVVSW50MzJWYWx1ZUZvcktleShjb25zdCBTdHJpbmcmIGtl eSwgdWludDMyX3QgdmFsdWUpCiB7CisgICAgaWYgKCFtX2lkZW50aWZpZXIpCisgICAgICAgIHJl dHVybjsKKworICAgIFJldGFpblB0cjxDRk51bWJlclJlZj4gbnVtYmVyKEFkb3B0Q0YsIENGTnVt YmVyQ3JlYXRlKDAsIGtDRk51bWJlclNJbnQzMlR5cGUsICZ2YWx1ZSkpOworICAgIENGUHJlZmVy ZW5jZXNTZXRBcHBWYWx1ZShtYWtlS2V5KG1faWRlbnRpZmllciwga2V5KS5nZXQoKSwgbnVtYmVy LmdldCgpLCBrQ0ZQcmVmZXJlbmNlc0N1cnJlbnRBcHBsaWNhdGlvbik7CiB9CiAKLXZvaWQgV2Vi UHJlZmVyZW5jZXM6OnBsYXRmb3JtVXBkYXRlRG91YmxlVmFsdWVGb3JLZXkoY29uc3QgU3RyaW5n JiwgZG91YmxlKQordm9pZCBXZWJQcmVmZXJlbmNlczo6cGxhdGZvcm1VcGRhdGVEb3VibGVWYWx1 ZUZvcktleShjb25zdCBTdHJpbmcmIGtleSwgZG91YmxlIHZhbHVlKQogeworICAgIGlmICghbV9p ZGVudGlmaWVyKQorICAgICAgICByZXR1cm47CisKKyAgICBSZXRhaW5QdHI8Q0ZOdW1iZXJSZWY+ IG51bWJlcihBZG9wdENGLCBDRk51bWJlckNyZWF0ZSgwLCBrQ0ZOdW1iZXJEb3VibGVUeXBlLCAm dmFsdWUpKTsKKyAgICBDRlByZWZlcmVuY2VzU2V0QXBwVmFsdWUobWFrZUtleShtX2lkZW50aWZp ZXIsIGtleSkuZ2V0KCksIG51bWJlci5nZXQoKSwga0NGUHJlZmVyZW5jZXNDdXJyZW50QXBwbGlj YXRpb24pOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQK