145951 2015-06-12 17:41:01 -0700 Reimplement WKResourceCacheManagerRef on top of WKWebsiteDataStoreRef 2015-06-12 18:41:36 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 1101755 0 andersca 2015-06-12 17:41:01 -0700 Reimplement WKResourceCacheManagerRef on top of WKWebsiteDataStoreRef 1101757 1 254840 andersca 2015-06-12 17:41:58 -0700 Created attachment 254840 Patch 1101773 2 andersca 2015-06-12 18:41:36 -0700 Committed r185529: <http://trac.webkit.org/changeset/185529> 254840 2015-06-12 17:41:58 -0700 2015-06-12 18:40:27 -0700 Patch bug-145951-20150612174127.patch text/plain 5823 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTg1NTI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYTRiNmQwZTA2MzE5ZWMy N2ViOGNkYzZjNDdhYzA2NjEzMjRjYzJjNC4uMDgzODhjNjY0MTNiNGUzNTRhMDhmNzNlZDA1ZGQy N2EyZGNiMDRhMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIxIEBACiAyMDE1LTA2LTEyICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgUmVpbXBsZW1lbnQg V0tSZXNvdXJjZUNhY2hlTWFuYWdlclJlZiBvbiB0b3Agb2YgV0tXZWJzaXRlRGF0YVN0b3JlUmVm CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDU5NTEK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJv Y2Vzcy9BUEkvQy9XS0NvbnRleHQuY3BwOgorICAgICAgICAoV0tDb250ZXh0R2V0UmVzb3VyY2VD YWNoZU1hbmFnZXIpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9XS1Jlc291cmNlQ2FjaGVN YW5hZ2VyLmNwcDoKKyAgICAgICAgKFdLUmVzb3VyY2VDYWNoZU1hbmFnZXJHZXRUeXBlSUQpOgor ICAgICAgICAodG9XZWJzaXRlRGF0YVR5cGVzKToKKyAgICAgICAgKFdLUmVzb3VyY2VDYWNoZU1h bmFnZXJHZXRDYWNoZU9yaWdpbnMpOgorICAgICAgICAoV0tSZXNvdXJjZUNhY2hlTWFuYWdlckNs ZWFyQ2FjaGVGb3JPcmlnaW4pOgorICAgICAgICAoV0tSZXNvdXJjZUNhY2hlTWFuYWdlckNsZWFy Q2FjaGVGb3JBbGxPcmlnaW5zKToKKworMjAxNS0wNi0xMiAgQW5kZXJzIENhcmxzc29uICA8YW5k ZXJzY2FAYXBwbGUuY29tPgorCiAgICAgICAgIFJlaW1wbGVtZW50IFdLQXBwbGljYXRpb25DYWNo ZU1hbmFnZXJSZWYgYXMgV0tXZWJzaXRlRGF0YVN0b3JlUmVmCiAgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDU5NTAKIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL0MvV0tDb250ZXh0LmNwcAppbmRleCA4MWUwZDFmYWQ3ZDViNWQwYTBlODFj MDM4NDA4NGNkNzUzY2NiMWQyLi45Zjk2NjQ4YmRmZWQwOTFjZWFhZjhhZTk1ODBkNzQxMjU0MTc4 N2E5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tDb250ZXh0 LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tDb250ZXh0LmNwcApA QCAtNDcyLDkgKzQ3Miw5IEBAIFdLUGx1Z2luU2l0ZURhdGFNYW5hZ2VyUmVmIFdLQ29udGV4dEdl dFBsdWdpblNpdGVEYXRhTWFuYWdlcihXS0NvbnRleHRSZWYgY29udGV4CiAjZW5kaWYKIH0KIAot V0tSZXNvdXJjZUNhY2hlTWFuYWdlclJlZiBXS0NvbnRleHRHZXRSZXNvdXJjZUNhY2hlTWFuYWdl cihXS0NvbnRleHRSZWYgY29udGV4dFJlZikKK1dLUmVzb3VyY2VDYWNoZU1hbmFnZXJSZWYgV0tD b250ZXh0R2V0UmVzb3VyY2VDYWNoZU1hbmFnZXIoV0tDb250ZXh0UmVmIGNvbnRleHQpCiB7Ci0g ICAgcmV0dXJuIHRvQVBJKHRvSW1wbChjb250ZXh0UmVmKS0+c3VwcGxlbWVudDxXZWJSZXNvdXJj ZUNhY2hlTWFuYWdlclByb3h5PigpKTsKKyAgICByZXR1cm4gcmVpbnRlcnByZXRfY2FzdDxXS1Jl c291cmNlQ2FjaGVNYW5hZ2VyUmVmPihXS0NvbnRleHRHZXRXZWJzaXRlRGF0YVN0b3JlKGNvbnRl eHQpKTsKIH0KIAogV0tPcmlnaW5EYXRhTWFuYWdlclJlZiBXS0NvbnRleHRHZXRPcmlnaW5EYXRh TWFuYWdlcihXS0NvbnRleHRSZWYgY29udGV4dCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvQy9XS1Jlc291cmNlQ2FjaGVNYW5hZ2VyLmNwcCBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1Jlc291cmNlQ2FjaGVNYW5hZ2VyLmNwcAppbmRleCBhOWM2 MmVhNThiMzE0MTI0ODYyODc4M2YwOGM5OTg5ZGEzM2M0MzNhLi4wYmI0NmEyNDZmZmU1MDRiNzE3 YWExMWExM2YzYzYwNjE5OTdhNjY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL0MvV0tSZXNvdXJjZUNhY2hlTWFuYWdlci5jcHAKKysrIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9DL1dLUmVzb3VyY2VDYWNoZU1hbmFnZXIuY3BwCkBAIC0yNiwyNyArMjYs NjggQEAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRlICJXS1Jlc291cmNlQ2FjaGVNYW5h Z2VyLmgiCiAKLSNpbmNsdWRlICJXZWJSZXNvdXJjZUNhY2hlTWFuYWdlclByb3h5LmgiCisjaW5j bHVkZSAiQVBJV2Vic2l0ZURhdGFTdG9yZS5oIgogI2luY2x1ZGUgIldLQVBJQ2FzdC5oIgorI2lu Y2x1ZGUgIldlYnNpdGVEYXRhUmVjb3JkLmgiCiAKIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CiAK IFdLVHlwZUlEIFdLUmVzb3VyY2VDYWNoZU1hbmFnZXJHZXRUeXBlSUQoKQogewotICAgIHJldHVy biB0b0FQSShXZWJSZXNvdXJjZUNhY2hlTWFuYWdlclByb3h5OjpBUElUeXBlKTsKKyAgICByZXR1 cm4gdG9BUEkoQVBJOjpXZWJzaXRlRGF0YVN0b3JlOjpBUElUeXBlKTsKIH0KIAotdm9pZCBXS1Jl c291cmNlQ2FjaGVNYW5hZ2VyR2V0Q2FjaGVPcmlnaW5zKFdLUmVzb3VyY2VDYWNoZU1hbmFnZXJS ZWYgY2FjaGVNYW5hZ2VyUmVmLCB2b2lkKiBjb250ZXh0LCBXS1Jlc291cmNlQ2FjaGVNYW5hZ2Vy R2V0Q2FjaGVPcmlnaW5zRnVuY3Rpb24gY2FsbGJhY2spCitzdGF0aWMgV2Vic2l0ZURhdGFUeXBl cyB0b1dlYnNpdGVEYXRhVHlwZXMoV0tSZXNvdXJjZUNhY2hlc1RvQ2xlYXIgY2FjaGVzVG9DbGVh cikKIHsKLSAgICB0b0ltcGwoY2FjaGVNYW5hZ2VyUmVmKS0+Z2V0Q2FjaGVPcmlnaW5zKHRvR2Vu ZXJpY0NhbGxiYWNrRnVuY3Rpb24oY29udGV4dCwgY2FsbGJhY2spKTsKKyAgICB1c2luZyBXZWJz aXRlRGF0YVR5cGVzID0gV2ViS2l0OjpXZWJzaXRlRGF0YVR5cGVzOworCisgICAgaW50IHdlYnNp dGVEYXRhVHlwZXMgPSBXZWJzaXRlRGF0YVR5cGVNZW1vcnlDYWNoZTsKKworICAgIGlmIChjYWNo ZXNUb0NsZWFyID09IFdLUmVzb3VyY2VDYWNoZXNUb0NsZWFyQWxsKQorICAgICAgICB3ZWJzaXRl RGF0YVR5cGVzIHw9IFdlYnNpdGVEYXRhVHlwZURpc2tDYWNoZTsKKworICAgIHJldHVybiBzdGF0 aWNfY2FzdDxXZWJzaXRlRGF0YVR5cGVzPih3ZWJzaXRlRGF0YVR5cGVzKTsKK30KKwordm9pZCBX S1Jlc291cmNlQ2FjaGVNYW5hZ2VyR2V0Q2FjaGVPcmlnaW5zKFdLUmVzb3VyY2VDYWNoZU1hbmFn ZXJSZWYgY2FjaGVNYW5hZ2VyLCB2b2lkKiBjb250ZXh0LCBXS1Jlc291cmNlQ2FjaGVNYW5hZ2Vy R2V0Q2FjaGVPcmlnaW5zRnVuY3Rpb24gY2FsbGJhY2spCit7CisgICAgYXV0byYgd2Vic2l0ZURh dGFTdG9yZSA9IHRvSW1wbChyZWludGVycHJldF9jYXN0PFdLV2Vic2l0ZURhdGFTdG9yZVJlZj4o Y2FjaGVNYW5hZ2VyKSktPndlYnNpdGVEYXRhU3RvcmUoKTsKKyAgICB3ZWJzaXRlRGF0YVN0b3Jl LmZldGNoRGF0YSh0b1dlYnNpdGVEYXRhVHlwZXMoV0tSZXNvdXJjZUNhY2hlc1RvQ2xlYXJBbGwp LCBbY29udGV4dCwgY2FsbGJhY2tdKFZlY3RvcjxXZWJzaXRlRGF0YVJlY29yZD4gZGF0YVJlY29y ZHMpIHsKKyAgICAgICAgVmVjdG9yPFJlZlB0cjxBUEk6Ok9iamVjdD4+IHNlY3VyaXR5T3JpZ2lu czsKKyAgICAgICAgZm9yIChjb25zdCBhdXRvJiBkYXRhUmVjb3JkIDogZGF0YVJlY29yZHMpIHsK KyAgICAgICAgICAgIGZvciAoY29uc3QgYXV0byYgb3JpZ2luIDogZGF0YVJlY29yZC5vcmlnaW5z KQorICAgICAgICAgICAgICAgIHNlY3VyaXR5T3JpZ2lucy5hcHBlbmQoQVBJOjpTZWN1cml0eU9y aWdpbjo6Y3JlYXRlKG9yaWdpbikpOworICAgICAgICB9CisKKyAgICAgICAgY2FsbGJhY2sodG9B UEkoQVBJOjpBcnJheTo6Y3JlYXRlKFdURjo6bW92ZShzZWN1cml0eU9yaWdpbnMpKS5wdHIoKSks IG51bGxwdHIsIGNvbnRleHQpOworICAgIH0pOwogfQogCi12b2lkIFdLUmVzb3VyY2VDYWNoZU1h bmFnZXJDbGVhckNhY2hlRm9yT3JpZ2luKFdLUmVzb3VyY2VDYWNoZU1hbmFnZXJSZWYgY2FjaGVN YW5hZ2VyUmVmLCBXS1NlY3VyaXR5T3JpZ2luUmVmIG9yaWdpblJlZiwgV0tSZXNvdXJjZUNhY2hl c1RvQ2xlYXIgY2FjaGVzVG9DbGVhcikKK3ZvaWQgV0tSZXNvdXJjZUNhY2hlTWFuYWdlckNsZWFy Q2FjaGVGb3JPcmlnaW4oV0tSZXNvdXJjZUNhY2hlTWFuYWdlclJlZiBjYWNoZU1hbmFnZXIsIFdL U2VjdXJpdHlPcmlnaW5SZWYgb3JpZ2luLCBXS1Jlc291cmNlQ2FjaGVzVG9DbGVhciBjYWNoZXNU b0NsZWFyKQogewotICAgIHRvSW1wbChjYWNoZU1hbmFnZXJSZWYpLT5jbGVhckNhY2hlRm9yT3Jp Z2luKHRvSW1wbChvcmlnaW5SZWYpLCB0b1Jlc291cmNlQ2FjaGVzVG9DbGVhcihjYWNoZXNUb0Ns ZWFyKSk7CisgICAgYXV0byYgd2Vic2l0ZURhdGFTdG9yZSA9IHRvSW1wbChyZWludGVycHJldF9j YXN0PFdLV2Vic2l0ZURhdGFTdG9yZVJlZj4oY2FjaGVNYW5hZ2VyKSktPndlYnNpdGVEYXRhU3Rv cmUoKTsKKworICAgIFZlY3RvcjxXZWJzaXRlRGF0YVJlY29yZD4gZGF0YVJlY29yZHM7CisKKyAg ICB7CisgICAgICAgIFdlYnNpdGVEYXRhUmVjb3JkIGRhdGFSZWNvcmQ7CisgICAgICAgIGRhdGFS ZWNvcmQuYWRkKFdlYnNpdGVEYXRhVHlwZXM6OldlYnNpdGVEYXRhVHlwZU1lbW9yeUNhY2hlLCAm dG9JbXBsKG9yaWdpbiktPnNlY3VyaXR5T3JpZ2luKCkpOworCisgICAgICAgIGRhdGFSZWNvcmRz LmFwcGVuZChkYXRhUmVjb3JkKTsKKyAgICB9CisKKyAgICBpZiAoY2FjaGVzVG9DbGVhciA9PSBX S1Jlc291cmNlQ2FjaGVzVG9DbGVhckFsbCkgeworICAgICAgICBXZWJzaXRlRGF0YVJlY29yZCBk YXRhUmVjb3JkOworICAgICAgICBkYXRhUmVjb3JkLmFkZChXZWJzaXRlRGF0YVR5cGVzOjpXZWJz aXRlRGF0YVR5cGVEaXNrQ2FjaGUsICZ0b0ltcGwob3JpZ2luKS0+c2VjdXJpdHlPcmlnaW4oKSk7 CisKKyAgICAgICAgZGF0YVJlY29yZHMuYXBwZW5kKGRhdGFSZWNvcmQpOworICAgIH0KKworICAg IHdlYnNpdGVEYXRhU3RvcmUucmVtb3ZlRGF0YSh0b1dlYnNpdGVEYXRhVHlwZXMoY2FjaGVzVG9D bGVhciksIGRhdGFSZWNvcmRzLCBbXSB7IH0pOwogfQogCi12b2lkIFdLUmVzb3VyY2VDYWNoZU1h bmFnZXJDbGVhckNhY2hlRm9yQWxsT3JpZ2lucyhXS1Jlc291cmNlQ2FjaGVNYW5hZ2VyUmVmIGNh Y2hlTWFuYWdlclJlZiwgV0tSZXNvdXJjZUNhY2hlc1RvQ2xlYXIgY2FjaGVzVG9DbGVhcikKK3Zv aWQgV0tSZXNvdXJjZUNhY2hlTWFuYWdlckNsZWFyQ2FjaGVGb3JBbGxPcmlnaW5zKFdLUmVzb3Vy Y2VDYWNoZU1hbmFnZXJSZWYgY2FjaGVNYW5hZ2VyLCBXS1Jlc291cmNlQ2FjaGVzVG9DbGVhciBj YWNoZXNUb0NsZWFyKQogewotICAgIHRvSW1wbChjYWNoZU1hbmFnZXJSZWYpLT5jbGVhckNhY2hl Rm9yQWxsT3JpZ2lucyh0b1Jlc291cmNlQ2FjaGVzVG9DbGVhcihjYWNoZXNUb0NsZWFyKSk7Cisg ICAgYXV0byYgd2Vic2l0ZURhdGFTdG9yZSA9IHRvSW1wbChyZWludGVycHJldF9jYXN0PFdLV2Vi c2l0ZURhdGFTdG9yZVJlZj4oY2FjaGVNYW5hZ2VyKSktPndlYnNpdGVEYXRhU3RvcmUoKTsKKyAg ICB3ZWJzaXRlRGF0YVN0b3JlLnJlbW92ZURhdGEodG9XZWJzaXRlRGF0YVR5cGVzKGNhY2hlc1Rv Q2xlYXIpLCBzdGQ6OmNocm9ubzo6c3lzdGVtX2Nsb2NrOjp0aW1lX3BvaW50OjptaW4oKSwgW10g eyB9KTsKIH0K