71245 2011-10-31 15:32:25 -0700 Add more APIs to WKUserContentURLPattern.h 2011-10-31 15:55:09 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 jeffm jeffm webkit-bug-importer oldest_to_newest 493541 0 jeffm 2011-10-31 15:32:25 -0700 Follow-up to bug 47783 to provide the same functionality in WebKit2 that we had in WebKit1. Specifically, we need to add: WK_EXPORT WKStringRef WKUserContentURLPatternCopyHost(WKUserContentURLPatternRef urlPatternRef); WK_EXPORT WKStringRef WKUserContentURLPatternCopyScheme(WKUserContentURLPatternRef urlPatternRef); WK_EXPORT bool WKUserContentURLPatternIsValid(WKUserContentURLPatternRef urlPatternRef); \WK_EXPORT bool WKUserContentURLPatternMatchesSubdomains(WKUserContentURLPatternRef urlPatternRef); 493543 1 webkit-bug-importer 2011-10-31 15:33:06 -0700 <rdar://problem/10373269> 493545 2 113094 jeffm 2011-10-31 15:38:02 -0700 Created attachment 113094 Patch 493559 3 113094 darin 2011-10-31 15:53:00 -0700 Comment on attachment 113094 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=113094&action=review > Source/WebKit2/Shared/API/c/WKUserContentURLPattern.h:41 > WK_EXPORT WKUserContentURLPatternRef WKUserContentURLPatternCreate(WKStringRef patternRef); > > + > +WK_EXPORT WKStringRef WKUserContentURLPatternCopyHost(WKUserContentURLPatternRef urlPatternRef); Extra blank line here. 493564 4 jeffm 2011-10-31 15:55:09 -0700 Committed r98894: <http://trac.webkit.org/changeset/98894> 113094 2011-10-31 15:38:02 -0700 2011-10-31 15:53:00 -0700 Patch bug-71245-20111031153801.patch text/plain 4436 jeffm SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDk4ODkwKQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTEtMTAtMzEgIEplZmYgTWls bGVyICA8amVmZm1AYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBtb3JlIEFQSXMgdG8gV0tVc2Vy Q29udGVudFVSTFBhdHRlcm4uaAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NzEyNDUKKyAgICAgICAgCisgICAgICAgIEFkZCBhZGRpdGlvbmFsIFdLVXNl ckNvbnRlbnRVUkxQYXR0ZXJuIEFQSXMgdG8gbWF0Y2ggd2hhdCB3YXMgcHJvdmlkZWQgYnkKKyAg ICAgICAgdGhlIGVxdWl2YWxlbnQgV2ViS2l0MSBBUEkuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTaGFyZWQvQVBJL2MvV0tVc2VyQ29udGVudFVS TFBhdHRlcm4uY3BwOgorICAgICAgICAoV0tVc2VyQ29udGVudFVSTFBhdHRlcm5Db3B5SG9zdCk6 IEFkZGVkLgorICAgICAgICAoV0tVc2VyQ29udGVudFVSTFBhdHRlcm5Db3B5U2NoZW1lKTogQWRk ZWQuCisgICAgICAgIChXS1VzZXJDb250ZW50VVJMUGF0dGVybklzVmFsaWQpOiBBZGRlZC4KKyAg ICAgICAgKFdLVXNlckNvbnRlbnRVUkxQYXR0ZXJuTWF0Y2hlc1N1YmRvbWFpbnMpOiBBZGRlZC4K KyAgICAgICAgCisgICAgICAgICogU2hhcmVkL0FQSS9jL1dLVXNlckNvbnRlbnRVUkxQYXR0ZXJu Lmg6IEFkZGVkIG5ldyBBUElzLgorICAgICAgICAKKyAgICAgICAgKiBTaGFyZWQvV2ViVXNlckNv bnRlbnRVUkxQYXR0ZXJuLmg6CisgICAgICAgIChXZWJLaXQ6OldlYlVzZXJDb250ZW50VVJMUGF0 dGVybjo6aG9zdCk6IEFkZGVkLgorICAgICAgICAoV2ViS2l0OjpXZWJVc2VyQ29udGVudFVSTFBh dHRlcm46OnNjaGVtZSk6IEFkZGVkLgorICAgICAgICAoV2ViS2l0OjpXZWJVc2VyQ29udGVudFVS TFBhdHRlcm46OmlzVmFsaWQpOiBBZGRlZC4KKyAgICAgICAgKFdlYktpdDo6V2ViVXNlckNvbnRl bnRVUkxQYXR0ZXJuOjptYXRjaGVzU3ViZG9tYWlucyk6IEFkZGVkLgorCiAyMDExLTEwLTI3ICBB bmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAgUmVuYW1lIGEg Y291cGxlIG9mIE5ldHNjYXBlUGx1Z2luIGFuZCBQbHVnaW5Qcm94eSBtZW1iZXIgdmFyaWFibGVz CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViVXNlckNvbnRlbnRVUkxQYXR0ZXJuLmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlVzZXJDb250ZW50VVJMUGF0 dGVybi5oCShyZXZpc2lvbiA5ODg1NikKKysrIFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJVc2Vy Q29udGVudFVSTFBhdHRlcm4uaAkod29ya2luZyBjb3B5KQpAQCAtNDMsNyArNDMsMTEgQEAgcHVi bGljOgogICAgICAgICByZXR1cm4gYWRvcHRSZWYobmV3IFdlYlVzZXJDb250ZW50VVJMUGF0dGVy bihwYXR0ZXJuKSk7CiAgICAgfQogCisgICAgY29uc3QgU3RyaW5nJiBob3N0KCkgY29uc3QgeyBy ZXR1cm4gbV9wYXR0ZXJuLmhvc3QoKTsgfQorICAgIGNvbnN0IFN0cmluZyYgc2NoZW1lKCkgY29u c3QgeyByZXR1cm4gbV9wYXR0ZXJuLnNjaGVtZSgpOyB9CisgICAgYm9vbCBpc1ZhbGlkKCkgY29u c3QgeyByZXR1cm4gbV9wYXR0ZXJuLmlzVmFsaWQoKTsgfTsKICAgICBib29sIG1hdGNoZXNVUkwo Y29uc3QgU3RyaW5nJiB1cmwpIGNvbnN0IHsgcmV0dXJuIG1fcGF0dGVybi5tYXRjaGVzKFdlYkNv cmU6OktVUkwoV2ViQ29yZTo6UGFyc2VkVVJMU3RyaW5nLCB1cmwpKTsgfQorICAgIGJvb2wgbWF0 Y2hlc1N1YmRvbWFpbnMoKSBjb25zdCB7IHJldHVybiBtX3BhdHRlcm4ubWF0Y2hTdWJkb21haW5z KCk7IH0KIAogICAgIGNvbnN0IFN0cmluZyYgcGF0dGVyblN0cmluZygpIGNvbnN0IHsgcmV0dXJu IG1fcGF0dGVyblN0cmluZzsgfQogCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQVBJL2Mv V0tVc2VyQ29udGVudFVSTFBhdHRlcm4uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQy L1NoYXJlZC9BUEkvYy9XS1VzZXJDb250ZW50VVJMUGF0dGVybi5jcHAJKHJldmlzaW9uIDk4ODU2 KQorKysgU291cmNlL1dlYktpdDIvU2hhcmVkL0FQSS9jL1dLVXNlckNvbnRlbnRVUkxQYXR0ZXJu LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjcsNiArMjcsNyBAQAogI2luY2x1ZGUgIldLVXNlckNv bnRlbnRVUkxQYXR0ZXJuLmgiCiAKICNpbmNsdWRlICJXS0FQSUNhc3QuaCIKKyNpbmNsdWRlICJX S1N0cmluZy5oIgogI2luY2x1ZGUgIldlYlVzZXJDb250ZW50VVJMUGF0dGVybi5oIgogCiB1c2lu ZyBuYW1lc3BhY2UgV2ViS2l0OwpAQCAtNDIsNyArNDMsMjcgQEAgV0tVc2VyQ29udGVudFVSTFBh dHRlcm5SZWYgV0tVc2VyQ29udGVudAogICAgIHJldHVybiB0b0FQSSh1c2VyQ29udGVudFVSTFBh dHRlcm4ucmVsZWFzZSgpLmxlYWtSZWYoKSk7CiB9CiAKK1dLU3RyaW5nUmVmIFdLVXNlckNvbnRl bnRVUkxQYXR0ZXJuQ29weUhvc3QoV0tVc2VyQ29udGVudFVSTFBhdHRlcm5SZWYgdXJsUGF0dGVy blJlZikKK3sKKyAgICByZXR1cm4gdG9Db3BpZWRBUEkodG9JbXBsKHVybFBhdHRlcm5SZWYpLT5o b3N0KCkpOworfQorCitXS1N0cmluZ1JlZiBXS1VzZXJDb250ZW50VVJMUGF0dGVybkNvcHlTY2hl bWUoV0tVc2VyQ29udGVudFVSTFBhdHRlcm5SZWYgdXJsUGF0dGVyblJlZikKK3sKKyAgICByZXR1 cm4gdG9Db3BpZWRBUEkodG9JbXBsKHVybFBhdHRlcm5SZWYpLT5zY2hlbWUoKSk7Cit9CisKK2Jv b2wgV0tVc2VyQ29udGVudFVSTFBhdHRlcm5Jc1ZhbGlkKFdLVXNlckNvbnRlbnRVUkxQYXR0ZXJu UmVmIHVybFBhdHRlcm5SZWYpCit7CisgICAgcmV0dXJuIHRvSW1wbCh1cmxQYXR0ZXJuUmVmKS0+ aXNWYWxpZCgpOworfQorCiBib29sIFdLVXNlckNvbnRlbnRVUkxQYXR0ZXJuTWF0Y2hlc1VSTChX S1VzZXJDb250ZW50VVJMUGF0dGVyblJlZiB1cmxQYXR0ZXJuUmVmLCBXS1VSTFJlZiB1cmxSZWYp CiB7CiAgICAgcmV0dXJuIHRvSW1wbCh1cmxQYXR0ZXJuUmVmKS0+bWF0Y2hlc1VSTCh0b1dURlN0 cmluZyh1cmxSZWYpKTsKIH0KKworYm9vbCBXS1VzZXJDb250ZW50VVJMUGF0dGVybk1hdGNoZXNT dWJkb21haW5zKFdLVXNlckNvbnRlbnRVUkxQYXR0ZXJuUmVmIHVybFBhdHRlcm5SZWYpCit7Cisg ICAgcmV0dXJuIHRvSW1wbCh1cmxQYXR0ZXJuUmVmKS0+bWF0Y2hlc1N1YmRvbWFpbnMoKTsKK30K SW5kZXg6IFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9BUEkvYy9XS1VzZXJDb250ZW50VVJMUGF0dGVy bi5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9BUEkvYy9XS1VzZXJDb250 ZW50VVJMUGF0dGVybi5oCShyZXZpc2lvbiA5ODg1NikKKysrIFNvdXJjZS9XZWJLaXQyL1NoYXJl ZC9BUEkvYy9XS1VzZXJDb250ZW50VVJMUGF0dGVybi5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNyw3 ICszNywxMiBAQCBXS19FWFBPUlQgV0tUeXBlSUQgV0tVc2VyQ29udGVudFVSTFBhdHRlCiAKIFdL X0VYUE9SVCBXS1VzZXJDb250ZW50VVJMUGF0dGVyblJlZiBXS1VzZXJDb250ZW50VVJMUGF0dGVy bkNyZWF0ZShXS1N0cmluZ1JlZiBwYXR0ZXJuUmVmKTsKIAorCitXS19FWFBPUlQgV0tTdHJpbmdS ZWYgV0tVc2VyQ29udGVudFVSTFBhdHRlcm5Db3B5SG9zdChXS1VzZXJDb250ZW50VVJMUGF0dGVy blJlZiB1cmxQYXR0ZXJuUmVmKTsKK1dLX0VYUE9SVCBXS1N0cmluZ1JlZiBXS1VzZXJDb250ZW50 VVJMUGF0dGVybkNvcHlTY2hlbWUoV0tVc2VyQ29udGVudFVSTFBhdHRlcm5SZWYgdXJsUGF0dGVy blJlZik7CitXS19FWFBPUlQgYm9vbCBXS1VzZXJDb250ZW50VVJMUGF0dGVybklzVmFsaWQoV0tV c2VyQ29udGVudFVSTFBhdHRlcm5SZWYgdXJsUGF0dGVyblJlZik7CiBXS19FWFBPUlQgYm9vbCBX S1VzZXJDb250ZW50VVJMUGF0dGVybk1hdGNoZXNVUkwoV0tVc2VyQ29udGVudFVSTFBhdHRlcm5S ZWYgdXJsUGF0dGVyblJlZiwgV0tVUkxSZWYgdXJsUmVmKTsKK1dLX0VYUE9SVCBib29sIFdLVXNl ckNvbnRlbnRVUkxQYXR0ZXJuTWF0Y2hlc1N1YmRvbWFpbnMoV0tVc2VyQ29udGVudFVSTFBhdHRl cm5SZWYgdXJsUGF0dGVyblJlZik7CiAKICNpZmRlZiBfX2NwbHVzcGx1cwogfQo=